Skip to content

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

Avoid reserved identifiers 

Change-Id: Ibba1a36d4f3744fa68f7e9d0076c997e076262cb
üst f7a3bdf6
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
basic/source/comp/dim.cxx
Dosyayı görüntüle @ 45adae8f
......@@ -106,7 +106,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, bool bAsNewAlreadyParsed )
case TDATE:
case TSTRING:
case TOBJECT:
case _ERROR_:
case ERROR_:
case TBOOLEAN:
case TVARIANT:
case TBYTE:
......@@ -222,9 +222,9 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
// PRIVATE is a synonymous for DIM
// _CONST_?
bool bConst = false;
if( eCurTok == _CONST_ )
if( eCurTok == CONST_ )
bConst = true;
else if( Peek() == _CONST_ )
else if( Peek() == CONST_ )
{
Next();
bConst = true;
......@@ -831,7 +831,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
SbxDataType eType = eScanType;
SbiProcDef* pDef = new SbiProcDef( this, aName, true );
pDef->SetType( eType );
if( Peek() == _CDECL_ )
if( Peek() == CDECL_ )
{
Next(); pDef->SetCdecl();
}
......@@ -872,7 +872,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
}
if( pDef->IsCdecl() )
{
Error( ERRCODE_BASIC_UNEXPECTED, _CDECL_ );
Error( ERRCODE_BASIC_UNEXPECTED, CDECL_ );
}
pDef->SetCdecl( false );
pDef->GetLib().clear();
......@@ -887,7 +887,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
}
if( pDef->IsCdecl() )
{
Error( ERRCODE_BASIC_UNEXPECTED, _CDECL_ );
Error( ERRCODE_BASIC_UNEXPECTED, CDECL_ );
}
pDef->SetCdecl( false );
pDef->GetAlias().clear();
......@@ -907,7 +907,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
bool bByVal = false;
bool bOptional = false;
bool bParamArray = false;
while( Peek() == BYVAL || Peek() == BYREF || Peek() == _OPTIONAL_ )
while( Peek() == BYVAL || Peek() == BYREF || Peek() == OPTIONAL_ )
{
if( Peek() == BYVAL )
{
......@@ -917,7 +917,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
{
bByVal = false;
}
else if ( Peek() == _OPTIONAL_ )
else if ( Peek() == OPTIONAL_ )
{
bOptional = true;
}
......
basic/source/comp/loops.cxx
Dosyayı görüntüle @ 45adae8f
......@@ -207,7 +207,7 @@ void SbiParser::For()
if( bForEach )
{
TestToken( _IN_ );
TestToken( IN_ );
SbiExpression aCollExpr( this, SbOPERAND );
aCollExpr.Gen(); // Collection var to for stack
TestEoln();
......@@ -465,9 +465,9 @@ void SbiParser::On()
OUString aString = SbiTokenizer::Symbol(eTok);
if (aString.equalsIgnoreAsciiCase("ERROR"))
{
eTok = _ERROR_; // Error comes as SYMBOL
eTok = ERROR_; // Error comes as SYMBOL
}
if( eTok != _ERROR_ && eTok != LOCAL )
if( eTok != ERROR_ && eTok != LOCAL )
{
OnGoto();
}
......
basic/source/comp/parser.cxx
Dosyayı görüntüle @ 45adae8f
......@@ -46,7 +46,7 @@ static const SbiStatement StmntTable [] = {
{ ATTRIBUTE, &SbiParser::Attribute, Y, Y, }, // ATTRIBUTE
{ CALL, &SbiParser::Call, N, Y, }, // CALL
{ CLOSE, &SbiParser::Close, N, Y, }, // CLOSE
{ _CONST_, &SbiParser::Dim, Y, Y, }, // CONST
{ CONST_, &SbiParser::Dim, Y, Y, }, // CONST
{ DECLARE, &SbiParser::Declare, Y, N, }, // DECLARE
{ DEFBOOL, &SbiParser::DefXXX, Y, N, }, // DEFBOOL
{ DEFCUR, &SbiParser::DefXXX, Y, N, }, // DEFCUR
......@@ -67,7 +67,7 @@ static const SbiStatement StmntTable [] = {
{ END, &SbiParser::Stop, N, Y, }, // END
{ ENUM, &SbiParser::Enum, Y, N, }, // TYPE
{ ERASE, &SbiParser::Erase, N, Y, }, // ERASE
{ _ERROR_, &SbiParser::ErrorStmnt, N, Y, }, // ERROR
{ ERROR_, &SbiParser::ErrorStmnt, N, Y, }, // ERROR
{ EXIT, &SbiParser::Exit, N, Y, }, // EXIT
{ FOR, &SbiParser::For, N, Y, }, // FOR
{ FUNCTION, &SbiParser::SubFunc, Y, N, }, // FUNCTION
......@@ -378,7 +378,7 @@ bool SbiParser::Parse()
// In vba it's possible to do Error.foobar ( even if it results in
// a runtime error
if ( eCurTok == _ERROR_ && IsVBASupportOn() ) // we probably need to define a subset of keywords where this madness applies e.g. if ( IsVBASupportOn() && SymbolCanBeRedined( eCurTok ) )
if ( eCurTok == ERROR_ && IsVBASupportOn() ) // we probably need to define a subset of keywords where this madness applies e.g. if ( IsVBASupportOn() && SymbolCanBeRedined( eCurTok ) )
{
SbiTokenizer tokens( *static_cast<SbiTokenizer*>(this) );
tokens.Next();
......
basic/source/comp/token.cxx
Dosyayı görüntüle @ 45adae8f
......@@ -56,12 +56,12 @@ static const TokenTable aTokTable_Basic [] = {
{ BYVAL, "ByVal", },
{ CALL, "Call" },
{ CASE, "Case" },
{ _CDECL_, "Cdecl" },
{ CDECL_, "Cdecl" },
{ CLASSMODULE, "ClassModule" },
{ CLOSE, "Close" },
{ COMPARE, "Compare" },
{ COMPATIBLE,"Compatible" },
{ _CONST_, "Const" },
{ CONST_, "Const" },
{ TCURRENCY,"Currency" },
{ TDATE, "Date" },
{ DECLARE, "Declare" },
......@@ -94,7 +94,7 @@ static const TokenTable aTokTable_Basic [] = {
{ ENUM, "Enum" },
{ EQV, "Eqv" },
{ ERASE, "Erase" },
{ _ERROR_, "Error" },
{ ERROR_, "Error" },
{ EXIT, "Exit" },
{ BASIC_EXPLICIT, "Explicit" },
{ FOR, "For" },
......@@ -106,7 +106,7 @@ static const TokenTable aTokTable_Basic [] = {
{ IF, "If" },
{ IMP, "Imp" },
{ IMPLEMENTS, "Implements" },
{ _IN_, "In" },
{ IN_, "In" },
{ INPUT, "Input" }, // also INPUT #
{ TINTEGER, "Integer" },
{ IS, "Is" },
......@@ -130,7 +130,7 @@ static const TokenTable aTokTable_Basic [] = {
{ ON, "On" },
{ OPEN, "Open" },
{ OPTION, "Option" },
{ _OPTIONAL_, "Optional" },
{ OPTIONAL_, "Optional" },
{ OR, "Or" },
{ OUTPUT, "Output" },
{ PARAMARRAY, "ParamArray" },
......@@ -192,7 +192,7 @@ TokenLabelInfo::TokenLabelInfo()
}
// Token accepted as label by VBA
SbiToken eLabelToken[] = { ACCESS, ALIAS, APPEND, BASE, BINARY, CLASSMODULE,
COMPARE, COMPATIBLE, DEFERR, _ERROR_, BASIC_EXPLICIT, LIB, LINE, LPRINT, NAME,
COMPARE, COMPATIBLE, DEFERR, ERROR_, BASIC_EXPLICIT, LIB, LINE, LPRINT, NAME,
TOBJECT, OUTPUT, PROPERTY, RANDOM, READ, STEP, STOP, TEXT, VBASUPPORT, NIL };
SbiToken eTok;
for( SbiToken* pTok = eLabelToken ; (eTok = *pTok) != NIL ; ++pTok )
......@@ -508,7 +508,7 @@ special:
{
bAs = false;
}
else if( eCurTok >= DATATYPE1 && eCurTok <= DATATYPE2 && (bErrorIsSymbol || eCurTok != _ERROR_) )
else if( eCurTok >= DATATYPE1 && eCurTok <= DATATYPE2 && (bErrorIsSymbol || eCurTok != ERROR_) )
{
eCurTok = SYMBOL;
}
......
basic/source/inc/token.hxx
Dosyayı görüntüle @ 45adae8f
......@@ -47,7 +47,7 @@ enum SbiToken {
// commands:
FIRSTKWD = 0x40,
AS = FIRSTKWD, ALIAS, ASSIGN,
CALL, CASE, CLOSE, COMPARE, _CONST_,
CALL, CASE, CLOSE, COMPARE, CONST_,
DECLARE, DIM, DO,
// in the order of the data type enums!
......@@ -57,13 +57,13 @@ enum SbiToken {
DATATYPE1,
TINTEGER = DATATYPE1,
TLONG, TSINGLE, TDOUBLE, TCURRENCY, TDATE, TSTRING, TOBJECT,
_ERROR_, TBOOLEAN, TVARIANT, TBYTE,
ERROR_, TBOOLEAN, TVARIANT, TBYTE,
DATATYPE2 = TBYTE,
EACH, ELSE, ELSEIF, END, ERASE, EXIT,
FOR, FUNCTION,
GET, GLOBAL, GOSUB, GOTO,
IF, _IN_, INPUT,
IF, IN_, INPUT,
LET, LINE, LINEINPUT, LOCAL, LOOP, LPRINT, LSET,
NAME, NEW, NEXT,
ON, OPEN, OPTION, ATTRIBUTE, IMPLEMENTS,
......@@ -86,9 +86,9 @@ enum SbiToken {
IMP, CAT, LIKE, IS, TYPEOF,
// miscellaneous:
FIRSTEXTRA,
NUMBER=FIRSTEXTRA, FIXSTRING, SYMBOL, _CDECL_, BYVAL, BYREF,
NUMBER=FIRSTEXTRA, FIXSTRING, SYMBOL, CDECL_, BYVAL, BYREF,
OUTPUT, RANDOM, APPEND, BINARY, ACCESS,
LOCK, READ, PRESERVE, BASE, ANY, LIB, _OPTIONAL_,
LOCK, READ, PRESERVE, BASE, ANY, LIB, OPTIONAL_,
BASIC_EXPLICIT, COMPATIBLE, CLASSMODULE, PARAMARRAY, WITHEVENTS,
// from here there are JavaScript-tokens (same enum so that same type)
......
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