Skip to content

C
core
Kaydet (Commit) 7beeced4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Avoid reserved identifiers 

Change-Id: I3fbc7cb107bdab770d5ce9ed3ecddb962d2d4666
üst b87c4d8a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 139 deletions
basic/source/classes/sbxmod.cxx
Dosyayı görüntüle @ 7beeced4
......@@ -1481,7 +1481,7 @@ const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine,
{
SbiOpcode eOp = (SbiOpcode ) ( *p++ );
nPC++;
if( bFollowJumps && eOp == _JUMP && pImg )
if( bFollowJumps && eOp == JUMP_ && pImg )
{
SAL_WARN_IF( !pImg, "basic", "FindNextStmnt: pImg==NULL with FollowJumps option" );
sal_uInt32 nOp1 = *p++; nOp1 |= *p++ << 8;
......@@ -1493,7 +1493,7 @@ const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine,
p += 4;
nPC += 4;
}
else if( eOp == _STMNT )
else if( eOp == STMNT_ )
{
sal_uInt32 nl, nc;
nl = *p++; nl |= *p++ << 8;
......
basic/source/comp/codegen.cxx
Dosyayı görüntüle @ 7beeced4
......@@ -71,7 +71,7 @@ void SbiCodeGen::GenStmnt()
if( bStmnt )
{
bStmnt = false;
Gen( _STMNT, nLine, nCol );
Gen( STMNT_, nLine, nCol );
}
}
......@@ -508,17 +508,17 @@ public:
m_ConvertedBuf += (sal_uInt8)eOp;
switch( eOp )
{
case _JUMP:
case _JUMPT:
case _JUMPF:
case _GOSUB:
case _CASEIS:
case _RETURN:
case _ERRHDL:
case _TESTFOR:
case JUMP_:
case JUMPT_:
case JUMPF_:
case GOSUB_:
case CASEIS_:
case RETURN_:
case ERRHDL_:
case TESTFOR_:
nOp1 = static_cast<T>( convertBufferOffSet(m_pStart, nOp1) );
break;
case _RESUME:
case RESUME_:
if ( nOp1 > 1 )
nOp1 = static_cast<T>( convertBufferOffSet(m_pStart, nOp1) );
break;
......@@ -531,7 +531,7 @@ public:
virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) override
{
m_ConvertedBuf += (sal_uInt8)eOp;
if ( eOp == _CASEIS )
if ( eOp == CASEIS_ )
if ( nOp1 )
nOp1 = static_cast<T>( convertBufferOffSet(m_pStart, nOp1) );
m_ConvertedBuf += static_cast<S>(nOp1);
......
basic/source/comp/dim.cxx
Dosyayı görüntüle @ 7beeced4
This diff is collapsed.
basic/source/comp/exprgen.cxx
Dosyayı görüntüle @ 7beeced4
......@@ -30,30 +30,30 @@ typedef struct {
} OpTable;
static const OpTable aOpTable [] = {
{ EXPON,_EXP },
{ MUL, _MUL },
{ DIV, _DIV },
{ IDIV, _IDIV },
{ MOD, _MOD },
{ PLUS, _PLUS },
{ MINUS,_MINUS },
{ EQ, _EQ },
{ NE, _NE },
{ LE, _LE },
{ GE, _GE },
{ LT, _LT },
{ GT, _GT },
{ AND, _AND },
{ OR, _OR },
{ XOR, _XOR },
{ EQV, _EQV },
{ IMP, _IMP },
{ NOT, _NOT },
{ NEG, _NEG },
{ CAT, _CAT },
{ LIKE, _LIKE },
{ IS, _IS },
{ NIL, _NOP }};
{ EXPON,EXP_ },
{ MUL, MUL_ },
{ DIV, DIV_ },
{ IDIV, IDIV_ },
{ MOD, MOD_ },
{ PLUS, PLUS_ },
{ MINUS,MINUS_ },
{ EQ, EQ_ },
{ NE, NE_ },
{ LE, LE_ },
{ GE, GE_ },
{ LT, LT_ },
{ GT, GT_ },
{ AND, AND_ },
{ OR, OR_ },
{ XOR, XOR_ },
{ EQV, EQV_ },
{ IMP, IMP_ },
{ NOT, NOT_ },
{ NEG, NEG_ },
{ CAT, CAT_ },
{ LIKE, LIKE_ },
{ IS, IS_ },
{ NIL, NOP_ }};
// Output of an element
void SbiExprNode::Gen( SbiCodeGen& rGen, RecursiveMode eRecMode )
......@@ -65,18 +65,18 @@ void SbiExprNode::Gen( SbiCodeGen& rGen, RecursiveMode eRecMode )
switch( GetType() )
{
case SbxEMPTY:
rGen.Gen( _EMPTY );
rGen.Gen( EMPTY_ );
break;
case SbxINTEGER:
rGen.Gen( _CONST, (short) nVal );
rGen.Gen( CONST_, (short) nVal );
break;
case SbxSTRING:
nStringId = rGen.GetParser()->aGblStrings.Add( aStrVal );
rGen.Gen( _SCONST, nStringId );
rGen.Gen( SCONST_, nStringId );
break;
default:
nStringId = rGen.GetParser()->aGblStrings.Add( nVal, eType );
rGen.Gen( _NUMBER, nStringId );
rGen.Gen( NUMBER_, nStringId );
break;
}
}
......@@ -86,7 +86,7 @@ void SbiExprNode::Gen( SbiCodeGen& rGen, RecursiveMode eRecMode )
SbiOpcode eOp;
if( aVar.pDef->GetScope() == SbPARAM )
{
eOp = _PARAM;
eOp = PARAM_;
if( 0 == aVar.pDef->GetPos() )
{
bool bTreatFunctionAsParam = true;
......@@ -103,32 +103,32 @@ void SbiExprNode::Gen( SbiCodeGen& rGen, RecursiveMode eRecMode )
}
if( !bTreatFunctionAsParam )
{
eOp = aVar.pDef->IsGlobal() ? _FIND_G : _FIND;
eOp = aVar.pDef->IsGlobal() ? FIND_G_ : FIND_;
}
}
}
// special treatment for WITH
else if( (pWithParent_ = GetWithParent()) != nullptr )
{
eOp = _ELEM; // .-Term in WITH
eOp = ELEM_; // .-Term in WITH
}
else
{
eOp = ( aVar.pDef->GetScope() == SbRTL ) ? _RTL :
(aVar.pDef->IsGlobal() ? _FIND_G : _FIND);
eOp = ( aVar.pDef->GetScope() == SbRTL ) ? RTL_ :
(aVar.pDef->IsGlobal() ? FIND_G_ : FIND_);
}
if( eOp == _FIND )
if( eOp == FIND_ )
{
SbiProcDef* pProc = aVar.pDef->GetProcDef();
if ( rGen.GetParser()->bClassModule )
{
eOp = _FIND_CM;
eOp = FIND_CM_;
}
else if ( aVar.pDef->IsStatic() || (pProc && pProc->IsStatic()) )
{
eOp = _FIND_STATIC;
eOp = FIND_STATIC_;
}
}
for( SbiExprNode* p = this; p; p = p->aVar.pNext )
......@@ -138,17 +138,17 @@ void SbiExprNode::Gen( SbiCodeGen& rGen, RecursiveMode eRecMode )
pWithParent_->Gen(rGen);
}
p->GenElement( rGen, eOp );
eOp = _ELEM;
eOp = ELEM_;
}
}
else if( IsTypeOf() )
{
pLeft->Gen(rGen);
rGen.Gen( _TESTCLASS, nTypeStrId );
rGen.Gen( TESTCLASS_, nTypeStrId );
}
else if( IsNew() )
{
rGen.Gen( _CREATE, 0, nTypeStrId );
rGen.Gen( CREATE_, 0, nTypeStrId );
}
else
{
......@@ -172,14 +172,14 @@ void SbiExprNode::Gen( SbiCodeGen& rGen, RecursiveMode eRecMode )
void SbiExprNode::GenElement( SbiCodeGen& rGen, SbiOpcode eOp )
{
#ifdef DBG_UTIL
if ((eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM && eOp != _FIND_STATIC)
if ((eOp < RTL_ || eOp > CALLC_) && eOp != FIND_G_ && eOp != FIND_CM_ && eOp != FIND_STATIC_)
rGen.GetParser()->Error( ERRCODE_BASIC_INTERNAL_ERROR, "Opcode" );
#endif
SbiSymDef* pDef = aVar.pDef;
// The ID is either the position or the String-ID
// If the bit Bit 0x8000 is set, the variable have
// a parameter list.
sal_uInt16 nId = ( eOp == _PARAM ) ? pDef->GetPos() : pDef->GetId();
sal_uInt16 nId = ( eOp == PARAM_ ) ? pDef->GetPos() : pDef->GetId();
// Build a parameter list
if( aVar.pPar && aVar.pPar->GetSize() )
{
......@@ -194,7 +194,7 @@ void SbiExprNode::GenElement( SbiCodeGen& rGen, SbiOpcode eOp )
for( auto& pExprList: *aVar.pvMorePar )
{
pExprList->Gen(rGen);
rGen.Gen( _ARRAYACCESS );
rGen.Gen( ARRAYACCESS_ );
}
}
}
......@@ -207,7 +207,7 @@ void SbiExprList::Gen(SbiCodeGen& rGen)
{
if( !aData.empty() )
{
rGen.Gen( _ARGC );
rGen.Gen( ARGC_ );
// Type adjustment at DECLARE
sal_uInt16 nCount = 1;
......@@ -218,7 +218,7 @@ void SbiExprList::Gen(SbiCodeGen& rGen)
{
// named arg
sal_uInt16 nSid = rGen.GetParser()->aGblStrings.Add( pExpr->GetName() );
rGen.Gen( _ARGN, nSid );
rGen.Gen( ARGN_, nSid );
/* TODO: Check after Declare concept change
// From 1996-01-10: Type adjustment at named -> search suitable parameter
......@@ -237,7 +237,7 @@ void SbiExprList::Gen(SbiCodeGen& rGen)
// if( pExpr->GetName().ICompare( rName )
// == COMPARE_EQUAL )
// {
// pParser->aGen.Gen( _ARGTYP, pDef->GetType() );
// pParser->aGen.Gen( ARGTYP_, pDef->GetType() );
// break;
// }
// }
......@@ -247,7 +247,7 @@ void SbiExprList::Gen(SbiCodeGen& rGen)
}
else
{
rGen.Gen( _ARGV );
rGen.Gen( ARGV_ );
}
nCount++;
}
......@@ -261,7 +261,7 @@ void SbiExpression::Gen( RecursiveMode eRecMode )
pExpr->Gen( pParser->aGen, eRecMode );
if( bByVal )
{
pParser->aGen.Gen( _BYVAL );
pParser->aGen.Gen( BYVAL_ );
}
if( bBased )
{
......@@ -270,8 +270,8 @@ void SbiExpression::Gen( RecursiveMode eRecMode )
{
uBase |= 0x8000; // #109275 Flag compatibility
}
pParser->aGen.Gen( _BASED, uBase );
pParser->aGen.Gen( _ARGV );
pParser->aGen.Gen( BASED_, uBase );
pParser->aGen.Gen( ARGV_ );
}
}
......
basic/source/comp/io.cxx
Dosyayı görüntüle @ 7beeced4
......@@ -33,7 +33,7 @@ bool SbiParser::Channel( bool bAlways )
while( Peek() == COMMA || Peek() == SEMICOLON )
Next();
aExpr.Gen();
aGen.Gen( _CHANNEL );
aGen.Gen( CHANNEL_ );
bRes = true;
}
else if( bAlways )
......@@ -56,7 +56,7 @@ void SbiParser::Print()
pExpr->Gen();
pExpr.reset();
Peek();
aGen.Gen( eCurTok == COMMA ? _PRINTF : _BPRINT );
aGen.Gen( eCurTok == COMMA ? PRINTF_ : BPRINT_ );
}
if( eCurTok == COMMA || eCurTok == SEMICOLON )
{
......@@ -65,12 +65,12 @@ void SbiParser::Print()
}
else
{
aGen.Gen( _PRCHAR, '\n' );
aGen.Gen( PRCHAR_, '\n' );
break;
}
}
if( bChan )
aGen.Gen( _CHAN0 );
aGen.Gen( CHAN0_ );
}
// WRITE #chan, expr, ...
......@@ -84,21 +84,21 @@ void SbiParser::Write()
std::unique_ptr<SbiExpression> pExpr(new SbiExpression( this ));
pExpr->Gen();
pExpr.reset();
aGen.Gen( _BWRITE );
aGen.Gen( BWRITE_ );
if( Peek() == COMMA )
{
aGen.Gen( _PRCHAR, ',' );
aGen.Gen( PRCHAR_, ',' );
Next();
if( IsEoln( Peek() ) ) break;
}
else
{
aGen.Gen( _PRCHAR, '\n' );
aGen.Gen( PRCHAR_, '\n' );
break;
}
}
if( bChan )
aGen.Gen( _CHAN0 );
aGen.Gen( CHAN0_ );
}
......@@ -136,16 +136,16 @@ void SbiParser::LineInput()
if( pExpr->GetType() != SbxVARIANT && pExpr->GetType() != SbxSTRING )
Error( ERRCODE_BASIC_CONVERSION );
pExpr->Gen();
aGen.Gen( _LINPUT );
aGen.Gen( LINPUT_ );
pExpr.reset();
aGen.Gen( _CHAN0 ); // ResetChannel() not in StepLINPUT() anymore
aGen.Gen( CHAN0_ ); // ResetChannel() not in StepLINPUT() anymore
}
// INPUT
void SbiParser::Input()
{
aGen.Gen( _RESTART );
aGen.Gen( RESTART_ );
Channel( true );
std::unique_ptr<SbiExpression> pExpr(new SbiExpression( this, SbOPERAND ));
while( !bAbort )
......@@ -153,7 +153,7 @@ void SbiParser::Input()
if( !pExpr->IsVariable() )
Error( ERRCODE_BASIC_VAR_EXPECTED );
pExpr->Gen();
aGen.Gen( _INPUT );
aGen.Gen( INPUT_ );
if( Peek() == COMMA )
{
Next();
......@@ -162,7 +162,7 @@ void SbiParser::Input()
else break;
}
pExpr.reset();
aGen.Gen( _CHAN0 );
aGen.Gen( CHAN0_ );
}
// OPEN stringexpr FOR mode ACCESS access mode AS Channel [Len=n]
......@@ -266,7 +266,7 @@ void SbiParser::Open()
if( pChan )
pChan->Gen();
aFileName.Gen();
aGen.Gen( _OPEN, static_cast<sal_uInt32>(nMode), static_cast<sal_uInt32>(nFlags) );
aGen.Gen( OPEN_, static_cast<sal_uInt32>(nMode), static_cast<sal_uInt32>(nFlags) );
bInStatement = false;
}
......@@ -292,7 +292,7 @@ void SbiParser::Name()
SbiExpression aExpr2( this );
aExpr1.Gen();
aExpr2.Gen();
aGen.Gen( _RENAME );
aGen.Gen( RENAME_ );
}
// CLOSE [n,...]
......@@ -301,7 +301,7 @@ void SbiParser::Close()
{
Peek();
if( IsEoln( eCurTok ) )
aGen.Gen( _CLOSE, 0 );
aGen.Gen( CLOSE_, 0 );
else
for( ;; )
{
......@@ -309,8 +309,8 @@ void SbiParser::Close()
while( Peek() == COMMA || Peek() == SEMICOLON )
Next();
aExpr.Gen();
aGen.Gen( _CHANNEL );
aGen.Gen( _CLOSE, 1 );
aGen.Gen( CHANNEL_ );
aGen.Gen( CLOSE_, 1 );
if( IsEoln( Peek() ) )
break;
......
basic/source/comp/loops.cxx
Dosyayı görüntüle @ 7beeced4
......@@ -41,7 +41,7 @@ void SbiParser::If()
sal_uInt16 iJmp = 0; // current table index
// multiline IF
nEndLbl = aGen.Gen( _JUMPF, 0 );
nEndLbl = aGen.Gen( JUMPF_, 0 );
eTok = Peek();
while( !( eTok == ELSEIF || eTok == ELSE || eTok == ENDIF ) &&
!bAbort && Parse() )
......@@ -59,7 +59,7 @@ void SbiParser::If()
{
Error( ERRCODE_BASIC_PROG_TOO_LARGE ); bAbort = true; return;
}
pnJmpToEndLbl[iJmp++] = aGen.Gen( _JUMP, 0 );
pnJmpToEndLbl[iJmp++] = aGen.Gen( JUMP_, 0 );
Next();
aGen.BackChain( nEndLbl );
......@@ -67,7 +67,7 @@ void SbiParser::If()
aGen.Statement();
std::unique_ptr<SbiExpression> pCond(new SbiExpression( this ));
pCond->Gen();
nEndLbl = aGen.Gen( _JUMPF, 0 );
nEndLbl = aGen.Gen( JUMPF_, 0 );
pCond.reset();
TestToken( THEN );
eTok = Peek();
......@@ -85,7 +85,7 @@ void SbiParser::If()
{
Next();
sal_uInt32 nElseLbl = nEndLbl;
nEndLbl = aGen.Gen( _JUMP, 0 );
nEndLbl = aGen.Gen( JUMP_, 0 );
aGen.BackChain( nElseLbl );
aGen.Statement();
......@@ -105,7 +105,7 @@ void SbiParser::If()
{
// single line IF
bSingleLineIf = true;
nEndLbl = aGen.Gen( _JUMPF, 0 );
nEndLbl = aGen.Gen( JUMPF_, 0 );
Push( eCurTok );
while( !bAbort )
{
......@@ -118,7 +118,7 @@ void SbiParser::If()
{
Next();
sal_uInt32 nElseLbl = nEndLbl;
nEndLbl = aGen.Gen( _JUMP, 0 );
nEndLbl = aGen.Gen( JUMP_, 0 );
aGen.BackChain( nElseLbl );
while( !bAbort )
{
......@@ -158,10 +158,10 @@ void SbiParser::DoLoop()
{
SbiExpression aExpr( this );
aExpr.Gen();
aGen.Gen( eTok == UNTIL ? _JUMPF : _JUMPT, nStartLbl );
aGen.Gen( eTok == UNTIL ? JUMPF_ : JUMPT_, nStartLbl );
} else
if (eTok == EOLN || eTok == REM)
aGen.Gen (_JUMP, nStartLbl);
aGen.Gen (JUMP_, nStartLbl);
else
Error( ERRCODE_BASIC_EXPECTED, WHILE );
}
......@@ -173,10 +173,10 @@ void SbiParser::DoLoop()
SbiExpression aCond( this );
aCond.Gen();
}
sal_uInt32 nEndLbl = aGen.Gen( eTok == UNTIL ? _JUMPT : _JUMPF, 0 );
sal_uInt32 nEndLbl = aGen.Gen( eTok == UNTIL ? JUMPT_ : JUMPF_, 0 );
StmntBlock( LOOP );
TestEoln();
aGen.Gen( _JUMP, nStartLbl );
aGen.Gen( JUMP_, nStartLbl );
aGen.BackChain( nEndLbl );
}
CloseBlock();
......@@ -189,9 +189,9 @@ void SbiParser::While()
SbiExpression aCond( this );
sal_uInt32 nStartLbl = aGen.GetPC();
aCond.Gen();
sal_uInt32 nEndLbl = aGen.Gen( _JUMPF, 0 );
sal_uInt32 nEndLbl = aGen.Gen( JUMPF_, 0 );
StmntBlock( WEND );
aGen.Gen( _JUMP, nStartLbl );
aGen.Gen( JUMP_, nStartLbl );
aGen.BackChain( nEndLbl );
}
......@@ -211,7 +211,7 @@ void SbiParser::For()
SbiExpression aCollExpr( this, SbOPERAND );
aCollExpr.Gen(); // Collection var to for stack
TestEoln();
aGen.Gen( _INITFOREACH );
aGen.Gen( INITFOREACH_ );
}
else
{
......@@ -235,16 +235,16 @@ void SbiParser::For()
TestEoln();
// The stack has all 4 elements now: variable, start, end, increment
// bind start value
aGen.Gen( _INITFOR );
aGen.Gen( INITFOR_ );
}
sal_uInt32 nLoop = aGen.GetPC();
// do tests, maybe free the stack
sal_uInt32 nEndTarget = aGen.Gen( _TESTFOR, 0 );
sal_uInt32 nEndTarget = aGen.Gen( TESTFOR_, 0 );
OpenBlock( FOR );
StmntBlock( NEXT );
aGen.Gen( _NEXT );
aGen.Gen( _JUMP, nLoop );
aGen.Gen( NEXT_ );
aGen.Gen( JUMP_, nLoop );
// are there variables after NEXT?
if( Peek() == SYMBOL )
{
......@@ -294,7 +294,7 @@ void SbiParser::OnGoto()
{
SbiExpression aCond( this );
aCond.Gen();
sal_uInt32 nLabelsTarget = aGen.Gen( _ONJUMP, 0 );
sal_uInt32 nLabelsTarget = aGen.Gen( ONJUMP_, 0 );
SbiToken eTok = Next();
if( eTok != GOTO && eTok != GOSUB )
{
......@@ -309,7 +309,7 @@ void SbiParser::OnGoto()
if( MayBeLabel() )
{
sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
aGen.Gen( _JUMP, nOff );
aGen.Gen( JUMP_, nOff );
nLbl++;
}
else Error( ERRCODE_BASIC_LABEL_EXPECTED );
......@@ -324,7 +324,7 @@ void SbiParser::OnGoto()
void SbiParser::Goto()
{
SbiOpcode eOp = eCurTok == GOTO ? _JUMP : _GOSUB;
SbiOpcode eOp = eCurTok == GOTO ? JUMP_ : GOSUB_;
Next();
if( MayBeLabel() )
{
......@@ -342,9 +342,9 @@ void SbiParser::Return()
if( MayBeLabel() )
{
sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
aGen.Gen( _RETURN, nOff );
aGen.Gen( RETURN_, nOff );
}
else aGen.Gen( _RETURN, 0 );
else aGen.Gen( RETURN_, 0 );
}
// SELECT CASE
......@@ -355,7 +355,7 @@ void SbiParser::Select()
SbiExpression aCase( this );
SbiToken eTok = NIL;
aCase.Gen();
aGen.Gen( _CASE );
aGen.Gen( CASE_ );
TestEoln();
sal_uInt32 nNextTarget = 0;
sal_uInt32 nDoneTarget = 0;
......@@ -397,7 +397,7 @@ void SbiParser::Select()
SbiExpression aCompare( this );
aCompare.Gen();
nTrueTarget = aGen.Gen(
_CASEIS, nTrueTarget,
CASEIS_, nTrueTarget,
sal::static_int_cast< sal_uInt16 >(
SbxEQ + ( eTok2 - EQ ) ) );
}
......@@ -411,11 +411,11 @@ void SbiParser::Select()
Next();
SbiExpression aCase2( this );
aCase2.Gen();
nTrueTarget = aGen.Gen( _CASETO, nTrueTarget );
nTrueTarget = aGen.Gen( CASETO_, nTrueTarget );
}
else
// CASE a
nTrueTarget = aGen.Gen( _CASEIS, nTrueTarget, SbxEQ );
nTrueTarget = aGen.Gen( CASEIS_, nTrueTarget, SbxEQ );
}
if( Peek() == COMMA ) Next();
......@@ -428,7 +428,7 @@ void SbiParser::Select()
if( !bElse )
{
nNextTarget = aGen.Gen( _JUMP, nNextTarget );
nNextTarget = aGen.Gen( JUMP_, nNextTarget );
aGen.BackChain( nTrueTarget );
}
// build the statement body
......@@ -443,7 +443,7 @@ void SbiParser::Select()
break;
}
if( !bElse )
nDoneTarget = aGen.Gen( _JUMP, nDoneTarget );
nDoneTarget = aGen.Gen( JUMP_, nDoneTarget );
}
else if( !IsEoln( eTok ) )
break;
......@@ -454,7 +454,7 @@ done:
if( nNextTarget )
aGen.BackChain( nNextTarget );
aGen.BackChain( nDoneTarget );
aGen.Gen( _ENDCASE );
aGen.Gen( ENDCASE_ );
}
// ON Error/Variable
......@@ -489,12 +489,12 @@ void SbiParser::On()
{
if( eCurTok == NUMBER && !nVal )
{
aGen.Gen( _STDERROR );
aGen.Gen( STDERROR_ );
}
else
{
sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
aGen.Gen( _ERRHDL, nOff );
aGen.Gen( ERRHDL_, nOff );
}
}
else if( eCurTok == MINUS )
......@@ -502,7 +502,7 @@ void SbiParser::On()
Next();
if( eCurTok == NUMBER && nVal == 1 )
{
aGen.Gen( _STDERROR );
aGen.Gen( STDERROR_ );
}
else
{
......@@ -517,7 +517,7 @@ void SbiParser::On()
else if( eCurTok == RESUME )
{
TestToken( NEXT );
aGen.Gen( _NOERROR );
aGen.Gen( NOERROR_ );
}
else Error( ERRCODE_BASIC_EXPECTED, "GoTo/Resume" );
}
......@@ -533,23 +533,23 @@ void SbiParser::Resume()
{
case EOS:
case EOLN:
aGen.Gen( _RESUME, 0 );
aGen.Gen( RESUME_, 0 );
break;
case NEXT:
aGen.Gen( _RESUME, 1 );
aGen.Gen( RESUME_, 1 );
Next();
break;
case NUMBER:
if( !nVal )
{
aGen.Gen( _RESUME, 0 );
aGen.Gen( RESUME_, 0 );
break;
} // fall through
case SYMBOL:
if( MayBeLabel() )
{
nLbl = pProc->GetLabels().Reference( aSym );
aGen.Gen( _RESUME, nLbl );
aGen.Gen( RESUME_, nLbl );
Next();
break;
} // fall through
......
basic/source/comp/parser.cxx
Dosyayı görüntüle @ 7beeced4
......@@ -140,7 +140,7 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
aGlobals.SetParent( &aRtlSyms );
nGblChain = aGen.Gen( _JUMP, 0 );
nGblChain = aGen.Gen( JUMP_, 0 );
rTypeArray = new SbxArray; // array for user defined types
rEnumArray = new SbxArray; // array for Enum types
......@@ -184,7 +184,7 @@ bool SbiParser::HasGlobalCode()
if( bGblDefs && nGblChain )
{
aGen.BackChain( nGblChain );
aGen.Gen( _LEAVE );
aGen.Gen( LEAVE_ );
nGblChain = 0;
}
return bGblDefs;
......@@ -233,7 +233,7 @@ void SbiParser::Exit()
if( eTok == eExitTok ||
(eTok == PROPERTY && (eExitTok == GET || eExitTok == LET) ) ) // #i109051
{
p->nChain = aGen.Gen( _JUMP, p->nChain );
p->nChain = aGen.Gen( JUMP_, p->nChain );
return;
}
}
......@@ -333,7 +333,7 @@ bool SbiParser::Parse()
// AB #40689: Due to the new static-handling there
// can be another nGblChain, so ask for it before.
if( bNewGblDefs && nGblChain == 0 )
nGblChain = aGen.Gen( _JUMP, 0 );
nGblChain = aGen.Gen( JUMP_, 0 );
return false;
}
......@@ -427,7 +427,7 @@ bool SbiParser::Parse()
if( bNewGblDefs && nGblChain == 0 &&
( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ) )
{
nGblChain = aGen.Gen( _JUMP, 0 );
nGblChain = aGen.Gen( JUMP_, 0 );
bNewGblDefs = false;
}
// statement-opcode at the beginning of a sub, too, please
......@@ -525,7 +525,7 @@ void SbiParser::Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo )
{
if( !bEQ )
{
aGen.Gen( _GET );
aGen.Gen( GET_ );
}
else
{
......@@ -535,17 +535,17 @@ void SbiParser::Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo )
TestToken( EQ );
SbiExpression aExpr( this );
aExpr.Gen();
SbiOpcode eOp = _PUT;
SbiOpcode eOp = PUT_;
if( pDef )
{
if( pDef->GetConstDef() )
Error( ERRCODE_BASIC_DUPLICATE_DEF, pDef->GetName() );
if( pDef->GetType() == SbxOBJECT )
{
eOp = _SET;
eOp = SET_;
if( pDef->GetTypeId() )
{
aGen.Gen( _SETCLASS, pDef->GetTypeId() );
aGen.Gen( SETCLASS_, pDef->GetTypeId() );
return;
}
}
......@@ -571,8 +571,8 @@ void SbiParser::Assign()
nLen = aLvalue.GetRealVar()->GetLen();
}
if( nLen )
aGen.Gen( _PAD, nLen );
aGen.Gen( _PUT );
aGen.Gen( PAD_, nLen );
aGen.Gen( PUT_ );
}
// assignments of an object-variable
......@@ -597,8 +597,8 @@ void SbiParser::Set()
TypeDecl( *pTypeDef, true );
aLvalue.Gen();
aGen.Gen( _CREATE, pDef->GetId(), pTypeDef->GetTypeId() );
aGen.Gen( _SETCLASS, pDef->GetTypeId() );
aGen.Gen( CREATE_, pDef->GetId(), pTypeDef->GetTypeId() );
aGen.Gen( SETCLASS_, pDef->GetTypeId() );
}
else
{
......@@ -613,16 +613,16 @@ void SbiParser::Set()
if( pDef->GetTypeId() )
{
if ( bVBASupportOn )
aGen.Gen( _VBASETCLASS, pDef->GetTypeId() );
aGen.Gen( VBASETCLASS_, pDef->GetTypeId() );
else
aGen.Gen( _SETCLASS, pDef->GetTypeId() );
aGen.Gen( SETCLASS_, pDef->GetTypeId() );
}
else
{
if ( bVBASupportOn )
aGen.Gen( _VBASET );
aGen.Gen( VBASET_ );
else
aGen.Gen( _SET );
aGen.Gen( SET_ );
}
}
}
......@@ -644,7 +644,7 @@ void SbiParser::LSet()
SbiExpression aExpr( this );
aLvalue.Gen();
aExpr.Gen();
aGen.Gen( _LSET );
aGen.Gen( LSET_ );
}
// JSM 07.10.95
......@@ -662,7 +662,7 @@ void SbiParser::RSet()
SbiExpression aExpr( this );
aLvalue.Gen();
aExpr.Gen();
aGen.Gen( _RSET );
aGen.Gen( RSET_ );
}
// DEFINT, DEFLNG, DEFSNG, DEFDBL, DEFSTR and so on
......@@ -702,7 +702,7 @@ void SbiParser::DefXXX()
void SbiParser::Stop()
{
aGen.Gen( _STOP );
aGen.Gen( STOP_ );
Peek(); // #35694: only Peek(), so that EOL is recognized in Single-Line-If
}
......@@ -855,7 +855,7 @@ void SbiParser::AddConstants()
addStringConst( aPublics, "vbCrLf", "\x0D\x0A" );
addStringConst( aPublics, "vbFormFeed", "\x0C" );
addStringConst( aPublics, "vbLf", "\x0A" );
#ifndef _WIN32
#ifndef WIN32_
addStringConst( aPublics, "vbNewLine", "\x0D\x0A" );
#else
addStringConst( aPublics, "vbNewLine", "\x0A" );
......@@ -875,7 +875,7 @@ void SbiParser::ErrorStmnt()
{
SbiExpression aPar( this );
aPar.Gen();
aGen.Gen( _ERROR );
aGen.Gen( ERROR_ );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
basic/source/inc/opcodes.hxx
Dosyayı görüntüle @ 7beeced4
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment