From b5528c18eb8080cdf8aad4e0357e337b3d8a5f96 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 01:26:43 -0500 Subject: Fix inadvertent "TQ" changes. --- languages/java/JavaLexer.cpp | 6 ++-- languages/java/JavaLexer.hpp | 2 +- languages/java/JavaRecognizer.cpp | 54 ++++++++++++++-------------- languages/java/JavaStoreWalker.cpp | 8 ++--- languages/java/JavaStoreWalkerTokenTypes.hpp | 2 +- languages/java/JavaTokenTypes.hpp | 2 +- languages/java/backgroundparser.cpp | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) (limited to 'languages/java') diff --git a/languages/java/JavaLexer.cpp b/languages/java/JavaLexer.cpp index f205ddd3..623e816f 100644 --- a/languages/java/JavaLexer.cpp +++ b/languages/java/JavaLexer.cpp @@ -275,7 +275,7 @@ ANTLR_USE_NAMESPACE(antlr)RefToken JavaLexer::nextToken() theRetToken=_returnToken; } else if ((LA(1) == 0x3d /* '=' */ ) && (LA(2) == 0x3d /* '=' */ )) { - mETQUAL(true); + mEQUAL(true); theRetToken=_returnToken; } else if ((LA(1) == 0x21 /* '!' */ ) && (LA(2) == 0x3d /* '=' */ )) { @@ -571,9 +571,9 @@ void JavaLexer::mASSIGN(bool _createToken) { _saveIndex=0; } -void JavaLexer::mETQUAL(bool _createToken) { +void JavaLexer::mEQUAL(bool _createToken) { int _ttype; ANTLR_USE_NAMESPACE(antlr)RefToken _token; ANTLR_USE_NAMESPACE(std)string::size_type _begin = text.length(); - _ttype = ETQUAL; + _ttype = EQUAL; ANTLR_USE_NAMESPACE(std)string::size_type _saveIndex; match("=="); diff --git a/languages/java/JavaLexer.hpp b/languages/java/JavaLexer.hpp index 85d661be..9d185686 100644 --- a/languages/java/JavaLexer.hpp +++ b/languages/java/JavaLexer.hpp @@ -68,7 +68,7 @@ public: public: void mCOLON(bool _createToken); public: void mCOMMA(bool _createToken); public: void mASSIGN(bool _createToken); - public: void mETQUAL(bool _createToken); + public: void mEQUAL(bool _createToken); public: void mLNOT(bool _createToken); public: void mBNOT(bool _createToken); public: void mNOT_EQUAL(bool _createToken); diff --git a/languages/java/JavaRecognizer.cpp b/languages/java/JavaRecognizer.cpp index eb17df00..1021c6a0 100644 --- a/languages/java/JavaRecognizer.cpp +++ b/languages/java/JavaRecognizer.cpp @@ -4181,7 +4181,7 @@ void JavaRecognizer::equalityExpression() { } { // ( ... )* for (;;) { - if ((LA(1) == NOT_EQUAL || LA(1) == ETQUAL)) { + if ((LA(1) == NOT_EQUAL || LA(1) == EQUAL)) { { switch ( LA(1)) { case NOT_EQUAL: @@ -4194,14 +4194,14 @@ void JavaRecognizer::equalityExpression() { match(NOT_EQUAL); break; } - case ETQUAL: + case EQUAL: { RefJavaAST tmp139_AST = RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); if ( inputState->guessing == 0 ) { tmp139_AST = astFactory->create(LT(1)); astFactory->makeASTRoot(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(tmp139_AST)); } - match(ETQUAL); + match(EQUAL); break; } default: @@ -4272,7 +4272,7 @@ void JavaRecognizer::relationalExpression() { case BXOR: case BAND: case NOT_EQUAL: - case ETQUAL: + case EQUAL: case LT_: case GT: case LE: @@ -4969,7 +4969,7 @@ void JavaRecognizer::postfixExpression() { case BXOR: case BAND: case NOT_EQUAL: - case ETQUAL: + case EQUAL: case LT_: case GT: case LE: @@ -5107,7 +5107,7 @@ void JavaRecognizer::postfixExpression() { case BXOR: case BAND: case NOT_EQUAL: - case ETQUAL: + case EQUAL: case LT_: case GT: case LE: @@ -5235,7 +5235,7 @@ void JavaRecognizer::postfixExpression() { case BXOR: case BAND: case NOT_EQUAL: - case ETQUAL: + case EQUAL: case LT_: case GT: case LE: @@ -5581,7 +5581,7 @@ void JavaRecognizer::newExpression() { case BXOR: case BAND: case NOT_EQUAL: - case ETQUAL: + case EQUAL: case LT_: case GT: case LE: @@ -5651,7 +5651,7 @@ void JavaRecognizer::newExpression() { case BXOR: case BAND: case NOT_EQUAL: - case ETQUAL: + case EQUAL: case LT_: case GT: case LE: @@ -6113,7 +6113,7 @@ const char* JavaRecognizer::tokenNames[] = { "BXOR", "BAND", "NOT_EQUAL", - "ETQUAL", + "EQUAL", "LT_", "GT", "LE", @@ -6173,7 +6173,7 @@ const unsigned long JavaRecognizer::_tokenSet_4_data_[] = { 0UL, 67215360UL, 687 // SEMI LBRACK RBRACK IDENT LCURLY RCURLY COMMA "implements" LPAREN RPAREN // ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN // SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION -// LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_4(_tokenSet_4_data_,8); const unsigned long JavaRecognizer::_tokenSet_5_data_[] = { 0UL, 8192UL, 0UL, 0UL, 0UL, 0UL }; // SEMI @@ -6204,13 +6204,13 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_9(_tokenSet_9_d const unsigned long JavaRecognizer::_tokenSet_10_data_[] = { 0UL, 67182592UL, 674816UL, 4194296UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK IDENT RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_10(_tokenSet_10_data_,8); const unsigned long JavaRecognizer::_tokenSet_11_data_[] = { 0UL, 201433088UL, 683008UL, 4194296UL, 0UL, 0UL, 0UL, 0UL }; // SEMI LBRACK RBRACK IDENT DOT RCURLY COMMA LPAREN RPAREN ASSIGN COLON // PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR -// LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// LAND BOR BXOR BAND NOT_EQUAL EQUAL const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_11(_tokenSet_11_data_,8); const unsigned long JavaRecognizer::_tokenSet_12_data_[] = { 0UL, 32768UL, 8192UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // LBRACK LPAREN @@ -6235,7 +6235,7 @@ const unsigned long JavaRecognizer::_tokenSet_16_data_[] = { 2UL, 4294943616UL, // "super" ASSIGN COLON "if" "else" "for" "while" "do" "break" "continue" // "return" "switch" "throw" "case" "default" "try" PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL // NUM_FLOAT NUM_LONG NUM_DOUBLE @@ -6275,7 +6275,7 @@ const unsigned long JavaRecognizer::_tokenSet_22_data_[] = { 0UL, 4294878080UL, // COLON "if" "for" "while" "do" "break" "continue" "return" "switch" "throw" // "try" PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR -// LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR +// LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR // PLUS MINUS DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" NUM_INT // CHAR_LITERAL STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_22(_tokenSet_22_data_,12); @@ -6323,7 +6323,7 @@ const unsigned long JavaRecognizer::_tokenSet_29_data_[] = { 0UL, 4294878080UL, // COLON "if" "else" "for" "while" "do" "break" "continue" "return" "switch" // "throw" "case" "default" "try" "finally" "catch" PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL // NUM_FLOAT NUM_LONG NUM_DOUBLE @@ -6348,7 +6348,7 @@ const unsigned long JavaRecognizer::_tokenSet_33_data_[] = { 0UL, 536780800UL, 2 // SEMI LBRACK "void" "boolean" "byte" "char" "short" "int" "float" "long" // "double" IDENT DOT STAR LPAREN "this" "super" ASSIGN PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL // NUM_FLOAT NUM_LONG NUM_DOUBLE @@ -6377,7 +6377,7 @@ const unsigned long JavaRecognizer::_tokenSet_39_data_[] = { 0UL, 402759680UL, 6 // SEMI LBRACK RBRACK DOT STAR RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN // MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN // SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR -// BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS +// BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS // DIV MOD INC DEC const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_39(_tokenSet_39_data_,12); const unsigned long JavaRecognizer::_tokenSet_40_data_[] = { 0UL, 73728UL, 543744UL, 0UL, 0UL, 0UL, 0UL, 0UL }; @@ -6395,7 +6395,7 @@ const unsigned long JavaRecognizer::_tokenSet_43_data_[] = { 0UL, 536780800UL, 2 // "double" IDENT DOT STAR COMMA LPAREN "this" "super" ASSIGN PLUS_ASSIGN // MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN // SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR -// BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS +// BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS // DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL // STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_43(_tokenSet_43_data_,12); @@ -6467,18 +6467,18 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_55(_tokenSet_55 const unsigned long JavaRecognizer::_tokenSet_56_data_[] = { 0UL, 73728UL, 674816UL, 4194296UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_56(_tokenSet_56_data_,8); const unsigned long JavaRecognizer::_tokenSet_57_data_[] = { 0UL, 73728UL, 674816UL, 134217720UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL // LT_ GT LE GE "instanceof" const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_57(_tokenSet_57_data_,8); const unsigned long JavaRecognizer::_tokenSet_58_data_[] = { 0UL, 73728UL, 674816UL, 1073741816UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL // LT_ GT LE GE "instanceof" SL SR BSR const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_58(_tokenSet_58_data_,8); const unsigned long JavaRecognizer::_tokenSet_59_data_[] = { 0UL, 268435456UL, 0UL, 0UL, 3UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; @@ -6487,13 +6487,13 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_59(_tokenSet_59 const unsigned long JavaRecognizer::_tokenSet_60_data_[] = { 0UL, 73728UL, 674816UL, 4294967288UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_60(_tokenSet_60_data_,8); const unsigned long JavaRecognizer::_tokenSet_61_data_[] = { 0UL, 268509184UL, 674816UL, 4294967288UL, 3UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK STAR RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_61(_tokenSet_61_data_,12); const unsigned long JavaRecognizer::_tokenSet_62_data_[] = { 0UL, 134086656UL, 106496UL, 0UL, 65472UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; @@ -6506,7 +6506,7 @@ const unsigned long JavaRecognizer::_tokenSet_63_data_[] = { 0UL, 536846336UL, 7 // "long" "double" IDENT DOT STAR RCURLY COMMA LPAREN RPAREN "this" "super" // ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN // SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION -// LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL +// LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL // SR BSR PLUS MINUS DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" // NUM_INT CHAR_LITERAL STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_63(_tokenSet_63_data_,12); @@ -6518,7 +6518,7 @@ const unsigned long JavaRecognizer::_tokenSet_64_data_[] = { 0UL, 4294943616UL, // "super" ASSIGN COLON "if" "else" "for" "while" "do" "break" "continue" // "return" "switch" "throw" "case" "default" "try" PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL // NUM_FLOAT NUM_LONG NUM_DOUBLE @@ -6533,7 +6533,7 @@ const unsigned long JavaRecognizer::_tokenSet_66_data_[] = { 0UL, 402759680UL, 6 // SEMI LBRACK RBRACK DOT STAR LCURLY RCURLY COMMA RPAREN ASSIGN COLON // PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR -// LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR +// LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR // PLUS MINUS DIV MOD INC DEC const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_66(_tokenSet_66_data_,12); diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp index e83cd90e..1bdb9522 100644 --- a/languages/java/JavaStoreWalker.cpp +++ b/languages/java/JavaStoreWalker.cpp @@ -2447,11 +2447,11 @@ void JavaStoreWalker::expr(RefJavaAST _t) { _t = _t->getNextSibling(); break; } - case ETQUAL: + case EQUAL: { RefJavaAST __t145 = _t; RefJavaAST tmp104_AST_in = _t; - match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL); + match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL); _t = _t->getFirstChild(); expr(_t); _t = _retTree; @@ -2830,7 +2830,7 @@ void JavaStoreWalker::primaryExpression(RefJavaAST _t) { case BXOR: case BAND: case NOT_EQUAL: - case ETQUAL: + case EQUAL: case LT_: case GT: case LE: @@ -3389,7 +3389,7 @@ const char* JavaStoreWalker::tokenNames[] = { "BXOR", "BAND", "NOT_EQUAL", - "ETQUAL", + "EQUAL", "LT_", "GT", "LE", diff --git a/languages/java/JavaStoreWalkerTokenTypes.hpp b/languages/java/JavaStoreWalkerTokenTypes.hpp index 6f20deaf..44322944 100644 --- a/languages/java/JavaStoreWalkerTokenTypes.hpp +++ b/languages/java/JavaStoreWalkerTokenTypes.hpp @@ -125,7 +125,7 @@ struct CUSTOM_API JavaStoreWalkerTokenTypes { BXOR = 114, BAND = 115, NOT_EQUAL = 116, - ETQUAL = 117, + EQUAL = 117, LT_ = 118, GT = 119, LE = 120, diff --git a/languages/java/JavaTokenTypes.hpp b/languages/java/JavaTokenTypes.hpp index 64a6486b..e36fa54c 100644 --- a/languages/java/JavaTokenTypes.hpp +++ b/languages/java/JavaTokenTypes.hpp @@ -125,7 +125,7 @@ struct CUSTOM_API JavaTokenTypes { BXOR = 114, BAND = 115, NOT_EQUAL = 116, - ETQUAL = 117, + EQUAL = 117, LT_ = 118, GT = 119, LE = 120, diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 14471290..b1f23ac3 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -267,7 +267,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) m_unitDict.insert( fileName, unit ); if( m_fileList->contains(fileName) ){ - kdDebug(9013) << "========================> FILE: " << fileName << " IN TQUEUE <=============" << endl; + kdDebug(9013) << "========================> FILE: " << fileName << " IN QUEUE <=============" << endl; } else { KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) ); } -- cgit v1.2.1