From b7007cb6867ad7953ce3d68376923d64fc867cfd Mon Sep 17 00:00:00 2001 From: joagr Date: Thu, 8 Oct 2015 13:25:18 -0700 Subject: [PATCH] Removed lookahead predicate from exprt (expression term). I'm sure this will break something, but the predicate was causing Proparse to hang when processing very long IF THEN ELSE IF THEN ELSE chains. Please report any new issues! I think this might break some newer syntax where keywords are (now) allowed to be used as class, method, and property names. --- build.number | 4 +- data/bugsfixed/bug11.p | 44 + data/newsyntax/102b/Display.cls | 11 + data/newsyntax/102b/DisplayTest.p | 6 + src/com/joanju/proparse/ProParser.java | 1759 ++++++++--------- src/com/joanju/proparse/proparse.g | 2 +- .../core/unittest/BugFixTests.java | 14 +- 7 files changed, 936 insertions(+), 904 deletions(-) create mode 100644 data/bugsfixed/bug11.p create mode 100644 data/newsyntax/102b/Display.cls create mode 100644 data/newsyntax/102b/DisplayTest.p diff --git a/build.number b/build.number index 1ef42c8..98dfbfd 100644 --- a/build.number +++ b/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Oct 07 14:00:29 PDT 2015 -build.number=1124 +#Thu Oct 08 11:24:45 PDT 2015 +build.number=1126 diff --git a/data/bugsfixed/bug11.p b/data/bugsfixed/bug11.p new file mode 100644 index 0000000..4160096 --- /dev/null +++ b/data/bugsfixed/bug11.p @@ -0,0 +1,44 @@ +/* + Test that long IF THEN ELSE IF THEN ELSE chains don't cause Proparse to hang. + + In proparse.g, I had a lookahead predicate in exprt like this: + (exprt2)=> exprt2 + I think I had added that lookahead predicate back in 2009: + "First steps toward support of static member references and namespace.class + names using reserved keywords" + + That lookahead predicate resulted in the parser to hang on the following code. + I found at around 10 ELSE conditions, I could see Proparse taking a few seconds + to process this, then adding another ELSE seemed to increase the time, perhaps + exponentially. Something like that anyway. + + So now (Oct 2015) I'm removing that lookahead predicate from proparse.g. + I suspect doing this will break something, but my regression tests seem OK. + (See newsyntax/102b/DisplayTest.p and Display.cls) +*/ + +DEFINE VARIABLE lv-i AS INTEGER NO-UNDO. +DEFINE VARIABLE lv-DescId AS CHARACTER NO-UNDO. + +DO lv-i = 1 TO 17 BY 1: + + ASSIGN + lv-DescId = (IF lv-i = 1 THEN "Include In Tender?" + ELSE IF lv-i = 2 THEN "Data Checked?" + ELSE IF lv-i = 3 THEN "Authority To Accept?" + ELSE IF lv-i = 4 THEN "Authority To Tender / Negotiate?" + ELSE IF lv-i = 5 THEN "Authority To Terminate?" + ELSE IF lv-i = 6 THEN "100Kw Site?" + ELSE IF lv-i = 7 THEN "Tendered?" + ELSE IF lv-i = 8 THEN "Interruptable" + ELSE IF lv-i = 9 THEN "Tender Issue Status" + ELSE IF lv-i = 10 THEN "Supplier Agreement Admin Problem?" + ELSE IF lv-i = 11 THEN "View Front End Specification Records" + ELSE IF lv-i = 12 THEN "Set Costing Parameters" + ELSE IF lv-i = 13 THEN "Swap Columns..." + ELSE IF lv-i = 14 THEN "Override Checks!" + ELSE IF lv-i = 15 THEN "Energy Trading Override!" + ELSE IF lv-i = 16 THEN "Add to Tender Basket" + ELSE "Approval to Tender"). +END. /* DO lv-i = 1 TO 17: */ + diff --git a/data/newsyntax/102b/Display.cls b/data/newsyntax/102b/Display.cls new file mode 100644 index 0000000..916ecb0 --- /dev/null +++ b/data/newsyntax/102b/Display.cls @@ -0,0 +1,11 @@ +/* For testing keywords as class, property, method names */ + +class newsyntax.102b.Display: + + def public static property Message as char init "hello" get. set. + + method public static char For(): + return "hi". + end method. + +end class. diff --git a/data/newsyntax/102b/DisplayTest.p b/data/newsyntax/102b/DisplayTest.p new file mode 100644 index 0000000..c9da3b5 --- /dev/null +++ b/data/newsyntax/102b/DisplayTest.p @@ -0,0 +1,6 @@ +using newsyntax.102b.*. + +compile newsyntax/102b/Display.cls. + +display Display:For(). +display Display:Message. diff --git a/src/com/joanju/proparse/ProParser.java b/src/com/joanju/proparse/ProParser.java index f4a3921..9f56017 100644 --- a/src/com/joanju/proparse/ProParser.java +++ b/src/com/joanju/proparse/ProParser.java @@ -439,14 +439,14 @@ public final void annotation() throws RecognitionException, TokenStreamException astFactory.makeASTRoot(currentAST, tmp2_AST); match(ANNOTATION); { - _loop282: + _loop280: do { if ((_tokenSet_12.member(LA(1)))) { not_state_end(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop282; + break _loop280; } } while (true); @@ -630,10 +630,10 @@ public final void widattr() throws RecognitionException, TokenStreamException { ASTPair currentAST = new ASTPair(); JPNode widattr_AST = null; - boolean synPredMatched166 = false; + boolean synPredMatched164 = false; if (((_tokenSet_14.member(LA(1))) && (_tokenSet_15.member(LA(2))))) { - int _m166 = mark(); - synPredMatched166 = true; + int _m164 = mark(); + synPredMatched164 = true; inputState.guessing++; try { { @@ -659,12 +659,12 @@ public final void widattr() throws RecognitionException, TokenStreamException { } } catch (RecognitionException pe) { - synPredMatched166 = false; + synPredMatched164 = false; } - rewind(_m166); + rewind(_m164); inputState.guessing--; } - if ( synPredMatched166 ) { + if ( synPredMatched164 ) { widname(); astFactory.addASTChild(currentAST, returnAST); attr_colon(); @@ -680,10 +680,10 @@ public final void widattr() throws RecognitionException, TokenStreamException { widattr_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched169 = false; + boolean synPredMatched167 = false; if (((_tokenSet_16.member(LA(1))) && (_tokenSet_5.member(LA(2))))) { - int _m169 = mark(); - synPredMatched169 = true; + int _m167 = mark(); + synPredMatched167 = true; inputState.guessing++; try { { @@ -709,12 +709,12 @@ public final void widattr() throws RecognitionException, TokenStreamException { } } catch (RecognitionException pe) { - synPredMatched169 = false; + synPredMatched167 = false; } - rewind(_m169); + rewind(_m167); inputState.guessing--; } - if ( synPredMatched169 ) { + if ( synPredMatched167 ) { exprt2(); astFactory.addASTChild(currentAST, returnAST); attr_colon(); @@ -2764,14 +2764,14 @@ else if ((_tokenSet_22.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } { - _loop902: + _loop900: do { if ((_tokenSet_24.member(LA(1)))) { block_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop902; + break _loop900; } } while (true); @@ -2803,14 +2803,14 @@ public final void forstate() throws RecognitionException, TokenStreamException { for_record_spec(); astFactory.addASTChild(currentAST, returnAST); { - _loop973: + _loop971: do { if ((_tokenSet_24.member(LA(1)))) { block_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop973; + break _loop971; } } while (true); @@ -2864,14 +2864,14 @@ else if ((_tokenSet_22.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } { - _loop1443: + _loop1441: do { if ((_tokenSet_24.member(LA(1)))) { block_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1443; + break _loop1441; } } while (true); @@ -3618,14 +3618,14 @@ public final void querytuningphrase() throws RecognitionException, TokenStreamEx astFactory.addASTChild(currentAST, tmp142_AST); match(LEFTPAREN); { - _loop1406: + _loop1404: do { if ((_tokenSet_26.member(LA(1)))) { querytuning_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1406; + break _loop1404; } } while (true); @@ -3747,12 +3747,12 @@ public final void framephrase() throws RecognitionException, TokenStreamExceptio astFactory.makeASTRoot(currentAST, tmp151_AST); match(WITH); { - _loop1024: + _loop1022: do { - boolean synPredMatched1016 = false; + boolean synPredMatched1014 = false; if (((_tokenSet_8.member(LA(1))) && (_tokenSet_28.member(LA(2))))) { - int _m1016 = mark(); - synPredMatched1016 = true; + int _m1014 = mark(); + synPredMatched1014 = true; inputState.guessing++; try { { @@ -3778,20 +3778,20 @@ public final void framephrase() throws RecognitionException, TokenStreamExceptio } } catch (RecognitionException pe) { - synPredMatched1016 = false; + synPredMatched1014 = false; } - rewind(_m1016); + rewind(_m1014); inputState.guessing--; } - if ( synPredMatched1016 ) { + if ( synPredMatched1014 ) { frame_exp_col(); astFactory.addASTChild(currentAST, returnAST); } else { - boolean synPredMatched1018 = false; + boolean synPredMatched1016 = false; if ((((LA(1) >= LEXDATE && LA(1) <= Last_Token_Number)) && (_tokenSet_11.member(LA(2))))) { - int _m1018 = mark(); - synPredMatched1018 = true; + int _m1016 = mark(); + synPredMatched1016 = true; inputState.guessing++; try { { @@ -3819,22 +3819,22 @@ public final void framephrase() throws RecognitionException, TokenStreamExceptio } } catch (RecognitionException pe) { - synPredMatched1018 = false; + synPredMatched1016 = false; } - rewind(_m1018); + rewind(_m1016); inputState.guessing--; } - if ( synPredMatched1018 ) { + if ( synPredMatched1016 ) { JPNode tmp152_AST = null; tmp152_AST = (JPNode)astFactory.create(LT(1)); astFactory.addASTChild(currentAST, tmp152_AST); matchNot(EOF); } else { - boolean synPredMatched1021 = false; + boolean synPredMatched1019 = false; if (((LA(1)==FRAME) && (_tokenSet_13.member(LA(2))))) { - int _m1021 = mark(); - synPredMatched1021 = true; + int _m1019 = mark(); + synPredMatched1019 = true; inputState.guessing++; try { { @@ -3866,12 +3866,12 @@ public final void framephrase() throws RecognitionException, TokenStreamExceptio } } catch (RecognitionException pe) { - synPredMatched1021 = false; + synPredMatched1019 = false; } - rewind(_m1021); + rewind(_m1019); inputState.guessing--; } - if ( synPredMatched1021 ) { + if ( synPredMatched1019 ) { frame_widgetname(); astFactory.addASTChild(currentAST, returnAST); JPNode tmp153_AST = null; @@ -3880,10 +3880,10 @@ public final void framephrase() throws RecognitionException, TokenStreamExceptio matchNot(EOF); } else { - boolean synPredMatched1023 = false; + boolean synPredMatched1021 = false; if (((_tokenSet_8.member(LA(1))) && (_tokenSet_28.member(LA(2))))) { - int _m1023 = mark(); - synPredMatched1023 = true; + int _m1021 = mark(); + synPredMatched1021 = true; inputState.guessing++; try { { @@ -3892,12 +3892,12 @@ public final void framephrase() throws RecognitionException, TokenStreamExceptio } } catch (RecognitionException pe) { - synPredMatched1023 = false; + synPredMatched1021 = false; } - rewind(_m1023); + rewind(_m1021); inputState.guessing--; } - if ( synPredMatched1023 ) { + if ( synPredMatched1021 ) { frame_exp_down(); astFactory.addASTChild(currentAST, returnAST); } @@ -3906,7 +3906,7 @@ else if ((_tokenSet_29.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1024; + break _loop1022; } }}} } while (true); @@ -4012,7 +4012,7 @@ else if ((_tokenSet_13.member(LA(1))) && (_tokenSet_33.member(LA(2)))) { recordphrase(); astFactory.addASTChild(currentAST, returnAST); { - _loop978: + _loop976: do { if ((LA(1)==COMMA)) { JPNode tmp159_AST = null; @@ -4035,7 +4035,7 @@ else if ((_tokenSet_13.member(LA(1))) && (_tokenSet_33.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop978; + break _loop976; } } while (true); @@ -4050,10 +4050,10 @@ public final void aatracestatement() throws RecognitionException, TokenStreamExc ASTPair currentAST = new ASTPair(); JPNode aatracestatement_AST = null; - boolean synPredMatched245 = false; + boolean synPredMatched243 = false; if (((LA(1)==AATRACE) && (LA(2)==OFF||LA(2)==ON))) { - int _m245 = mark(); - synPredMatched245 = true; + int _m243 = mark(); + synPredMatched243 = true; inputState.guessing++; try { { @@ -4079,21 +4079,21 @@ public final void aatracestatement() throws RecognitionException, TokenStreamExc } } catch (RecognitionException pe) { - synPredMatched245 = false; + synPredMatched243 = false; } - rewind(_m245); + rewind(_m243); inputState.guessing--; } - if ( synPredMatched245 ) { + if ( synPredMatched243 ) { aatraceonoffstate(); astFactory.addASTChild(currentAST, returnAST); aatracestatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched248 = false; + boolean synPredMatched246 = false; if (((LA(1)==AATRACE) && (LA(2)==CLOSE||LA(2)==STREAM||LA(2)==STREAMHANDLE))) { - int _m248 = mark(); - synPredMatched248 = true; + int _m246 = mark(); + synPredMatched246 = true; inputState.guessing++; try { { @@ -4120,21 +4120,21 @@ public final void aatracestatement() throws RecognitionException, TokenStreamExc } } catch (RecognitionException pe) { - synPredMatched248 = false; + synPredMatched246 = false; } - rewind(_m248); + rewind(_m246); inputState.guessing--; } - if ( synPredMatched248 ) { + if ( synPredMatched246 ) { aatraceclosestate(); astFactory.addASTChild(currentAST, returnAST); aatracestatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched252 = false; + boolean synPredMatched250 = false; if (((LA(1)==AATRACE) && (_tokenSet_34.member(LA(2))))) { - int _m252 = mark(); - synPredMatched252 = true; + int _m250 = mark(); + synPredMatched250 = true; inputState.guessing++; try { { @@ -4185,12 +4185,12 @@ public final void aatracestatement() throws RecognitionException, TokenStreamExc } } catch (RecognitionException pe) { - synPredMatched252 = false; + synPredMatched250 = false; } - rewind(_m252); + rewind(_m250); inputState.guessing--; } - if ( synPredMatched252 ) { + if ( synPredMatched250 ) { aatracestate(); astFactory.addASTChild(currentAST, returnAST); aatracestatement_AST = (JPNode)currentAST.root; @@ -4213,14 +4213,14 @@ public final void accumulatestate() throws RecognitionException, TokenStreamExce astFactory.makeASTRoot(currentAST, tmp160_AST); match(ACCUMULATE); { - _loop265: + _loop263: do { if ((_tokenSet_35.member(LA(1)))) { display_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop265; + break _loop263; } } while (true); @@ -4294,7 +4294,7 @@ public final void altertablestate() throws RecognitionException, TokenStreamExce identifier(); astFactory.addASTChild(currentAST, returnAST); { - _loop1735: + _loop1733: do { switch ( LA(1)) { case FORMAT: @@ -4325,7 +4325,7 @@ public final void altertablestate() throws RecognitionException, TokenStreamExce } default: { - break _loop1735; + break _loop1733; } } } while (true); @@ -4385,7 +4385,7 @@ public final void analyzestate() throws RecognitionException, TokenStreamExcepti } } { - _loop278: + _loop276: do { switch ( LA(1)) { case APPEND: @@ -4414,7 +4414,7 @@ public final void analyzestate() throws RecognitionException, TokenStreamExcepti } default: { - break _loop278; + break _loop276; } } } while (true); @@ -4947,14 +4947,14 @@ public final void callstate() throws RecognitionException, TokenStreamException filenameorvalue(); astFactory.addASTChild(currentAST, returnAST); { - _loop359: + _loop357: do { if ((_tokenSet_36.member(LA(1)))) { expressionorvalue(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop359; + break _loop357; } } while (true); @@ -5141,29 +5141,29 @@ public final void choosestate() throws RecognitionException, TokenStreamExceptio } } { - int _cnt384=0; - _loop384: + int _cnt382=0; + _loop382: do { if ((_tokenSet_6.member(LA(1)))) { choose_field(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt384>=1 ) { break _loop384; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt382>=1 ) { break _loop382; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt384++; + _cnt382++; } while (true); } { - _loop386: + _loop384: do { if ((_tokenSet_37.member(LA(1)))) { choose_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop386; + break _loop384; } } while (true); @@ -5212,7 +5212,7 @@ public final void classstate() throws RecognitionException, TokenStreamException type_name2(); astFactory.addASTChild(currentAST, returnAST); { - _loop394: + _loop392: do { switch ( LA(1)) { case INHERITS: @@ -5261,7 +5261,7 @@ public final void classstate() throws RecognitionException, TokenStreamException } default: { - break _loop394; + break _loop392; } } } while (true); @@ -5479,14 +5479,14 @@ else if ((_tokenSet_39.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } { - _loop431: + _loop429: do { if ((_tokenSet_6.member(LA(1)))) { field_form_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop431; + break _loop429; } } while (true); @@ -5533,14 +5533,14 @@ public final void compilestate() throws RecognitionException, TokenStreamExcepti filenameorvalue(); astFactory.addASTChild(currentAST, returnAST); { - _loop452: + _loop450: do { if ((_tokenSet_40.member(LA(1)))) { compile_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop452; + break _loop450; } } while (true); @@ -5566,7 +5566,7 @@ public final void connectstate() throws RecognitionException, TokenStreamExcepti astFactory.makeASTRoot(currentAST, tmp214_AST); match(CONNECT); { - _loop484: + _loop482: do { if ((LA(1)==NOERROR_KW) && (_tokenSet_41.member(LA(2)))) { JPNode tmp215_AST = null; @@ -5585,7 +5585,7 @@ else if ((_tokenSet_42.member(LA(1))) && (_tokenSet_43.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop484; + break _loop482; } } while (true); @@ -5692,10 +5692,10 @@ else if ((_tokenSet_8.member(LA(1)))) { } { - boolean synPredMatched503 = false; + boolean synPredMatched501 = false; if (((LA(1)==FILE) && (_tokenSet_8.member(LA(2))))) { - int _m503 = mark(); - synPredMatched503 = true; + int _m501 = mark(); + synPredMatched501 = true; inputState.guessing++; try { { @@ -5704,12 +5704,12 @@ else if ((_tokenSet_8.member(LA(1)))) { } } catch (RecognitionException pe) { - synPredMatched503 = false; + synPredMatched501 = false; } - rewind(_m503); + rewind(_m501); inputState.guessing--; } - if ( synPredMatched503 ) { + if ( synPredMatched501 ) { JPNode tmp224_AST = null; tmp224_AST = (JPNode)astFactory.create(LT(1)); astFactory.addASTChild(currentAST, tmp224_AST); @@ -5782,10 +5782,10 @@ else if ((_tokenSet_8.member(LA(1))) && (_tokenSet_28.member(LA(2)))) { astFactory.addASTChild(currentAST, tmp226_AST); match(TO); { - boolean synPredMatched509 = false; + boolean synPredMatched507 = false; if (((LA(1)==FILE) && (_tokenSet_8.member(LA(2))))) { - int _m509 = mark(); - synPredMatched509 = true; + int _m507 = mark(); + synPredMatched507 = true; inputState.guessing++; try { { @@ -5794,12 +5794,12 @@ else if ((_tokenSet_8.member(LA(1))) && (_tokenSet_28.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched509 = false; + synPredMatched507 = false; } - rewind(_m509); + rewind(_m507); inputState.guessing--; } - if ( synPredMatched509 ) { + if ( synPredMatched507 ) { JPNode tmp227_AST = null; tmp227_AST = (JPNode)astFactory.create(LT(1)); astFactory.addASTChild(currentAST, tmp227_AST); @@ -5973,10 +5973,10 @@ public final void createstatement() throws RecognitionException, TokenStreamExce ASTPair currentAST = new ASTPair(); JPNode createstatement_AST = null; - boolean synPredMatched520 = false; + boolean synPredMatched518 = false; if (((LA(1)==CREATE) && (LA(2)==WIDGETPOOL))) { - int _m520 = mark(); - synPredMatched520 = true; + int _m518 = mark(); + synPredMatched518 = true; inputState.guessing++; try { { @@ -5986,21 +5986,21 @@ public final void createstatement() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched520 = false; + synPredMatched518 = false; } - rewind(_m520); + rewind(_m518); inputState.guessing--; } - if ( synPredMatched520 ) { + if ( synPredMatched518 ) { createwidgetpoolstate(); astFactory.addASTChild(currentAST, returnAST); createstatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched523 = false; + boolean synPredMatched521 = false; if (((LA(1)==CREATE) && (_tokenSet_13.member(LA(2))))) { - int _m523 = mark(); - synPredMatched523 = true; + int _m521 = mark(); + synPredMatched521 = true; inputState.guessing++; try { { @@ -6037,12 +6037,12 @@ public final void createstatement() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched523 = false; + synPredMatched521 = false; } - rewind(_m523); + rewind(_m521); inputState.guessing--; } - if ( synPredMatched523 ) { + if ( synPredMatched521 ) { createstate(); astFactory.addASTChild(currentAST, returnAST); createstatement_AST = (JPNode)currentAST.root; @@ -6715,7 +6715,7 @@ public final void definestatement() throws RecognitionException, TokenStreamExce support.setCurrDefInheritable(false); } { - _loop610: + _loop608: do { switch ( LA(1)) { case PRIVATE: @@ -6774,7 +6774,7 @@ public final void definestatement() throws RecognitionException, TokenStreamExce } default: { - break _loop610; + break _loop608; } } } while (true); @@ -7057,10 +7057,10 @@ public final void deletestatement() throws RecognitionException, TokenStreamExce ASTPair currentAST = new ASTPair(); JPNode deletestatement_AST = null; - boolean synPredMatched840 = false; + boolean synPredMatched838 = false; if (((LA(1)==DELETE_KW) && (LA(2)==WIDGETPOOL))) { - int _m840 = mark(); - synPredMatched840 = true; + int _m838 = mark(); + synPredMatched838 = true; inputState.guessing++; try { { @@ -7088,21 +7088,21 @@ public final void deletestatement() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched840 = false; + synPredMatched838 = false; } - rewind(_m840); + rewind(_m838); inputState.guessing--; } - if ( synPredMatched840 ) { + if ( synPredMatched838 ) { deletewidgetpoolstate(); astFactory.addASTChild(currentAST, returnAST); deletestatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched843 = false; + boolean synPredMatched841 = false; if (((LA(1)==DELETE_KW) && (_tokenSet_13.member(LA(2))))) { - int _m843 = mark(); - synPredMatched843 = true; + int _m841 = mark(); + synPredMatched841 = true; inputState.guessing++; try { { @@ -7135,12 +7135,12 @@ public final void deletestatement() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched843 = false; + synPredMatched841 = false; } - rewind(_m843); + rewind(_m841); inputState.guessing--; } - if ( synPredMatched843 ) { + if ( synPredMatched841 ) { deletestate(); astFactory.addASTChild(currentAST, returnAST); deletestatement_AST = (JPNode)currentAST.root; @@ -7223,18 +7223,18 @@ else if ((_tokenSet_48.member(LA(1)))) { default: if ((_tokenSet_49.member(LA(1)))) { { - int _cnt869=0; - _loop869: + int _cnt867=0; + _loop867: do { if ((_tokenSet_49.member(LA(1)))) { form_item(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt869>=1 ) { break _loop869; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt867>=1 ) { break _loop867; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt869++; + _cnt867++; } while (true); } } @@ -7476,14 +7476,14 @@ else if ((_tokenSet_51.member(LA(1)))) { } } { - _loop882: + _loop880: do { if ((LA(1)==WITH)) { display_with(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop882; + break _loop880; } } while (true); @@ -7699,18 +7699,18 @@ else if ((_tokenSet_53.member(LA(1)))) { default: if ((_tokenSet_49.member(LA(1)))) { { - int _cnt925=0; - _loop925: + int _cnt923=0; + _loop923: do { if ((_tokenSet_49.member(LA(1)))) { form_item(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt925>=1 ) { break _loop925; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt923>=1 ) { break _loop923; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt925++; + _cnt923++; } while (true); } } @@ -7886,7 +7886,7 @@ else if ((LA(1)==EOF||LA(1)==PERIOD||LA(1)==COMMA)) { } { - _loop1768: + _loop1766: do { if ((LA(1)==COMMA)) { JPNode tmp308_AST = null; @@ -7909,7 +7909,7 @@ else if ((LA(1)==EOF||LA(1)==PERIOD||LA(1)==COMMA)) { } } else { - break _loop1768; + break _loop1766; } } while (true); @@ -7995,7 +7995,7 @@ else if ((_tokenSet_13.member(LA(1))) && (_tokenSet_58.member(LA(2)))) { recordphrase(); astFactory.addASTChild(currentAST, returnAST); { - _loop969: + _loop967: do { switch ( LA(1)) { case NOWAIT: @@ -8024,7 +8024,7 @@ else if ((_tokenSet_13.member(LA(1))) && (_tokenSet_58.member(LA(2)))) { } default: { - break _loop969; + break _loop967; } } } while (true); @@ -8503,7 +8503,7 @@ public final void getstate() throws RecognitionException, TokenStreamException { queryname(); astFactory.addASTChild(currentAST, returnAST); { - _loop1086: + _loop1084: do { switch ( LA(1)) { case EXCLUSIVELOCK: @@ -8524,7 +8524,7 @@ public final void getstate() throws RecognitionException, TokenStreamException { } default: { - break _loop1086; + break _loop1084; } } } while (true); @@ -8610,10 +8610,10 @@ public final void grantstate() throws RecognitionException, TokenStreamException astFactory.addASTChild(currentAST, tmp344_AST); match(ON); { - boolean synPredMatched1775 = false; + boolean synPredMatched1773 = false; if (((_tokenSet_13.member(LA(1))) && (_tokenSet_61.member(LA(2))))) { - int _m1775 = mark(); - synPredMatched1775 = true; + int _m1773 = mark(); + synPredMatched1773 = true; inputState.guessing++; try { { @@ -8621,12 +8621,12 @@ public final void grantstate() throws RecognitionException, TokenStreamException } } catch (RecognitionException pe) { - synPredMatched1775 = false; + synPredMatched1773 = false; } - rewind(_m1775); + rewind(_m1773); inputState.guessing--; } - if ( synPredMatched1775 ) { + if ( synPredMatched1773 ) { record(); astFactory.addASTChild(currentAST, returnAST); } @@ -8723,14 +8723,14 @@ else if ((_tokenSet_62.member(LA(1))) && (_tokenSet_63.member(LA(2)))) { default: if ((_tokenSet_64.member(LA(1))) && (_tokenSet_63.member(LA(2)))) { { - _loop1105: + _loop1103: do { if ((_tokenSet_65.member(LA(1)))) { gwidget(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1105; + break _loop1103; } } while (true); @@ -8889,10 +8889,10 @@ else if ((_tokenSet_69.member(LA(1)))) { } } { - boolean synPredMatched1125 = false; + boolean synPredMatched1123 = false; if (((_tokenSet_71.member(LA(1))) && (_tokenSet_72.member(LA(2))))) { - int _m1125 = mark(); - synPredMatched1125 = true; + int _m1123 = mark(); + synPredMatched1123 = true; inputState.guessing++; try { { @@ -8923,15 +8923,15 @@ else if ((LA(1)==CARET)) { } } catch (RecognitionException pe) { - synPredMatched1125 = false; + synPredMatched1123 = false; } - rewind(_m1125); + rewind(_m1123); inputState.guessing--; } - if ( synPredMatched1125 ) { + if ( synPredMatched1123 ) { { - int _cnt1127=0; - _loop1127: + int _cnt1125=0; + _loop1125: do { if ((_tokenSet_6.member(LA(1)))) { field(); @@ -8944,10 +8944,10 @@ else if ((LA(1)==CARET)) { match(CARET); } else { - if ( _cnt1127>=1 ) { break _loop1127; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt1125>=1 ) { break _loop1125; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt1127++; + _cnt1125++; } while (true); } } @@ -9048,10 +9048,10 @@ public final void inputstatement() throws RecognitionException, TokenStreamExcep ASTPair currentAST = new ASTPair(); JPNode inputstatement_AST = null; - boolean synPredMatched1141 = false; + boolean synPredMatched1139 = false; if (((LA(1)==INPUT) && (LA(2)==CLEAR))) { - int _m1141 = mark(); - synPredMatched1141 = true; + int _m1139 = mark(); + synPredMatched1139 = true; inputState.guessing++; try { { @@ -9060,21 +9060,21 @@ public final void inputstatement() throws RecognitionException, TokenStreamExcep } } catch (RecognitionException pe) { - synPredMatched1141 = false; + synPredMatched1139 = false; } - rewind(_m1141); + rewind(_m1139); inputState.guessing--; } - if ( synPredMatched1141 ) { + if ( synPredMatched1139 ) { inputclearstate(); astFactory.addASTChild(currentAST, returnAST); inputstatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched1144 = false; + boolean synPredMatched1142 = false; if (((LA(1)==INPUT) && (LA(2)==CLOSE||LA(2)==STREAM||LA(2)==STREAMHANDLE))) { - int _m1144 = mark(); - synPredMatched1144 = true; + int _m1142 = mark(); + synPredMatched1142 = true; inputState.guessing++; try { { @@ -9101,21 +9101,21 @@ public final void inputstatement() throws RecognitionException, TokenStreamExcep } } catch (RecognitionException pe) { - synPredMatched1144 = false; + synPredMatched1142 = false; } - rewind(_m1144); + rewind(_m1142); inputState.guessing--; } - if ( synPredMatched1144 ) { + if ( synPredMatched1142 ) { inputclosestate(); astFactory.addASTChild(currentAST, returnAST); inputstatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched1147 = false; + boolean synPredMatched1145 = false; if (((LA(1)==INPUT) && (LA(2)==FROM||LA(2)==STREAM||LA(2)==STREAMHANDLE))) { - int _m1147 = mark(); - synPredMatched1147 = true; + int _m1145 = mark(); + synPredMatched1145 = true; inputState.guessing++; try { { @@ -9142,21 +9142,21 @@ public final void inputstatement() throws RecognitionException, TokenStreamExcep } } catch (RecognitionException pe) { - synPredMatched1147 = false; + synPredMatched1145 = false; } - rewind(_m1147); + rewind(_m1145); inputState.guessing--; } - if ( synPredMatched1147 ) { + if ( synPredMatched1145 ) { inputfromstate(); astFactory.addASTChild(currentAST, returnAST); inputstatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched1150 = false; + boolean synPredMatched1148 = false; if (((LA(1)==INPUT) && (LA(2)==STREAM||LA(2)==THROUGH||LA(2)==STREAMHANDLE))) { - int _m1150 = mark(); - synPredMatched1150 = true; + int _m1148 = mark(); + synPredMatched1148 = true; inputState.guessing++; try { { @@ -9183,12 +9183,12 @@ public final void inputstatement() throws RecognitionException, TokenStreamExcep } } catch (RecognitionException pe) { - synPredMatched1150 = false; + synPredMatched1148 = false; } - rewind(_m1150); + rewind(_m1148); inputState.guessing--; } - if ( synPredMatched1150 ) { + if ( synPredMatched1148 ) { inputthroughstate(); astFactory.addASTChild(currentAST, returnAST); inputstatement_AST = (JPNode)currentAST.root; @@ -9206,10 +9206,10 @@ public final void inputoutputstatement() throws RecognitionException, TokenStrea ASTPair currentAST = new ASTPair(); JPNode inputoutputstatement_AST = null; - boolean synPredMatched1161 = false; + boolean synPredMatched1159 = false; if (((LA(1)==INPUTOUTPUT) && (LA(2)==CLOSE||LA(2)==STREAM||LA(2)==STREAMHANDLE))) { - int _m1161 = mark(); - synPredMatched1161 = true; + int _m1159 = mark(); + synPredMatched1159 = true; inputState.guessing++; try { { @@ -9236,21 +9236,21 @@ public final void inputoutputstatement() throws RecognitionException, TokenStrea } } catch (RecognitionException pe) { - synPredMatched1161 = false; + synPredMatched1159 = false; } - rewind(_m1161); + rewind(_m1159); inputState.guessing--; } - if ( synPredMatched1161 ) { + if ( synPredMatched1159 ) { inputoutputclosestate(); astFactory.addASTChild(currentAST, returnAST); inputoutputstatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched1164 = false; + boolean synPredMatched1162 = false; if (((LA(1)==INPUTOUTPUT) && (LA(2)==STREAM||LA(2)==THROUGH||LA(2)==STREAMHANDLE))) { - int _m1164 = mark(); - synPredMatched1164 = true; + int _m1162 = mark(); + synPredMatched1162 = true; inputState.guessing++; try { { @@ -9277,12 +9277,12 @@ public final void inputoutputstatement() throws RecognitionException, TokenStrea } } catch (RecognitionException pe) { - synPredMatched1164 = false; + synPredMatched1162 = false; } - rewind(_m1164); + rewind(_m1162); inputState.guessing--; } - if ( synPredMatched1164 ) { + if ( synPredMatched1162 ) { inputoutputthroughstate(); astFactory.addASTChild(currentAST, returnAST); inputoutputstatement_AST = (JPNode)currentAST.root; @@ -9413,14 +9413,14 @@ public final void loadstate() throws RecognitionException, TokenStreamException expression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1223: + _loop1221: do { if ((_tokenSet_75.member(LA(1)))) { load_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1223; + break _loop1221; } } while (true); @@ -9458,27 +9458,27 @@ else if ((_tokenSet_76.member(LA(1)))) { } { - _loop1228: + _loop1226: do { if ((_tokenSet_77.member(LA(1)))) { message_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1228; + break _loop1226; } } while (true); } { - _loop1230: + _loop1228: do { if ((LA(1)==SET||LA(1)==UPDATE||LA(1)==VIEWAS)) { message_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1230; + break _loop1228; } } while (true); @@ -9529,7 +9529,7 @@ public final void methodstate() throws RecognitionException, TokenStreamExceptio support.setCurrDefInheritable(true); } { - _loop1246: + _loop1244: do { if ((LA(1)==PRIVATE) && (_tokenSet_44.member(LA(2)))) { JPNode tmp365_AST = null; @@ -9580,7 +9580,7 @@ else if ((LA(1)==FINAL) && (_tokenSet_44.member(LA(2)))) { match(FINAL); } else { - break _loop1246; + break _loop1244; } } while (true); @@ -9596,10 +9596,10 @@ else if ((_tokenSet_44.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { datatype(); astFactory.addASTChild(currentAST, returnAST); { - boolean synPredMatched1250 = false; + boolean synPredMatched1248 = false; if (((LA(1)==EXTENT) && ((LA(2) >= LEXDATE && LA(2) <= Last_Token_Number)))) { - int _m1250 = mark(); - synPredMatched1250 = true; + int _m1248 = mark(); + synPredMatched1248 = true; inputState.guessing++; try { { @@ -9607,12 +9607,12 @@ else if ((_tokenSet_44.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched1250 = false; + synPredMatched1248 = false; } - rewind(_m1250); + rewind(_m1248); inputState.guessing--; } - if ( synPredMatched1250 ) { + if ( synPredMatched1248 ) { extentphrase(); astFactory.addASTChild(currentAST, returnAST); } @@ -9787,10 +9787,10 @@ public final void onstate() throws RecognitionException, TokenStreamException { sthd(onstate_AST,0); } { - boolean synPredMatched1271 = false; + boolean synPredMatched1269 = false; if (((_tokenSet_79.member(LA(1))) && (LA(2)==OF))) { - int _m1271 = mark(); - synPredMatched1271 = true; + int _m1269 = mark(); + synPredMatched1269 = true; inputState.guessing++; try { { @@ -9841,12 +9841,12 @@ else if ((_tokenSet_6.member(LA(1)))) { } } catch (RecognitionException pe) { - synPredMatched1271 = false; + synPredMatched1269 = false; } - rewind(_m1271); + rewind(_m1269); inputState.guessing--; } - if ( synPredMatched1271 ) { + if ( synPredMatched1269 ) { { switch ( LA(1)) { case CREATE: @@ -10156,10 +10156,10 @@ else if ((_tokenSet_80.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } else { - boolean synPredMatched1289 = false; + boolean synPredMatched1287 = false; if ((((LA(1) >= LEXDATE && LA(1) <= Last_Token_Number)) && ((LA(2) >= LEXDATE && LA(2) <= Last_Token_Number)))) { - int _m1289 = mark(); - synPredMatched1289 = true; + int _m1287 = mark(); + synPredMatched1287 = true; inputState.guessing++; try { { @@ -10169,12 +10169,12 @@ else if ((_tokenSet_80.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched1289 = false; + synPredMatched1287 = false; } - rewind(_m1289); + rewind(_m1287); inputState.guessing--; } - if ( synPredMatched1289 ) { + if ( synPredMatched1287 ) { JPNode tmp395_AST = null; tmp395_AST = (JPNode)astFactory.create(LT(1)); astFactory.addASTChild(currentAST, tmp395_AST); @@ -10208,7 +10208,7 @@ else if (((LA(1) >= LEXDATE && LA(1) <= Last_Token_Number)) && (LA(2)==ANYWHERE| widgetlist(); astFactory.addASTChild(currentAST, returnAST); { - _loop1292: + _loop1290: do { if ((LA(1)==OR)) { JPNode tmp399_AST = null; @@ -10225,7 +10225,7 @@ else if (((LA(1) >= LEXDATE && LA(1) <= Last_Token_Number)) && (LA(2)==ANYWHERE| astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1292; + break _loop1290; } } while (true); @@ -10497,14 +10497,14 @@ else if ((_tokenSet_11.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } { - _loop1322: + _loop1320: do { if ((_tokenSet_12.member(LA(1)))) { anyorvalue(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1322; + break _loop1320; } } while (true); @@ -10556,14 +10556,14 @@ public final void oscreatedirstate() throws RecognitionException, TokenStreamExc filenameorvalue(); astFactory.addASTChild(currentAST, returnAST); { - _loop1326: + _loop1324: do { if ((_tokenSet_12.member(LA(1)))) { anyorvalue(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1326; + break _loop1324; } } while (true); @@ -10589,13 +10589,13 @@ public final void osdeletestate() throws RecognitionException, TokenStreamExcept astFactory.makeASTRoot(currentAST, tmp419_AST); match(OSDELETE); { - int _cnt1332=0; - _loop1332: + int _cnt1330=0; + _loop1330: do { - boolean synPredMatched1330 = false; + boolean synPredMatched1328 = false; if (((LA(1)==VALUE) && (LA(2)==LEFTPAREN))) { - int _m1330 = mark(); - synPredMatched1330 = true; + int _m1328 = mark(); + synPredMatched1328 = true; inputState.guessing++; try { { @@ -10604,12 +10604,12 @@ public final void osdeletestate() throws RecognitionException, TokenStreamExcept } } catch (RecognitionException pe) { - synPredMatched1330 = false; + synPredMatched1328 = false; } - rewind(_m1330); + rewind(_m1328); inputState.guessing--; } - if ( synPredMatched1330 ) { + if ( synPredMatched1328 ) { valueexpression(); astFactory.addASTChild(currentAST, returnAST); } @@ -10622,10 +10622,10 @@ else if ((_tokenSet_85.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } else { - if ( _cnt1332>=1 ) { break _loop1332; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt1330>=1 ) { break _loop1330; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt1332++; + _cnt1330++; } while (true); } { @@ -10689,10 +10689,10 @@ public final void outputstatement() throws RecognitionException, TokenStreamExce ASTPair currentAST = new ASTPair(); JPNode outputstatement_AST = null; - boolean synPredMatched1338 = false; + boolean synPredMatched1336 = false; if (((LA(1)==OUTPUT) && (LA(2)==CLOSE||LA(2)==STREAM||LA(2)==STREAMHANDLE))) { - int _m1338 = mark(); - synPredMatched1338 = true; + int _m1336 = mark(); + synPredMatched1336 = true; inputState.guessing++; try { { @@ -10719,21 +10719,21 @@ public final void outputstatement() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched1338 = false; + synPredMatched1336 = false; } - rewind(_m1338); + rewind(_m1336); inputState.guessing--; } - if ( synPredMatched1338 ) { + if ( synPredMatched1336 ) { outputclosestate(); astFactory.addASTChild(currentAST, returnAST); outputstatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched1341 = false; + boolean synPredMatched1339 = false; if (((LA(1)==OUTPUT) && (LA(2)==STREAM||LA(2)==THROUGH||LA(2)==STREAMHANDLE))) { - int _m1341 = mark(); - synPredMatched1341 = true; + int _m1339 = mark(); + synPredMatched1339 = true; inputState.guessing++; try { { @@ -10760,21 +10760,21 @@ public final void outputstatement() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched1341 = false; + synPredMatched1339 = false; } - rewind(_m1341); + rewind(_m1339); inputState.guessing--; } - if ( synPredMatched1341 ) { + if ( synPredMatched1339 ) { outputthroughstate(); astFactory.addASTChild(currentAST, returnAST); outputstatement_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched1344 = false; + boolean synPredMatched1342 = false; if (((LA(1)==OUTPUT) && (LA(2)==STREAM||LA(2)==TO||LA(2)==STREAMHANDLE))) { - int _m1344 = mark(); - synPredMatched1344 = true; + int _m1342 = mark(); + synPredMatched1342 = true; inputState.guessing++; try { { @@ -10801,12 +10801,12 @@ public final void outputstatement() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched1344 = false; + synPredMatched1342 = false; } - rewind(_m1344); + rewind(_m1342); inputState.guessing--; } - if ( synPredMatched1344 ) { + if ( synPredMatched1342 ) { outputtostate(); astFactory.addASTChild(currentAST, returnAST); outputstatement_AST = (JPNode)currentAST.root; @@ -10881,14 +10881,14 @@ else if ((_tokenSet_86.member(LA(1)))) { } { - _loop1357: + _loop1355: do { if ((_tokenSet_87.member(LA(1)))) { pause_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1357; + break _loop1355; } } while (true); @@ -11232,7 +11232,7 @@ public final void putcursorstate() throws RecognitionException, TokenStreamExcep case ROW: { { - _loop1393: + _loop1391: do { switch ( LA(1)) { case ROW: @@ -11250,7 +11250,7 @@ public final void putcursorstate() throws RecognitionException, TokenStreamExcep } default: { - break _loop1393; + break _loop1391; } } } while (true); @@ -11322,7 +11322,7 @@ else if ((_tokenSet_95.member(LA(1))) && (_tokenSet_9.member(LA(2)))) { } } { - _loop1389: + _loop1387: do { switch ( LA(1)) { case SKIP: @@ -11346,7 +11346,7 @@ else if ((_tokenSet_8.member(LA(1))) && (_tokenSet_9.member(LA(2)))) { expression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1388: + _loop1386: do { switch ( LA(1)) { case FORMAT: @@ -11369,14 +11369,14 @@ else if ((_tokenSet_8.member(LA(1))) && (_tokenSet_9.member(LA(2)))) { } default: { - break _loop1388; + break _loop1386; } } } while (true); } } else { - break _loop1389; + break _loop1387; } } } while (true); @@ -11406,7 +11406,7 @@ public final void putscreenstate() throws RecognitionException, TokenStreamExcep astFactory.addASTChild(currentAST, tmp439_AST); match(SCREEN); { - _loop1396: + _loop1394: do { switch ( LA(1)) { case ATTRSPACE: @@ -11445,7 +11445,7 @@ else if ((_tokenSet_8.member(LA(1))) && (_tokenSet_9.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1396; + break _loop1394; } } } while (true); @@ -11725,10 +11725,10 @@ public final void releasestatement() throws RecognitionException, TokenStreamExc ASTPair currentAST = new ASTPair(); JPNode releasestatement_AST = null; - boolean synPredMatched1466 = false; + boolean synPredMatched1464 = false; if (((LA(1)==RELEASE) && (_tokenSet_13.member(LA(2))))) { - int _m1466 = mark(); - synPredMatched1466 = true; + int _m1464 = mark(); + synPredMatched1464 = true; inputState.guessing++; try { { @@ -11760,12 +11760,12 @@ public final void releasestatement() throws RecognitionException, TokenStreamExc } } catch (RecognitionException pe) { - synPredMatched1466 = false; + synPredMatched1464 = false; } - rewind(_m1466); + rewind(_m1464); inputState.guessing--; } - if ( synPredMatched1466 ) { + if ( synPredMatched1464 ) { releasestate(); astFactory.addASTChild(currentAST, returnAST); releasestatement_AST = (JPNode)currentAST.root; @@ -11873,10 +11873,10 @@ public final void revokestate() throws RecognitionException, TokenStreamExceptio astFactory.addASTChild(currentAST, tmp460_AST); match(ON); { - boolean synPredMatched1801 = false; + boolean synPredMatched1799 = false; if (((_tokenSet_13.member(LA(1))) && (_tokenSet_61.member(LA(2))))) { - int _m1801 = mark(); - synPredMatched1801 = true; + int _m1799 = mark(); + synPredMatched1799 = true; inputState.guessing++; try { { @@ -11884,12 +11884,12 @@ public final void revokestate() throws RecognitionException, TokenStreamExceptio } } catch (RecognitionException pe) { - synPredMatched1801 = false; + synPredMatched1799 = false; } - rewind(_m1801); + rewind(_m1799); inputState.guessing--; } - if ( synPredMatched1801 ) { + if ( synPredMatched1799 ) { record(); astFactory.addASTChild(currentAST, returnAST); } @@ -12676,14 +12676,14 @@ public final void systemdialogfontstate() throws RecognitionException, TokenStre expression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1583: + _loop1581: do { if ((_tokenSet_103.member(LA(1)))) { sysdiafont_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1583; + break _loop1581; } } while (true); @@ -12715,14 +12715,14 @@ public final void systemdialoggetdirstate() throws RecognitionException, TokenSt field(); astFactory.addASTChild(currentAST, returnAST); { - _loop1587: + _loop1585: do { if ((_tokenSet_104.member(LA(1)))) { systemdialoggetdir_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1587; + break _loop1585; } } while (true); @@ -12754,14 +12754,14 @@ public final void systemdialoggetfilestate() throws RecognitionException, TokenS field(); astFactory.addASTChild(currentAST, returnAST); { - _loop1591: + _loop1589: do { if ((_tokenSet_105.member(LA(1)))) { sysdiagetfile_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1591; + break _loop1589; } } while (true); @@ -12791,14 +12791,14 @@ public final void systemdialogprintersetupstate() throws RecognitionException, T astFactory.addASTChild(currentAST, tmp502_AST); match(PRINTERSETUP); { - _loop1599: + _loop1597: do { if ((_tokenSet_106.member(LA(1)))) { sysdiapri_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1599; + break _loop1597; } } while (true); @@ -13310,14 +13310,14 @@ else if ((_tokenSet_39.member(LA(1)))) { } { - _loop1660: + _loop1658: do { if ((_tokenSet_6.member(LA(1)))) { field_form_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1660; + break _loop1658; } } while (true); @@ -13599,10 +13599,10 @@ public final void updatestatement() throws RecognitionException, TokenStreamExce ASTPair currentAST = new ASTPair(); JPNode updatestatement_AST = null; - boolean synPredMatched1682 = false; + boolean synPredMatched1680 = false; if (((LA(1)==UPDATE) && (_tokenSet_13.member(LA(2))))) { - int _m1682 = mark(); - synPredMatched1682 = true; + int _m1680 = mark(); + synPredMatched1680 = true; inputState.guessing++; try { { @@ -13612,12 +13612,12 @@ public final void updatestatement() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched1682 = false; + synPredMatched1680 = false; } - rewind(_m1682); + rewind(_m1680); inputState.guessing--; } - if ( synPredMatched1682 ) { + if ( synPredMatched1680 ) { sqlupdatestate(); astFactory.addASTChild(currentAST, returnAST); updatestatement_AST = (JPNode)currentAST.root; @@ -13811,14 +13811,14 @@ else if ((_tokenSet_111.member(LA(1))) && (_tokenSet_112.member(LA(2)))) { } { - _loop1707: + _loop1705: do { if ((_tokenSet_65.member(LA(1)))) { gwidget(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1707; + break _loop1705; } } while (true); @@ -13898,14 +13898,14 @@ public final void waitforstate() throws RecognitionException, TokenStreamExcepti widgetlist(); astFactory.addASTChild(currentAST, returnAST); { - _loop1715: + _loop1713: do { if ((LA(1)==OR)) { waitfor_or(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1715; + break _loop1713; } } while (true); @@ -14157,7 +14157,7 @@ public final void nextvaluefunc() throws RecognitionException, TokenStreamExcept sequencename(); astFactory.addASTChild(currentAST, returnAST); { - _loop1264: + _loop1262: do { if ((LA(1)==COMMA)) { JPNode tmp555_AST = null; @@ -14168,7 +14168,7 @@ public final void nextvaluefunc() throws RecognitionException, TokenStreamExcept astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1264; + break _loop1262; } } while (true); @@ -15455,14 +15455,14 @@ else if ((_tokenSet_123.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } { - _loop1454: + _loop1452: do { if ((_tokenSet_124.member(LA(1))) && (_tokenSet_125.member(LA(2)))) { record_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1454; + break _loop1452; } } while (true); @@ -15900,55 +15900,38 @@ public final void exprt() throws RecognitionException, TokenStreamException { } exprt_AST = (JPNode)currentAST.root; } - else { - boolean synPredMatched147 = false; - if (((_tokenSet_16.member(LA(1))) && (_tokenSet_11.member(LA(2))))) { - int _m147 = mark(); - synPredMatched147 = true; - inputState.guessing++; - try { - { - exprt2(); - } - } - catch (RecognitionException pe) { - synPredMatched147 = false; - } - rewind(_m147); -inputState.guessing--; - } - if ( synPredMatched147 ) { - exprt2(); + else if ((_tokenSet_16.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { + exprt2(); + astFactory.addASTChild(currentAST, returnAST); + { + if ((LA(1)==OBJCOLON||LA(1)==DOUBLECOLON) && ((LA(2) >= LEXDATE && LA(2) <= Last_Token_Number))) { + attr_colon(); astFactory.addASTChild(currentAST, returnAST); - { - if ((LA(1)==OBJCOLON||LA(1)==DOUBLECOLON) && ((LA(2) >= LEXDATE && LA(2) <= Last_Token_Number))) { - attr_colon(); - astFactory.addASTChild(currentAST, returnAST); - if ( inputState.guessing==0 ) { - exprt_AST = (JPNode)currentAST.root; - exprt_AST=(JPNode)astFactory.make( (new ASTArray(2)).add((JPNode)astFactory.create(Widget_ref)).add(exprt_AST)); - currentAST.root = exprt_AST; - currentAST.child = exprt_AST!=null &&exprt_AST.getFirstChild()!=null ? - exprt_AST.getFirstChild() : exprt_AST; - currentAST.advanceChildToEnd(); - } - } - else if ((_tokenSet_11.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { - } - else { - throw new NoViableAltException(LT(1), getFilename()); - } - + if ( inputState.guessing==0 ) { + exprt_AST = (JPNode)currentAST.root; + exprt_AST=(JPNode)astFactory.make( (new ASTArray(2)).add((JPNode)astFactory.create(Widget_ref)).add(exprt_AST)); + currentAST.root = exprt_AST; + currentAST.child = exprt_AST!=null &&exprt_AST.getFirstChild()!=null ? + exprt_AST.getFirstChild() : exprt_AST; + currentAST.advanceChildToEnd(); } - exprt_AST = (JPNode)currentAST.root; + } + else if ((_tokenSet_11.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } else { throw new NoViableAltException(LT(1), getFilename()); } - }} - returnAST = exprt_AST; + + } + exprt_AST = (JPNode)currentAST.root; } - + else { + throw new NoViableAltException(LT(1), getFilename()); + } + } + returnAST = exprt_AST; + } + public final void widgetname() throws RecognitionException, TokenStreamException { returnAST = null; @@ -15976,10 +15959,10 @@ public final void ldbnamefunc() throws RecognitionException, TokenStreamExceptio astFactory.addASTChild(currentAST, tmp682_AST); match(LEFTPAREN); { - boolean synPredMatched1213 = false; + boolean synPredMatched1211 = false; if (((LA(1)==BUFFER) && (_tokenSet_13.member(LA(2))))) { - int _m1213 = mark(); - synPredMatched1213 = true; + int _m1211 = mark(); + synPredMatched1211 = true; inputState.guessing++; try { { @@ -15987,12 +15970,12 @@ public final void ldbnamefunc() throws RecognitionException, TokenStreamExceptio } } catch (RecognitionException pe) { - synPredMatched1213 = false; + synPredMatched1211 = false; } - rewind(_m1213); + rewind(_m1211); inputState.guessing--; } - if ( synPredMatched1213 ) { + if ( synPredMatched1211 ) { ldbname_opt1(); astFactory.addASTChild(currentAST, returnAST); } @@ -17944,10 +17927,10 @@ public final void datatype_var() throws RecognitionException, TokenStreamExcepti JPNode id_AST = null; int datatype; - boolean synPredMatched585 = false; + boolean synPredMatched583 = false; if (((_tokenSet_44.member(LA(1))) && (_tokenSet_11.member(LA(2))))) { - int _m585 = mark(); - synPredMatched585 = true; + int _m583 = mark(); + synPredMatched583 = true; inputState.guessing++; try { { @@ -17955,12 +17938,12 @@ public final void datatype_var() throws RecognitionException, TokenStreamExcepti } } catch (RecognitionException pe) { - synPredMatched585 = false; + synPredMatched583 = false; } - rewind(_m585); + rewind(_m583); inputState.guessing--; } - if ( synPredMatched585 ) { + if ( synPredMatched583 ) { type_name(); astFactory.addASTChild(currentAST, returnAST); datatype_var_AST = (JPNode)currentAST.root; @@ -18322,7 +18305,7 @@ public final void filename() throws RecognitionException, TokenStreamException { theText += t1_AST.getText(); } { - _loop227: + _loop225: do { if (((_tokenSet_42.member(LA(1))) && (_tokenSet_11.member(LA(2))))&&(!support.hasHiddenBefore(LT(1)))) { filename_part(); @@ -18332,7 +18315,7 @@ public final void filename() throws RecognitionException, TokenStreamException { } } else { - break _loop227; + break _loop225; } } while (true); @@ -18889,8 +18872,8 @@ public final void attr_colon() throws RecognitionException, TokenStreamException JPNode attr_colon_AST = null; { - int _cnt175=0; - _loop175: + int _cnt173=0; + _loop173: do { if ((LA(1)==OBJCOLON||LA(1)==DOUBLECOLON) && ((LA(2) >= LEXDATE && LA(2) <= Last_Token_Number))) { { @@ -18947,10 +18930,10 @@ else if ((_tokenSet_11.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } else { - if ( _cnt175>=1 ) { break _loop175; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt173>=1 ) { break _loop173; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt175++; + _cnt173++; } while (true); } { @@ -19230,10 +19213,10 @@ public final void exprt2() throws RecognitionException, TokenStreamException { exprt2_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched151 = false; + boolean synPredMatched149 = false; if (((_tokenSet_13.member(LA(1))) && (LA(2)==LEFTPAREN||LA(2)==ABSTRACT))) { - int _m151 = mark(); - synPredMatched151 = true; + int _m149 = mark(); + synPredMatched149 = true; inputState.guessing++; try { { @@ -19244,12 +19227,12 @@ public final void exprt2() throws RecognitionException, TokenStreamException { } } catch (RecognitionException pe) { - synPredMatched151 = false; + synPredMatched149 = false; } - rewind(_m151); + rewind(_m149); inputState.guessing--; } - if ( synPredMatched151 ) { + if ( synPredMatched149 ) { identifier(); fname_AST = (JPNode)returnAST; if ( inputState.guessing==0 ) { @@ -19262,10 +19245,10 @@ public final void exprt2() throws RecognitionException, TokenStreamException { exprt2_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched153 = false; + boolean synPredMatched151 = false; if (((LA(1)==NEW) && (_tokenSet_44.member(LA(2))))) { - int _m153 = mark(); - synPredMatched153 = true; + int _m151 = mark(); + synPredMatched151 = true; inputState.guessing++; try { { @@ -19275,12 +19258,12 @@ public final void exprt2() throws RecognitionException, TokenStreamException { } } catch (RecognitionException pe) { - synPredMatched153 = false; + synPredMatched151 = false; } - rewind(_m153); + rewind(_m151); inputState.guessing--; } - if ( synPredMatched153 ) { + if ( synPredMatched151 ) { JPNode tmp960_AST = null; tmp960_AST = (JPNode)astFactory.create(LT(1)); astFactory.makeASTRoot(currentAST, tmp960_AST); @@ -19292,10 +19275,10 @@ public final void exprt2() throws RecognitionException, TokenStreamException { exprt2_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched155 = false; + boolean synPredMatched153 = false; if (((_tokenSet_135.member(LA(1))) && (_tokenSet_8.member(LA(2))))) { - int _m155 = mark(); - synPredMatched155 = true; + int _m153 = mark(); + synPredMatched153 = true; inputState.guessing++; try { { @@ -19303,21 +19286,21 @@ public final void exprt2() throws RecognitionException, TokenStreamException { } } catch (RecognitionException pe) { - synPredMatched155 = false; + synPredMatched153 = false; } - rewind(_m155); + rewind(_m153); inputState.guessing--; } - if ( synPredMatched155 ) { + if ( synPredMatched153 ) { builtinfunc(); astFactory.addASTChild(currentAST, returnAST); exprt2_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched157 = false; + boolean synPredMatched155 = false; if (((_tokenSet_13.member(LA(1))) && (LA(2)==LEFTPAREN||LA(2)==ABSTRACT))) { - int _m157 = mark(); - synPredMatched157 = true; + int _m155 = mark(); + synPredMatched155 = true; inputState.guessing++; try { { @@ -19328,12 +19311,12 @@ public final void exprt2() throws RecognitionException, TokenStreamException { } } catch (RecognitionException pe) { - synPredMatched157 = false; + synPredMatched155 = false; } - rewind(_m157); + rewind(_m155); inputState.guessing--; } - if ( synPredMatched157 ) { + if ( synPredMatched155 ) { identifier(); methodname_AST = (JPNode)returnAST; if ( inputState.guessing==0 ) { @@ -19364,10 +19347,10 @@ else if ((_tokenSet_6.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { field(); astFactory.addASTChild(currentAST, returnAST); { - boolean synPredMatched161 = false; + boolean synPredMatched159 = false; if (((LA(1)==ENTERED||LA(1)==NOT) && (_tokenSet_11.member(LA(2))))) { - int _m161 = mark(); - synPredMatched161 = true; + int _m159 = mark(); + synPredMatched159 = true; inputState.guessing++; try { { @@ -19392,12 +19375,12 @@ else if ((_tokenSet_6.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched161 = false; + synPredMatched159 = false; } - rewind(_m161); + rewind(_m159); inputState.guessing--; } - if ( synPredMatched161 ) { + if ( synPredMatched159 ) { { switch ( LA(1)) { case NOT: @@ -19814,7 +19797,7 @@ else if ((LA(1)==COMMA||LA(1)==RIGHTPAREN)) { } { - _loop201: + _loop199: do { if ((LA(1)==COMMA)) { JPNode tmp997_AST = null; @@ -19835,7 +19818,7 @@ else if ((LA(1)==COMMA||LA(1)==RIGHTPAREN)) { } } else { - break _loop201; + break _loop199; } } while (true); @@ -19862,10 +19845,10 @@ public final void inuic() throws RecognitionException, TokenStreamException { ASTPair currentAST = new ASTPair(); JPNode inuic_AST = null; - boolean synPredMatched205 = false; + boolean synPredMatched203 = false; if (((LA(1)==IN_KW) && (_tokenSet_138.member(LA(2))))) { - int _m205 = mark(); - synPredMatched205 = true; + int _m203 = mark(); + synPredMatched203 = true; inputState.guessing++; try { { @@ -19907,12 +19890,12 @@ public final void inuic() throws RecognitionException, TokenStreamException { } } catch (RecognitionException pe) { - synPredMatched205 = false; + synPredMatched203 = false; } - rewind(_m205); + rewind(_m203); inputState.guessing--; } - if ( synPredMatched205 ) { + if ( synPredMatched203 ) { JPNode tmp999_AST = null; tmp999_AST = (JPNode)astFactory.create(LT(1)); astFactory.makeASTRoot(currentAST, tmp999_AST); @@ -20020,7 +20003,7 @@ public final void widgetlist() throws RecognitionException, TokenStreamException gwidget(); astFactory.addASTChild(currentAST, returnAST); { - _loop182: + _loop180: do { if ((LA(1)==COMMA)) { JPNode tmp1005_AST = null; @@ -20031,7 +20014,7 @@ public final void widgetlist() throws RecognitionException, TokenStreamException astFactory.addASTChild(currentAST, returnAST); } else { - break _loop182; + break _loop180; } } while (true); @@ -20181,10 +20164,10 @@ public final void var_rec_field() throws RecognitionException, TokenStreamExcept ASTPair currentAST = new ASTPair(); JPNode var_rec_field_AST = null; - boolean synPredMatched209 = false; + boolean synPredMatched207 = false; if ((((_tokenSet_6.member(LA(1))) && (_tokenSet_139.member(LA(2))))&&(LA(2)!=NAMEDOT && support.isVar(LT(1).getText())))) { - int _m209 = mark(); - synPredMatched209 = true; + int _m207 = mark(); + synPredMatched207 = true; inputState.guessing++; try { { @@ -20192,21 +20175,21 @@ public final void var_rec_field() throws RecognitionException, TokenStreamExcept } } catch (RecognitionException pe) { - synPredMatched209 = false; + synPredMatched207 = false; } - rewind(_m209); + rewind(_m207); inputState.guessing--; } - if ( synPredMatched209 ) { + if ( synPredMatched207 ) { field(); astFactory.addASTChild(currentAST, returnAST); var_rec_field_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched211 = false; + boolean synPredMatched209 = false; if (((_tokenSet_6.member(LA(1))) && (_tokenSet_139.member(LA(2))))) { - int _m211 = mark(); - synPredMatched211 = true; + int _m209 = mark(); + synPredMatched209 = true; inputState.guessing++; try { { @@ -20215,21 +20198,21 @@ public final void var_rec_field() throws RecognitionException, TokenStreamExcept } } catch (RecognitionException pe) { - synPredMatched211 = false; + synPredMatched209 = false; } - rewind(_m211); + rewind(_m209); inputState.guessing--; } - if ( synPredMatched211 ) { + if ( synPredMatched209 ) { field(); astFactory.addASTChild(currentAST, returnAST); var_rec_field_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched213 = false; + boolean synPredMatched211 = false; if (((_tokenSet_13.member(LA(1))) && (_tokenSet_140.member(LA(2))))) { - int _m213 = mark(); - synPredMatched213 = true; + int _m211 = mark(); + synPredMatched211 = true; inputState.guessing++; try { { @@ -20237,12 +20220,12 @@ public final void var_rec_field() throws RecognitionException, TokenStreamExcept } } catch (RecognitionException pe) { - synPredMatched213 = false; + synPredMatched211 = false; } - rewind(_m213); + rewind(_m211); inputState.guessing--; } - if ( synPredMatched213 ) { + if ( synPredMatched211 ) { record(); astFactory.addASTChild(currentAST, returnAST); var_rec_field_AST = (JPNode)currentAST.root; @@ -26370,7 +26353,7 @@ public final void type_name2() throws RecognitionException, TokenStreamException theText += p1_AST.getText(); } { - _loop233: + _loop231: do { if (((_tokenSet_44.member(LA(1))) && (_tokenSet_11.member(LA(2))))&&(!support.hasHiddenBefore(LT(1)))) { type_name_part(); @@ -26380,7 +26363,7 @@ public final void type_name2() throws RecognitionException, TokenStreamException } } else { - break _loop233; + break _loop231; } } while (true); @@ -27001,14 +26984,14 @@ public final void io_phrase_state_end() throws RecognitionException, TokenStream io_osdir(); astFactory.addASTChild(currentAST, returnAST); { - _loop1184: + _loop1182: do { if ((_tokenSet_142.member(LA(1)))) { io_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1184; + break _loop1182; } } while (true); @@ -27021,14 +27004,14 @@ else if ((LA(1)==PRINTER) && (_tokenSet_11.member(LA(2)))) { io_printer(); astFactory.addASTChild(currentAST, returnAST); { - _loop1186: + _loop1184: do { if ((_tokenSet_142.member(LA(1)))) { io_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1186; + break _loop1184; } } while (true); @@ -27043,14 +27026,14 @@ else if ((LA(1)==TERMINAL) && (_tokenSet_143.member(LA(2)))) { astFactory.addASTChild(currentAST, tmp1721_AST); match(TERMINAL); { - _loop1188: + _loop1186: do { if ((_tokenSet_142.member(LA(1)))) { io_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1188; + break _loop1186; } } while (true); @@ -27096,12 +27079,12 @@ public final void display_item() throws RecognitionException, TokenStreamExcepti expression(); astFactory.addASTChild(currentAST, returnAST); { - _loop896: + _loop894: do { - boolean synPredMatched895 = false; + boolean synPredMatched893 = false; if (((LA(1)==LEFTPAREN) && (_tokenSet_144.member(LA(2))))) { - int _m895 = mark(); - synPredMatched895 = true; + int _m893 = mark(); + synPredMatched893 = true; inputState.guessing++; try { { @@ -27109,12 +27092,12 @@ public final void display_item() throws RecognitionException, TokenStreamExcepti } } catch (RecognitionException pe) { - synPredMatched895 = false; + synPredMatched893 = false; } - rewind(_m895); + rewind(_m893); inputState.guessing--; } - if ( synPredMatched895 ) { + if ( synPredMatched893 ) { aggregatephrase(); astFactory.addASTChild(currentAST, returnAST); } @@ -27123,7 +27106,7 @@ else if ((_tokenSet_145.member(LA(1))) && (_tokenSet_146.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop896; + break _loop894; } } while (true); @@ -27157,29 +27140,29 @@ public final void aggregatephrase() throws RecognitionException, TokenStreamExce astFactory.addASTChild(currentAST, tmp1722_AST); match(LEFTPAREN); { - int _cnt268=0; - _loop268: + int _cnt266=0; + _loop266: do { if ((_tokenSet_144.member(LA(1)))) { aggregate_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt268>=1 ) { break _loop268; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt266>=1 ) { break _loop266; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt268++; + _cnt266++; } while (true); } { - _loop270: + _loop268: do { if ((LA(1)==BY)) { by_expr(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop270; + break _loop268; } } while (true); @@ -27279,7 +27262,7 @@ public final void label_constant() throws RecognitionException, TokenStreamExcep constant(); astFactory.addASTChild(currentAST, returnAST); { - _loop1209: + _loop1207: do { if ((LA(1)==COMMA) && (_tokenSet_25.member(LA(2)))) { JPNode tmp1726_AST = null; @@ -27290,7 +27273,7 @@ public final void label_constant() throws RecognitionException, TokenStreamExcep astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1209; + break _loop1207; } } while (true); @@ -27347,14 +27330,14 @@ public final void except_fields() throws RecognitionException, TokenStreamExcept astFactory.makeASTRoot(currentAST, tmp1728_AST); match(EXCEPT); { - _loop935: + _loop933: do { if ((_tokenSet_6.member(LA(1))) && (_tokenSet_147.member(LA(2)))) { field(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop935; + break _loop933; } } while (true); @@ -27406,18 +27389,18 @@ public final void assign_opt() throws RecognitionException, TokenStreamException astFactory.makeASTRoot(currentAST, tmp1731_AST); match(ASSIGN); { - int _cnt288=0; - _loop288: + int _cnt286=0; + _loop286: do { if (((LA(1) >= LEXDATE && LA(1) <= Last_Token_Number)) && (LA(2)==EQUAL)) { assign_opt2(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt288>=1 ) { break _loop288; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt286>=1 ) { break _loop286; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt288++; + _cnt286++; } while (true); } assign_opt_AST = (JPNode)currentAST.root; @@ -27454,10 +27437,10 @@ public final void assignment_list() throws RecognitionException, TokenStreamExce ASTPair currentAST = new ASTPair(); JPNode assignment_list_AST = null; - boolean synPredMatched294 = false; + boolean synPredMatched292 = false; if (((_tokenSet_13.member(LA(1))) && (LA(2)==NAMEDOT||LA(2)==EXCEPT||LA(2)==ABSTRACT))) { - int _m294 = mark(); - synPredMatched294 = true; + int _m292 = mark(); + synPredMatched292 = true; inputState.guessing++; try { { @@ -27466,12 +27449,12 @@ public final void assignment_list() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched294 = false; + synPredMatched292 = false; } - rewind(_m294); + rewind(_m292); inputState.guessing--; } - if ( synPredMatched294 ) { + if ( synPredMatched292 ) { record(); astFactory.addASTChild(currentAST, returnAST); except_fields(); @@ -27479,10 +27462,10 @@ public final void assignment_list() throws RecognitionException, TokenStreamExce assignment_list_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched297 = false; + boolean synPredMatched295 = false; if ((((_tokenSet_13.member(LA(1))) && (_tokenSet_148.member(LA(2))))&&(LA(2)==NAMEDOT || (!(support.isVar(LT(1).getText())))))) { - int _m297 = mark(); - synPredMatched297 = true; + int _m295 = mark(); + synPredMatched295 = true; inputState.guessing++; try { { @@ -27513,24 +27496,24 @@ public final void assignment_list() throws RecognitionException, TokenStreamExce } } catch (RecognitionException pe) { - synPredMatched297 = false; + synPredMatched295 = false; } - rewind(_m297); + rewind(_m295); inputState.guessing--; } - if ( synPredMatched297 ) { + if ( synPredMatched295 ) { record(); astFactory.addASTChild(currentAST, returnAST); assignment_list_AST = (JPNode)currentAST.root; } else if ((_tokenSet_149.member(LA(1))) && (_tokenSet_150.member(LA(2)))) { { - _loop303: + _loop301: do { - boolean synPredMatched300 = false; + boolean synPredMatched298 = false; if (((_tokenSet_151.member(LA(1))) && (_tokenSet_3.member(LA(2))))) { - int _m300 = mark(); - synPredMatched300 = true; + int _m298 = mark(); + synPredMatched298 = true; inputState.guessing++; try { { @@ -27538,12 +27521,12 @@ else if ((_tokenSet_149.member(LA(1))) && (_tokenSet_150.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched300 = false; + synPredMatched298 = false; } - rewind(_m300); + rewind(_m298); inputState.guessing--; } - if ( synPredMatched300 ) { + if ( synPredMatched298 ) { assign_equal(); astFactory.addASTChild(currentAST, returnAST); { @@ -27576,7 +27559,7 @@ else if ((_tokenSet_149.member(LA(1)))) { } } else { - break _loop303; + break _loop301; } } while (true); @@ -27602,10 +27585,10 @@ public final void assign_equal() throws RecognitionException, TokenStreamExcepti Token e2 = null; JPNode e2_AST = null; - boolean synPredMatched312 = false; + boolean synPredMatched310 = false; if (((_tokenSet_4.member(LA(1))) && (LA(2)==EQUAL||LA(2)==LEFTPAREN))) { - int _m312 = mark(); - synPredMatched312 = true; + int _m310 = mark(); + synPredMatched310 = true; inputState.guessing++; try { { @@ -27613,12 +27596,12 @@ public final void assign_equal() throws RecognitionException, TokenStreamExcepti } } catch (RecognitionException pe) { - synPredMatched312 = false; + synPredMatched310 = false; } - rewind(_m312); + rewind(_m310); inputState.guessing--; } - if ( synPredMatched312 ) { + if ( synPredMatched310 ) { pseudfn(); astFactory.addASTChild(currentAST, returnAST); e1 = LT(1); @@ -27633,10 +27616,10 @@ public final void assign_equal() throws RecognitionException, TokenStreamExcepti assign_equal_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched314 = false; + boolean synPredMatched312 = false; if (((_tokenSet_2.member(LA(1))) && (_tokenSet_5.member(LA(2))))) { - int _m314 = mark(); - synPredMatched314 = true; + int _m312 = mark(); + synPredMatched312 = true; inputState.guessing++; try { { @@ -27644,12 +27627,12 @@ public final void assign_equal() throws RecognitionException, TokenStreamExcepti } } catch (RecognitionException pe) { - synPredMatched314 = false; + synPredMatched312 = false; } - rewind(_m314); + rewind(_m312); inputState.guessing--; } - if ( synPredMatched314 ) { + if ( synPredMatched312 ) { widattr(); astFactory.addASTChild(currentAST, returnAST); e3 = LT(1); @@ -27747,10 +27730,10 @@ public final void atphrase() throws RecognitionException, TokenStreamException { astFactory.makeASTRoot(currentAST, tmp1736_AST); match(AT); { - boolean synPredMatched320 = false; + boolean synPredMatched318 = false; if (((_tokenSet_153.member(LA(1))) && (_tokenSet_8.member(LA(2))))) { - int _m320 = mark(); - synPredMatched320 = true; + int _m318 = mark(); + synPredMatched318 = true; inputState.guessing++; try { { @@ -27758,12 +27741,12 @@ public final void atphrase() throws RecognitionException, TokenStreamException { } } catch (RecognitionException pe) { - synPredMatched320 = false; + synPredMatched318 = false; } - rewind(_m320); + rewind(_m318); inputState.guessing--; } - if ( synPredMatched320 ) { + if ( synPredMatched318 ) { atphraseab(); astFactory.addASTChild(currentAST, returnAST); atphraseab(); @@ -28042,14 +28025,14 @@ public final void except_using_fields() throws RecognitionException, TokenStream } } { - _loop939: + _loop937: do { if ((_tokenSet_6.member(LA(1)))) { field(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop939; + break _loop937; } } while (true); @@ -28093,14 +28076,14 @@ public final void buffercompares_block() throws RecognitionException, TokenStrea JPNode buffercompares_block_AST = null; { - _loop344: + _loop342: do { if ((LA(1)==WHEN)) { buffercompare_when(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop344; + break _loop342; } } while (true); @@ -28291,14 +28274,14 @@ public final void case_block() throws RecognitionException, TokenStreamException JPNode case_block_AST = null; { - _loop366: + _loop364: do { if ((LA(1)==WHEN)) { case_when(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop366; + break _loop364; } } while (true); @@ -28399,7 +28382,7 @@ public final void case_expression() throws RecognitionException, TokenStreamExce astFactory.addASTChild(currentAST, returnAST); } { - _loop371: + _loop369: do { if ((LA(1)==OR)) { JPNode tmp1769_AST = null; @@ -28414,7 +28397,7 @@ public final void case_expression() throws RecognitionException, TokenStreamExce } } else { - break _loop371; + break _loop369; } } while (true); @@ -28657,7 +28640,7 @@ public final void goonphrase() throws RecognitionException, TokenStreamException goon_elem(); astFactory.addASTChild(currentAST, returnAST); { - _loop1092: + _loop1090: do { if ((_tokenSet_157.member(LA(1)))) { { @@ -28678,7 +28661,7 @@ else if ((_tokenSet_157.member(LA(1))) && ((LA(2) >= LEXDATE && LA(2) <= Last_To astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1092; + break _loop1090; } } while (true); @@ -28736,7 +28719,7 @@ public final void class_implements() throws RecognitionException, TokenStreamExc type_name(); astFactory.addASTChild(currentAST, returnAST); { - _loop398: + _loop396: do { if ((LA(1)==COMMA)) { JPNode tmp1786_AST = null; @@ -28747,7 +28730,7 @@ public final void class_implements() throws RecognitionException, TokenStreamExc astFactory.addASTChild(currentAST, returnAST); } else { - break _loop398; + break _loop396; } } while (true); @@ -29050,18 +29033,18 @@ public final void colorspecification() throws RecognitionException, TokenStreamE case PFCOLOR: { { - int _cnt420=0; - _loop420: + int _cnt418=0; + _loop418: do { if ((_tokenSet_158.member(LA(1))) && (_tokenSet_8.member(LA(2)))) { color_expr(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt420>=1 ) { break _loop420; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt418>=1 ) { break _loop418; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt420++; + _cnt418++; } while (true); } colorspecification_AST = (JPNode)currentAST.root; @@ -29249,18 +29232,18 @@ public final void columnformat() throws RecognitionException, TokenStreamExcepti JPNode columnformat_AST = null; { - int _cnt437=0; - _loop437: + int _cnt435=0; + _loop435: do { if ((_tokenSet_159.member(LA(1))) && (_tokenSet_160.member(LA(2)))) { columnformat_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt437>=1 ) { break _loop437; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt435>=1 ) { break _loop435; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt437++; + _cnt435++; } while (true); } if ( inputState.guessing==0 ) { @@ -29506,14 +29489,14 @@ public final void comboboxphrase() throws RecognitionException, TokenStreamExcep astFactory.makeASTRoot(currentAST, tmp1825_AST); match(COMBOBOX); { - _loop443: + _loop441: do { if ((_tokenSet_161.member(LA(1))) && (_tokenSet_162.member(LA(2)))) { combobox_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop443; + break _loop441; } } while (true); @@ -29538,7 +29521,7 @@ public final void combobox_opt() throws RecognitionException, TokenStreamExcepti constant(); astFactory.addASTChild(currentAST, returnAST); { - _loop446: + _loop444: do { if ((LA(1)==COMMA) && (_tokenSet_25.member(LA(2)))) { JPNode tmp1827_AST = null; @@ -29549,7 +29532,7 @@ public final void combobox_opt() throws RecognitionException, TokenStreamExcepti astFactory.addASTChild(currentAST, returnAST); } else { - break _loop446; + break _loop444; } } while (true); @@ -29566,7 +29549,7 @@ public final void combobox_opt() throws RecognitionException, TokenStreamExcepti constant(); astFactory.addASTChild(currentAST, returnAST); { - _loop448: + _loop446: do { if ((LA(1)==COMMA) && (_tokenSet_25.member(LA(2)))) { JPNode tmp1829_AST = null; @@ -29577,7 +29560,7 @@ public final void combobox_opt() throws RecognitionException, TokenStreamExcepti astFactory.addASTChild(currentAST, returnAST); } else { - break _loop448; + break _loop446; } } while (true); @@ -29978,7 +29961,7 @@ public final void compile_opt() throws RecognitionException, TokenStreamExceptio filenameorvalue(); astFactory.addASTChild(currentAST, returnAST); { - _loop458: + _loop456: do { switch ( LA(1)) { case APPEND: @@ -29996,7 +29979,7 @@ public final void compile_opt() throws RecognitionException, TokenStreamExceptio } default: { - break _loop458; + break _loop456; } } } while (true); @@ -30237,7 +30220,7 @@ public final void compile_opt() throws RecognitionException, TokenStreamExceptio compile_lang(); astFactory.addASTChild(currentAST, returnAST); { - _loop465: + _loop463: do { if ((LA(1)==COMMA)) { JPNode tmp1856_AST = null; @@ -30248,7 +30231,7 @@ public final void compile_opt() throws RecognitionException, TokenStreamExceptio astFactory.addASTChild(currentAST, returnAST); } else { - break _loop465; + break _loop463; } } while (true); @@ -30699,7 +30682,7 @@ else if ((_tokenSet_13.member(LA(1)))) { compile_lang2(); astFactory.addASTChild(currentAST, returnAST); { - _loop473: + _loop471: do { if ((LA(1)==OBJCOLON)) { c = LT(1); @@ -30713,7 +30696,7 @@ else if ((_tokenSet_13.member(LA(1)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop473; + break _loop471; } } while (true); @@ -30786,7 +30769,7 @@ else if ((LA(1)==COMMA||LA(1)==RIGHTPAREN)) { } { - _loop1058: + _loop1056: do { if ((LA(1)==COMMA)) { JPNode tmp1873_AST = null; @@ -30797,7 +30780,7 @@ else if ((LA(1)==COMMA||LA(1)==RIGHTPAREN)) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1058; + break _loop1056; } } while (true); @@ -32044,7 +32027,7 @@ else if ((LA(1)==UNIQUE)) { } { - _loop1743: + _loop1741: do { if ((LA(1)==COMMA)) { JPNode tmp1945_AST = null; @@ -32067,7 +32050,7 @@ else if ((LA(1)==UNIQUE)) { } } else { - break _loop1743; + break _loop1741; } } while (true); @@ -33083,7 +33066,7 @@ public final void definebrowsestate() throws RecognitionException, TokenStreamEx } } { - _loop619: + _loop617: do { switch ( LA(1)) { case EXCLUSIVELOCK: @@ -33104,7 +33087,7 @@ public final void definebrowsestate() throws RecognitionException, TokenStreamEx } default: { - break _loop619; + break _loop617; } } } while (true); @@ -33154,14 +33137,14 @@ public final void definebrowsestate() throws RecognitionException, TokenStreamEx } } { - _loop623: + _loop621: do { if ((LA(1)==WITH)) { display_with(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop623; + break _loop621; } } while (true); @@ -33447,14 +33430,14 @@ public final void definebuttonstate() throws RecognitionException, TokenStreamEx n_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop657: + _loop655: do { if ((_tokenSet_172.member(LA(1)))) { button_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop657; + break _loop655; } } while (true); @@ -33608,7 +33591,7 @@ public final void definedatasetstate() throws RecognitionException, TokenStreamE record(); astFactory.addASTChild(currentAST, returnAST); { - _loop677: + _loop675: do { if ((LA(1)==COMMA)) { JPNode tmp2012_AST = null; @@ -33619,7 +33602,7 @@ public final void definedatasetstate() throws RecognitionException, TokenStreamE astFactory.addASTChild(currentAST, returnAST); } else { - break _loop677; + break _loop675; } } while (true); @@ -33631,7 +33614,7 @@ public final void definedatasetstate() throws RecognitionException, TokenStreamE data_relation(); astFactory.addASTChild(currentAST, returnAST); { - _loop681: + _loop679: do { if ((LA(1)==COMMA||LA(1)==DATARELATION)) { { @@ -33658,7 +33641,7 @@ public final void definedatasetstate() throws RecognitionException, TokenStreamE astFactory.addASTChild(currentAST, returnAST); } else { - break _loop681; + break _loop679; } } while (true); @@ -33725,7 +33708,7 @@ else if ((LA(1)==EOF||LA(1)==PERIOD||LA(1)==COMMA)) { } { - _loop695: + _loop693: do { if ((LA(1)==COMMA)) { JPNode tmp2016_AST = null; @@ -33736,7 +33719,7 @@ else if ((LA(1)==EOF||LA(1)==PERIOD||LA(1)==COMMA)) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop695; + break _loop693; } } while (true); @@ -33765,10 +33748,10 @@ public final void defineeventstate() throws RecognitionException, TokenStreamExc n_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - boolean synPredMatched704 = false; + boolean synPredMatched702 = false; if (((LA(1)==VOID||LA(1)==SIGNATURE) && (LA(2)==LEFTPAREN||LA(2)==VOID))) { - int _m704 = mark(); - synPredMatched704 = true; + int _m702 = mark(); + synPredMatched702 = true; inputState.guessing++; try { { @@ -33791,12 +33774,12 @@ public final void defineeventstate() throws RecognitionException, TokenStreamExc } } catch (RecognitionException pe) { - synPredMatched704 = false; + synPredMatched702 = false; } - rewind(_m704); + rewind(_m702); inputState.guessing--; } - if ( synPredMatched704 ) { + if ( synPredMatched702 ) { event_signature(); astFactory.addASTChild(currentAST, returnAST); } @@ -33919,14 +33902,14 @@ public final void defineimagestate() throws RecognitionException, TokenStreamExc n_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop715: + _loop713: do { if ((_tokenSet_174.member(LA(1)))) { defineimage_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop715; + break _loop713; } } while (true); @@ -33974,20 +33957,20 @@ public final void definemenustate() throws RecognitionException, TokenStreamExce n_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop721: + _loop719: do { if ((_tokenSet_175.member(LA(1)))) { menu_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop721; + break _loop719; } } while (true); } { - _loop724: + _loop722: do { if ((_tokenSet_176.member(LA(1)))) { menu_list_item(); @@ -34008,7 +33991,7 @@ else if ((_tokenSet_177.member(LA(1))) && (_tokenSet_178.member(LA(2)))) { } } else { - break _loop724; + break _loop722; } } while (true); @@ -34207,7 +34190,7 @@ else if ((_tokenSet_13.member(LA(1))) && (_tokenSet_179.member(LA(2)))) { record(); astFactory.addASTChild(currentAST, returnAST); { - _loop743: + _loop741: do { switch ( LA(1)) { case APPEND: @@ -34236,7 +34219,7 @@ else if ((_tokenSet_13.member(LA(1))) && (_tokenSet_179.member(LA(2)))) { } default: { - break _loop743; + break _loop741; } } } while (true); @@ -34267,7 +34250,7 @@ else if ((_tokenSet_13.member(LA(1)))) { pn2_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop746: + _loop744: do { switch ( LA(1)) { case APPEND: @@ -34296,7 +34279,7 @@ else if ((_tokenSet_13.member(LA(1)))) { } default: { - break _loop746; + break _loop744; } } } while (true); @@ -34319,7 +34302,7 @@ else if ((_tokenSet_13.member(LA(1)))) { identifier(); astFactory.addASTChild(currentAST, returnAST); { - _loop748: + _loop746: do { switch ( LA(1)) { case APPEND: @@ -34348,7 +34331,7 @@ else if ((_tokenSet_13.member(LA(1)))) { } default: { - break _loop748; + break _loop746; } } } while (true); @@ -34365,7 +34348,7 @@ else if ((_tokenSet_13.member(LA(1)))) { dsh_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop750: + _loop748: do { switch ( LA(1)) { case APPEND: @@ -34394,7 +34377,7 @@ else if ((_tokenSet_13.member(LA(1)))) { } default: { - break _loop750; + break _loop748; } } } while (true); @@ -34473,7 +34456,7 @@ public final void definepropertystate() throws RecognitionException, TokenStream datatype(); astFactory.addASTChild(currentAST, returnAST); { - _loop761: + _loop759: do { switch ( LA(1)) { case EXTENT: @@ -34498,7 +34481,7 @@ public final void definepropertystate() throws RecognitionException, TokenStream } default: { - break _loop761; + break _loop759; } } } while (true); @@ -34570,7 +34553,7 @@ public final void definequerystate() throws RecognitionException, TokenStreamExc } } { - _loop775: + _loop773: do { if ((LA(1)==COMMA)) { JPNode tmp2056_AST = null; @@ -34606,13 +34589,13 @@ public final void definequerystate() throws RecognitionException, TokenStreamExc } } else { - break _loop775; + break _loop773; } } while (true); } { - _loop777: + _loop775: do { switch ( LA(1)) { case CACHE: @@ -34639,7 +34622,7 @@ public final void definequerystate() throws RecognitionException, TokenStreamExc } default: { - break _loop777; + break _loop775; } } } while (true); @@ -34668,14 +34651,14 @@ public final void definerectanglestate() throws RecognitionException, TokenStrea n_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop780: + _loop778: do { if ((_tokenSet_182.member(LA(1)))) { rectangle_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop780; + break _loop778; } } while (true); @@ -34746,20 +34729,20 @@ public final void definesubmenustate() throws RecognitionException, TokenStreamE n_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop786: + _loop784: do { if ((_tokenSet_175.member(LA(1)))) { menu_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop786; + break _loop784; } } while (true); } { - _loop789: + _loop787: do { if ((_tokenSet_176.member(LA(1)))) { menu_list_item(); @@ -34780,7 +34763,7 @@ else if ((_tokenSet_177.member(LA(1))) && (_tokenSet_178.member(LA(2)))) { } } else { - break _loop789; + break _loop787; } } while (true); @@ -35111,27 +35094,27 @@ public final void definetemptablestate() throws RecognitionException, TokenStrea } } { - _loop802: + _loop800: do { if ((LA(1)==FIELD||LA(1)==FIELDS)) { def_table_field(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop802; + break _loop800; } } while (true); } { - _loop804: + _loop802: do { if ((LA(1)==INDEX)) { def_table_index(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop804; + break _loop802; } } while (true); @@ -35237,14 +35220,14 @@ public final void defineworktablestate() throws RecognitionException, TokenStrea } } { - _loop832: + _loop830: do { if ((LA(1)==FIELD||LA(1)==FIELDS)) { def_table_field(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop832; + break _loop830; } } while (true); @@ -35270,14 +35253,14 @@ public final void definevariablestate() throws RecognitionException, TokenStream n_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop835: + _loop833: do { if ((_tokenSet_183.member(LA(1)))) { fieldoption(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop835; + break _loop833; } } while (true); @@ -35382,14 +35365,14 @@ public final void def_browse_enable() throws RecognitionException, TokenStreamEx } else if ((_tokenSet_39.member(LA(1)))) { { - _loop642: + _loop640: do { if ((_tokenSet_6.member(LA(1))) && (_tokenSet_184.member(LA(2)))) { def_browse_enable_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop642; + break _loop640; } } while (true); @@ -35441,10 +35424,10 @@ public final void def_browse_display_items_or_record() throws RecognitionExcepti ASTPair currentAST = new ASTPair(); JPNode def_browse_display_items_or_record_AST = null; - boolean synPredMatched630 = false; + boolean synPredMatched628 = false; if (((_tokenSet_185.member(LA(1))) && (_tokenSet_11.member(LA(2))))) { - int _m630 = mark(); - synPredMatched630 = true; + int _m628 = mark(); + synPredMatched628 = true; inputState.guessing++; try { { @@ -35453,21 +35436,21 @@ public final void def_browse_display_items_or_record() throws RecognitionExcepti } } catch (RecognitionException pe) { - synPredMatched630 = false; + synPredMatched628 = false; } - rewind(_m630); + rewind(_m628); inputState.guessing--; } - if ( synPredMatched630 ) { + if ( synPredMatched628 ) { { - _loop632: + _loop630: do { if ((_tokenSet_186.member(LA(1))) && (_tokenSet_55.member(LA(2)))) { def_browse_display_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop632; + break _loop630; } } while (true); @@ -35481,14 +35464,14 @@ else if (((_tokenSet_13.member(LA(1))) && (_tokenSet_187.member(LA(2))))&&(isTab } else if ((_tokenSet_185.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { { - _loop634: + _loop632: do { if ((_tokenSet_186.member(LA(1))) && (_tokenSet_55.member(LA(2)))) { def_browse_display_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop634; + break _loop632; } } while (true); @@ -35663,7 +35646,7 @@ public final void def_browse_enable_item() throws RecognitionException, TokenStr field(); astFactory.addASTChild(currentAST, returnAST); { - _loop645: + _loop643: do { switch ( LA(1)) { case HELP: @@ -35694,7 +35677,7 @@ public final void def_browse_enable_item() throws RecognitionException, TokenStr astFactory.addASTChild(currentAST, returnAST); } else { - break _loop645; + break _loop643; } } } while (true); @@ -35811,14 +35794,14 @@ public final void fields_fields() throws RecognitionException, TokenStreamExcept } } { - _loop955: + _loop953: do { if ((_tokenSet_6.member(LA(1)))) { field(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop955; + break _loop953; } } while (true); @@ -35901,18 +35884,18 @@ public final void button_opt() throws RecognitionException, TokenStreamException astFactory.makeASTRoot(currentAST, tmp2089_AST); match(IMAGEDOWN); { - int _cnt661=0; - _loop661: + int _cnt659=0; + _loop659: do { if ((_tokenSet_190.member(LA(1)))) { imagephrase_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt661>=1 ) { break _loop661; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt659>=1 ) { break _loop659; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt661++; + _cnt659++; } while (true); } button_opt_AST = (JPNode)currentAST.root; @@ -35925,18 +35908,18 @@ public final void button_opt() throws RecognitionException, TokenStreamException astFactory.makeASTRoot(currentAST, tmp2090_AST); match(IMAGE); { - int _cnt663=0; - _loop663: + int _cnt661=0; + _loop661: do { if ((_tokenSet_190.member(LA(1)))) { imagephrase_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt663>=1 ) { break _loop663; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt661>=1 ) { break _loop661; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt663++; + _cnt661++; } while (true); } button_opt_AST = (JPNode)currentAST.root; @@ -35949,18 +35932,18 @@ public final void button_opt() throws RecognitionException, TokenStreamException astFactory.makeASTRoot(currentAST, tmp2091_AST); match(IMAGEUP); { - int _cnt665=0; - _loop665: + int _cnt663=0; + _loop663: do { if ((_tokenSet_190.member(LA(1)))) { imagephrase_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt665>=1 ) { break _loop665; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt663>=1 ) { break _loop663; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt665++; + _cnt663++; } while (true); } button_opt_AST = (JPNode)currentAST.root; @@ -35973,18 +35956,18 @@ public final void button_opt() throws RecognitionException, TokenStreamException astFactory.makeASTRoot(currentAST, tmp2092_AST); match(IMAGEINSENSITIVE); { - int _cnt667=0; - _loop667: + int _cnt665=0; + _loop665: do { if ((_tokenSet_190.member(LA(1)))) { imagephrase_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt667>=1 ) { break _loop667; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt665>=1 ) { break _loop665; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt667++; + _cnt665++; } while (true); } button_opt_AST = (JPNode)currentAST.root; @@ -36335,7 +36318,7 @@ else if ((LA(1)==FOR)) { record(); astFactory.addASTChild(currentAST, returnAST); { - _loop685: + _loop683: do { switch ( LA(1)) { case RELATIONFIELDS: @@ -36376,7 +36359,7 @@ else if ((LA(1)==FOR)) { } default: { - break _loop685; + break _loop683; } } } while (true); @@ -36411,7 +36394,7 @@ public final void field_mapping_phrase() throws RecognitionException, TokenStrea field(); astFactory.addASTChild(currentAST, returnAST); { - _loop688: + _loop686: do { if ((LA(1)==COMMA)) { JPNode tmp2118_AST = null; @@ -36428,7 +36411,7 @@ public final void field_mapping_phrase() throws RecognitionException, TokenStrea astFactory.addASTChild(currentAST, returnAST); } else { - break _loop688; + break _loop686; } } while (true); @@ -36515,7 +36498,7 @@ else if ((_tokenSet_6.member(LA(1))) && (_tokenSet_194.member(LA(2)))) { field(); astFactory.addASTChild(currentAST, returnAST); { - _loop700: + _loop698: do { if ((LA(1)==COMMA)) { JPNode tmp2126_AST = null; @@ -36526,7 +36509,7 @@ else if ((_tokenSet_6.member(LA(1))) && (_tokenSet_194.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop700; + break _loop698; } } while (true); @@ -36617,10 +36600,10 @@ public final void event_delegate() throws RecognitionException, TokenStreamExcep ASTPair currentAST = new ASTPair(); JPNode event_delegate_AST = null; - boolean synPredMatched708 = false; + boolean synPredMatched706 = false; if (((LA(1)==DELEGATE) && (_tokenSet_44.member(LA(2))))) { - int _m708 = mark(); - synPredMatched708 = true; + int _m706 = mark(); + synPredMatched706 = true; inputState.guessing++; try { { @@ -36628,12 +36611,12 @@ public final void event_delegate() throws RecognitionException, TokenStreamExcep } } catch (RecognitionException pe) { - synPredMatched708 = false; + synPredMatched706 = false; } - rewind(_m708); + rewind(_m706); inputState.guessing--; } - if ( synPredMatched708 ) { + if ( synPredMatched706 ) { JPNode tmp2131_AST = null; tmp2131_AST = (JPNode)astFactory.create(LT(1)); astFactory.makeASTRoot(currentAST, tmp2131_AST); @@ -36668,10 +36651,10 @@ public final void form_items_or_record() throws RecognitionException, TokenStrea ASTPair currentAST = new ASTPair(); JPNode form_items_or_record_AST = null; - boolean synPredMatched982 = false; + boolean synPredMatched980 = false; if (((_tokenSet_195.member(LA(1))) && (_tokenSet_11.member(LA(2))))) { - int _m982 = mark(); - synPredMatched982 = true; + int _m980 = mark(); + synPredMatched980 = true; inputState.guessing++; try { { @@ -36680,21 +36663,21 @@ public final void form_items_or_record() throws RecognitionException, TokenStrea } } catch (RecognitionException pe) { - synPredMatched982 = false; + synPredMatched980 = false; } - rewind(_m982); + rewind(_m980); inputState.guessing--; } - if ( synPredMatched982 ) { + if ( synPredMatched980 ) { { - _loop984: + _loop982: do { if ((_tokenSet_49.member(LA(1))) && (_tokenSet_196.member(LA(2)))) { form_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop984; + break _loop982; } } while (true); @@ -36708,14 +36691,14 @@ else if (((_tokenSet_13.member(LA(1))) && (_tokenSet_197.member(LA(2))))&&(isTab } else if ((_tokenSet_195.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { { - _loop986: + _loop984: do { if ((_tokenSet_49.member(LA(1))) && (_tokenSet_196.member(LA(2)))) { form_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop986; + break _loop984; } } while (true); @@ -36760,18 +36743,18 @@ public final void header_background() throws RecognitionException, TokenStreamEx } } { - int _cnt1099=0; - _loop1099: + int _cnt1097=0; + _loop1097: do { if ((_tokenSet_35.member(LA(1)))) { display_item(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt1099>=1 ) { break _loop1099; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt1097>=1 ) { break _loop1097; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt1099++; + _cnt1097++; } while (true); } header_background_AST = (JPNode)currentAST.root; @@ -36997,14 +36980,14 @@ public final void menu_list_item() throws RecognitionException, TokenStreamExcep n_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop728: + _loop726: do { if ((_tokenSet_198.member(LA(1)))) { menu_item_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop728; + break _loop726; } } while (true); @@ -37048,7 +37031,7 @@ public final void menu_list_item() throws RecognitionException, TokenStreamExcep s_AST = (JPNode)returnAST; astFactory.addASTChild(currentAST, returnAST); { - _loop731: + _loop729: do { switch ( LA(1)) { case DISABLED: @@ -37083,7 +37066,7 @@ public final void menu_list_item() throws RecognitionException, TokenStreamExcep } default: { - break _loop731; + break _loop729; } } } while (true); @@ -37101,7 +37084,7 @@ public final void menu_list_item() throws RecognitionException, TokenStreamExcep astFactory.makeASTRoot(currentAST, tmp2144_AST); match(RULE); { - _loop733: + _loop731: do { switch ( LA(1)) { case FONT: @@ -37121,7 +37104,7 @@ public final void menu_list_item() throws RecognitionException, TokenStreamExcep } default: { - break _loop733; + break _loop731; } } } while (true); @@ -37259,7 +37242,7 @@ else if ((_tokenSet_169.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } { - _loop755: + _loop753: do { switch ( LA(1)) { case DECIMALS: @@ -37307,7 +37290,7 @@ else if ((LA(1)==EXTENT) && (_tokenSet_169.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop755; + break _loop753; } } } while (true); @@ -37474,7 +37457,7 @@ public final void initial_constant() throws RecognitionException, TokenStreamExc } } { - _loop1137: + _loop1135: do { if ((LA(1)==COMMA)) { JPNode tmp2160_AST = null; @@ -37554,7 +37537,7 @@ public final void initial_constant() throws RecognitionException, TokenStreamExc } } else { - break _loop1137; + break _loop1135; } } while (true); @@ -37763,10 +37746,10 @@ public final void defineproperty_accessor() throws RecognitionException, TokenSt } } { - boolean synPredMatched767 = false; + boolean synPredMatched765 = false; if (((LA(1)==GET) && (LA(2)==PERIOD))) { - int _m767 = mark(); - synPredMatched767 = true; + int _m765 = mark(); + synPredMatched765 = true; inputState.guessing++; try { { @@ -37775,12 +37758,12 @@ public final void defineproperty_accessor() throws RecognitionException, TokenSt } } catch (RecognitionException pe) { - synPredMatched767 = false; + synPredMatched765 = false; } - rewind(_m767); + rewind(_m765); inputState.guessing--; } - if ( synPredMatched767 ) { + if ( synPredMatched765 ) { JPNode tmp2170_AST = null; tmp2170_AST = (JPNode)astFactory.create(LT(1)); astFactory.addASTChild(currentAST, tmp2170_AST); @@ -37988,7 +37971,7 @@ public final void record_fields() throws RecognitionException, TokenStreamExcept astFactory.addASTChild(currentAST, tmp2184_AST); match(LEFTPAREN); { - _loop1449: + _loop1447: do { if ((_tokenSet_6.member(LA(1)))) { field(); @@ -38007,7 +37990,7 @@ else if ((_tokenSet_201.member(LA(1)))) { } } else { - break _loop1449; + break _loop1447; } } while (true); @@ -38202,14 +38185,14 @@ public final void def_table_like() throws RecognitionException, TokenStreamExcep } } { - _loop810: + _loop808: do { if ((LA(1)==USEINDEX)) { def_table_useindex(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop810; + break _loop808; } } while (true); @@ -38281,14 +38264,14 @@ public final void def_table_field() throws RecognitionException, TokenStreamExce identifier(); astFactory.addASTChild(currentAST, returnAST); { - _loop817: + _loop815: do { if ((_tokenSet_183.member(LA(1)))) { fieldoption(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop817; + break _loop815; } } while (true); @@ -38312,7 +38295,7 @@ public final void def_table_index() throws RecognitionException, TokenStreamExce identifier(); astFactory.addASTChild(currentAST, returnAST); { - _loop822: + _loop820: do { if ((_tokenSet_203.member(LA(1))) && (_tokenSet_204.member(LA(2)))) { { @@ -38379,20 +38362,20 @@ public final void def_table_index() throws RecognitionException, TokenStreamExce } } else { - break _loop822; + break _loop820; } } while (true); } { - int _cnt826=0; - _loop826: + int _cnt824=0; + _loop824: do { if ((_tokenSet_13.member(LA(1)))) { identifier(); astFactory.addASTChild(currentAST, returnAST); { - _loop825: + _loop823: do { switch ( LA(1)) { case ASCENDING: @@ -38430,17 +38413,17 @@ public final void def_table_index() throws RecognitionException, TokenStreamExce } } else { - break _loop825; + break _loop823; } } } while (true); } } else { - if ( _cnt826>=1 ) { break _loop826; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt824>=1 ) { break _loop824; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt826++; + _cnt824++; } while (true); } def_table_index_AST = (JPNode)currentAST.root; @@ -39115,14 +39098,14 @@ public final void deletewidgetstate() throws RecognitionException, TokenStreamEx astFactory.addASTChild(currentAST, tmp2237_AST); match(WIDGET); { - _loop855: + _loop853: do { if ((_tokenSet_65.member(LA(1)))) { gwidget(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop855; + break _loop853; } } while (true); @@ -39231,10 +39214,10 @@ public final void form_item() throws RecognitionException, TokenStreamException break; } default: - boolean synPredMatched992 = false; + boolean synPredMatched990 = false; if (((_tokenSet_151.member(LA(1))) && (_tokenSet_3.member(LA(2))))) { - int _m992 = mark(); - synPredMatched992 = true; + int _m990 = mark(); + synPredMatched990 = true; inputState.guessing++; try { { @@ -39242,12 +39225,12 @@ public final void form_item() throws RecognitionException, TokenStreamException } } catch (RecognitionException pe) { - synPredMatched992 = false; + synPredMatched990 = false; } - rewind(_m992); + rewind(_m990); inputState.guessing--; } - if ( synPredMatched992 ) { + if ( synPredMatched990 ) { assign_equal(); astFactory.addASTChild(currentAST, returnAST); } @@ -39268,10 +39251,10 @@ else if ((_tokenSet_208.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } else { - boolean synPredMatched995 = false; + boolean synPredMatched993 = false; if (((LA(1)==WIDGETID) && (_tokenSet_8.member(LA(2))))) { - int _m995 = mark(); - synPredMatched995 = true; + int _m993 = mark(); + synPredMatched993 = true; inputState.guessing++; try { { @@ -39279,20 +39262,20 @@ else if ((_tokenSet_208.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched995 = false; + synPredMatched993 = false; } - rewind(_m995); + rewind(_m993); inputState.guessing--; } - if ( synPredMatched995 ) { + if ( synPredMatched993 ) { widget_id(); astFactory.addASTChild(currentAST, returnAST); } else { - boolean synPredMatched997 = false; + boolean synPredMatched995 = false; if (((_tokenSet_6.member(LA(1))) && (_tokenSet_209.member(LA(2))))) { - int _m997 = mark(); - synPredMatched997 = true; + int _m995 = mark(); + synPredMatched995 = true; inputState.guessing++; try { { @@ -39300,21 +39283,21 @@ else if ((_tokenSet_208.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched997 = false; + synPredMatched995 = false; } - rewind(_m997); + rewind(_m995); inputState.guessing--; } - if ( synPredMatched997 ) { + if ( synPredMatched995 ) { field(); astFactory.addASTChild(currentAST, returnAST); { - _loop1001: + _loop999: do { - boolean synPredMatched1000 = false; + boolean synPredMatched998 = false; if (((LA(1)==LEFTPAREN) && (_tokenSet_144.member(LA(2))))) { - int _m1000 = mark(); - synPredMatched1000 = true; + int _m998 = mark(); + synPredMatched998 = true; inputState.guessing++; try { { @@ -39322,12 +39305,12 @@ else if ((_tokenSet_208.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched1000 = false; + synPredMatched998 = false; } - rewind(_m1000); + rewind(_m998); inputState.guessing--; } - if ( synPredMatched1000 ) { + if ( synPredMatched998 ) { aggregatephrase(); astFactory.addASTChild(currentAST, returnAST); } @@ -39336,7 +39319,7 @@ else if ((_tokenSet_145.member(LA(1))) && (_tokenSet_207.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1001; + break _loop999; } } while (true); @@ -39369,10 +39352,10 @@ public final void display_items_or_record() throws RecognitionException, TokenSt ASTPair currentAST = new ASTPair(); JPNode display_items_or_record_AST = null; - boolean synPredMatched886 = false; + boolean synPredMatched884 = false; if (((_tokenSet_211.member(LA(1))) && (_tokenSet_11.member(LA(2))))) { - int _m886 = mark(); - synPredMatched886 = true; + int _m884 = mark(); + synPredMatched884 = true; inputState.guessing++; try { { @@ -39381,21 +39364,21 @@ public final void display_items_or_record() throws RecognitionException, TokenSt } } catch (RecognitionException pe) { - synPredMatched886 = false; + synPredMatched884 = false; } - rewind(_m886); + rewind(_m884); inputState.guessing--; } - if ( synPredMatched886 ) { + if ( synPredMatched884 ) { { - _loop888: + _loop886: do { if ((_tokenSet_35.member(LA(1)))) { display_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop888; + break _loop886; } } while (true); @@ -39409,14 +39392,14 @@ else if (((_tokenSet_13.member(LA(1))) && (_tokenSet_212.member(LA(2))))&&(isTab } else if ((_tokenSet_211.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { { - _loop890: + _loop888: do { if ((_tokenSet_35.member(LA(1)))) { display_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop890; + break _loop888; } } while (true); @@ -39457,8 +39440,8 @@ public final void formatphrase() throws RecognitionException, TokenStreamExcepti JPNode formatphrase_AST = null; { - int _cnt1008=0; - _loop1008: + int _cnt1006=0; + _loop1006: do { if ((_tokenSet_145.member(LA(1))) && (_tokenSet_213.member(LA(2)))) { if ( inputState.guessing==0 ) { @@ -39468,10 +39451,10 @@ public final void formatphrase() throws RecognitionException, TokenStreamExcepti astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt1008>=1 ) { break _loop1008; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt1006>=1 ) { break _loop1006; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt1008++; + _cnt1006++; } while (true); } if ( inputState.guessing==0 ) { @@ -39521,10 +39504,10 @@ public final void field_equal_dynamic_new() throws RecognitionException, TokenSt JPNode e_AST = null; { - boolean synPredMatched913 = false; + boolean synPredMatched911 = false; if (((_tokenSet_2.member(LA(1))) && (_tokenSet_5.member(LA(2))))) { - int _m913 = mark(); - synPredMatched913 = true; + int _m911 = mark(); + synPredMatched911 = true; inputState.guessing++; try { { @@ -39532,12 +39515,12 @@ public final void field_equal_dynamic_new() throws RecognitionException, TokenSt } } catch (RecognitionException pe) { - synPredMatched913 = false; + synPredMatched911 = false; } - rewind(_m913); + rewind(_m911); inputState.guessing--; } - if ( synPredMatched913 ) { + if ( synPredMatched911 ) { widattr(); astFactory.addASTChild(currentAST, returnAST); } @@ -39592,14 +39575,14 @@ public final void editorphrase() throws RecognitionException, TokenStreamExcepti astFactory.makeASTRoot(currentAST, tmp2247_AST); match(EDITOR); { - _loop917: + _loop915: do { if ((_tokenSet_215.member(LA(1))) && (_tokenSet_162.member(LA(2)))) { editor_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop917; + break _loop915; } } while (true); @@ -39768,14 +39751,14 @@ else if ((LA(1)==EDITING)) { block_colon(); astFactory.addASTChild(currentAST, returnAST); { - _loop931: + _loop929: do { if ((_tokenSet_0.member(LA(1)))) { blockorstate(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop931; + break _loop929; } } while (true); @@ -39809,7 +39792,7 @@ public final void field_list() throws RecognitionException, TokenStreamException field(); astFactory.addASTChild(currentAST, returnAST); { - _loop951: + _loop949: do { if ((LA(1)==COMMA)) { JPNode tmp2262_AST = null; @@ -39820,7 +39803,7 @@ public final void field_list() throws RecognitionException, TokenStreamException astFactory.addASTChild(currentAST, returnAST); } else { - break _loop951; + break _loop949; } } while (true); @@ -39884,7 +39867,7 @@ public final void fillinphrase() throws RecognitionException, TokenStreamExcepti astFactory.makeASTRoot(currentAST, tmp2266_AST); match(FILLIN); { - _loop961: + _loop959: do { if ((LA(1)==NATIVE) && (_tokenSet_163.member(LA(2)))) { JPNode tmp2267_AST = null; @@ -39901,7 +39884,7 @@ else if ((LA(1)==TOOLTIP) && (_tokenSet_216.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop961; + break _loop959; } } while (true); @@ -39960,14 +39943,14 @@ public final void text_opt() throws RecognitionException, TokenStreamException { astFactory.addASTChild(currentAST, tmp2271_AST); match(LEFTPAREN); { - _loop1610: + _loop1608: do { if ((_tokenSet_49.member(LA(1)))) { form_item(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1610; + break _loop1608; } } while (true); @@ -41028,7 +41011,7 @@ public final void titlephrase() throws RecognitionException, TokenStreamExceptio astFactory.makeASTRoot(currentAST, tmp2355_AST); match(TITLE); { - _loop1619: + _loop1617: do { switch ( LA(1)) { case COLOR: @@ -41049,7 +41032,7 @@ public final void titlephrase() throws RecognitionException, TokenStreamExceptio astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1619; + break _loop1617; } } } while (true); @@ -41286,10 +41269,10 @@ public final void function_param() throws RecognitionException, TokenStreamExcep JPNode hn_AST = null; JPNode hn2_AST = null; - boolean synPredMatched1062 = false; + boolean synPredMatched1060 = false; if (((LA(1)==BUFFER) && (_tokenSet_219.member(LA(2))))) { - int _m1062 = mark(); - synPredMatched1062 = true; + int _m1060 = mark(); + synPredMatched1060 = true; inputState.guessing++; try { { @@ -41309,12 +41292,12 @@ else if ((LA(1)==FOR)) { } } catch (RecognitionException pe) { - synPredMatched1062 = false; + synPredMatched1060 = false; } - rewind(_m1062); + rewind(_m1060); inputState.guessing--; } - if ( synPredMatched1062 ) { + if ( synPredMatched1060 ) { JPNode tmp2371_AST = null; tmp2371_AST = (JPNode)astFactory.create(LT(1)); astFactory.makeASTRoot(currentAST, tmp2371_AST); @@ -42286,7 +42269,7 @@ public final void interface_inherits() throws RecognitionException, TokenStreamE type_name(); astFactory.addASTChild(currentAST, returnAST); { - _loop1179: + _loop1177: do { if ((LA(1)==COMMA)) { JPNode tmp2413_AST = null; @@ -42297,7 +42280,7 @@ public final void interface_inherits() throws RecognitionException, TokenStreamE astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1179; + break _loop1177; } } while (true); @@ -42444,7 +42427,7 @@ public final void io_opt() throws RecognitionException, TokenStreamException { astFactory.makeASTRoot(currentAST, tmp2423_AST); match(CONVERT); { - _loop1200: + _loop1198: do { if ((LA(1)==SOURCE||LA(1)==TARGET)) { { @@ -42475,7 +42458,7 @@ public final void io_opt() throws RecognitionException, TokenStreamException { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1200; + break _loop1198; } } while (true); @@ -42675,21 +42658,21 @@ public final void io_phrase_any_tokens_sub() throws RecognitionException, TokenS Token t1 = null; JPNode t1_AST = null; - boolean synPredMatched1194 = false; + boolean synPredMatched1192 = false; if (((_tokenSet_143.member(LA(1))) && (_tokenSet_11.member(LA(2))))) { - int _m1194 = mark(); - synPredMatched1194 = true; + int _m1192 = mark(); + synPredMatched1192 = true; inputState.guessing++; try { { { - _loop1193: + _loop1191: do { if ((_tokenSet_142.member(LA(1)))) { io_opt(); } else { - break _loop1193; + break _loop1191; } } while (true); @@ -42698,21 +42681,21 @@ public final void io_phrase_any_tokens_sub() throws RecognitionException, TokenS } } catch (RecognitionException pe) { - synPredMatched1194 = false; + synPredMatched1192 = false; } - rewind(_m1194); + rewind(_m1192); inputState.guessing--; } - if ( synPredMatched1194 ) { + if ( synPredMatched1192 ) { { - _loop1196: + _loop1194: do { if ((_tokenSet_142.member(LA(1)))) { io_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1196; + break _loop1194; } } while (true); @@ -43283,14 +43266,14 @@ else if ((_tokenSet_11.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } { - _loop1493: + _loop1491: do { if ((_tokenSet_225.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { run_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1493; + break _loop1491; } } while (true); @@ -43308,7 +43291,7 @@ else if ((_tokenSet_11.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } { - _loop1496: + _loop1494: do { if ((LA(1)==NOERROR_KW) && (_tokenSet_11.member(LA(2)))) { JPNode tmp2474_AST = null; @@ -43321,7 +43304,7 @@ else if ((_tokenSet_12.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1496; + break _loop1494; } } while (true); @@ -43363,7 +43346,7 @@ else if ((_tokenSet_8.member(LA(1))) && (_tokenSet_126.member(LA(2)))) { expression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1301: + _loop1299: do { if ((LA(1)==COMMA)) { JPNode tmp2477_AST = null; @@ -43388,7 +43371,7 @@ else if ((_tokenSet_8.member(LA(1))) && (_tokenSet_126.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1301; + break _loop1299; } } while (true); @@ -43528,10 +43511,10 @@ public final void return_options() throws RecognitionException, TokenStreamExcep JPNode return_options_AST = null; { - boolean synPredMatched1484 = false; + boolean synPredMatched1482 = false; if (((_tokenSet_229.member(LA(1))) && (_tokenSet_11.member(LA(2))))) { - int _m1484 = mark(); - synPredMatched1484 = true; + int _m1482 = mark(); + synPredMatched1482 = true; inputState.guessing++; try { { @@ -43542,12 +43525,12 @@ public final void return_options() throws RecognitionException, TokenStreamExcep } } catch (RecognitionException pe) { - synPredMatched1484 = false; + synPredMatched1482 = false; } - rewind(_m1484); + rewind(_m1482); inputState.guessing--; } - if ( synPredMatched1484 ) { + if ( synPredMatched1482 ) { } else if ((LA(1)==ERROR) && (_tokenSet_229.member(LA(2)))) { JPNode tmp2486_AST = null; @@ -43627,14 +43610,14 @@ public final void openquerystate() throws RecognitionException, TokenStreamExcep for_record_spec(); astFactory.addASTChild(currentAST, returnAST); { - _loop1315: + _loop1313: do { if ((_tokenSet_231.member(LA(1)))) { openquery_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1315; + break _loop1313; } } while (true); @@ -43948,14 +43931,14 @@ public final void procedure_opt() throws RecognitionException, TokenStreamExcept constant(); astFactory.addASTChild(currentAST, returnAST); { - _loop1365: + _loop1363: do { if ((_tokenSet_232.member(LA(1)))) { procedure_dll_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1365; + break _loop1363; } } while (true); @@ -44467,14 +44450,14 @@ public final void radiosetphrase() throws RecognitionException, TokenStreamExcep astFactory.makeASTRoot(currentAST, tmp2549_AST); match(RADIOSET); { - _loop1413: + _loop1411: do { if ((_tokenSet_233.member(LA(1))) && (_tokenSet_234.member(LA(2)))) { radioset_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1413; + break _loop1411; } } while (true); @@ -44617,12 +44600,12 @@ else if ((_tokenSet_163.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } { - _loop1425: + _loop1423: do { - boolean synPredMatched1421 = false; + boolean synPredMatched1419 = false; if (((LA(1)==COMMA) && (_tokenSet_235.member(LA(2))))) { - int _m1421 = mark(); - synPredMatched1421 = true; + int _m1419 = mark(); + synPredMatched1419 = true; inputState.guessing++; try { { @@ -44696,12 +44679,12 @@ else if ((_tokenSet_163.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched1421 = false; + synPredMatched1419 = false; } - rewind(_m1421); + rewind(_m1419); inputState.guessing--; } - if ( synPredMatched1421 ) { + if ( synPredMatched1419 ) { JPNode tmp2557_AST = null; tmp2557_AST = (JPNode)astFactory.create(LT(1)); astFactory.addASTChild(currentAST, tmp2557_AST); @@ -44785,10 +44768,10 @@ else if ((_tokenSet_163.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } else { - boolean synPredMatched1424 = false; + boolean synPredMatched1422 = false; if (((_tokenSet_163.member(LA(1))) && (_tokenSet_11.member(LA(2))))) { - int _m1424 = mark(); - synPredMatched1424 = true; + int _m1422 = mark(); + synPredMatched1422 = true; inputState.guessing++; try { { @@ -44799,12 +44782,12 @@ else if ((_tokenSet_163.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched1424 = false; + synPredMatched1422 = false; } - rewind(_m1424); + rewind(_m1422); inputState.guessing--; } - if ( synPredMatched1424 ) { + if ( synPredMatched1422 ) { if ( inputState.guessing==0 ) { throw new NoViableAltException(LT(1), "Got an IMPOSSIBLE_TOKEN " + getFilename()); @@ -44812,7 +44795,7 @@ else if ((_tokenSet_163.member(LA(1))) && (_tokenSet_11.member(LA(2)))) { } } else { - break _loop1425; + break _loop1423; } } } while (true); @@ -44933,10 +44916,10 @@ public final void rawtransfer_elem() throws RecognitionException, TokenStreamExc ASTPair currentAST = new ASTPair(); JPNode rawtransfer_elem_AST = null; - boolean synPredMatched1433 = false; + boolean synPredMatched1431 = false; if (((LA(1)==BUFFER) && (_tokenSet_13.member(LA(2))))) { - int _m1433 = mark(); - synPredMatched1433 = true; + int _m1431 = mark(); + synPredMatched1431 = true; inputState.guessing++; try { { @@ -44945,12 +44928,12 @@ public final void rawtransfer_elem() throws RecognitionException, TokenStreamExc } } catch (RecognitionException pe) { - synPredMatched1433 = false; + synPredMatched1431 = false; } - rewind(_m1433); + rewind(_m1431); inputState.guessing--; } - if ( synPredMatched1433 ) { + if ( synPredMatched1431 ) { JPNode tmp2563_AST = null; tmp2563_AST = (JPNode)astFactory.create(LT(1)); astFactory.addASTChild(currentAST, tmp2563_AST); @@ -44960,10 +44943,10 @@ public final void rawtransfer_elem() throws RecognitionException, TokenStreamExc rawtransfer_elem_AST = (JPNode)currentAST.root; } else { - boolean synPredMatched1435 = false; + boolean synPredMatched1433 = false; if (((LA(1)==FIELD))) { - int _m1435 = mark(); - synPredMatched1435 = true; + int _m1433 = mark(); + synPredMatched1433 = true; inputState.guessing++; try { { @@ -44972,12 +44955,12 @@ public final void rawtransfer_elem() throws RecognitionException, TokenStreamExc } } catch (RecognitionException pe) { - synPredMatched1435 = false; + synPredMatched1433 = false; } - rewind(_m1435); + rewind(_m1433); inputState.guessing--; } - if ( synPredMatched1435 ) { + if ( synPredMatched1433 ) { JPNode tmp2564_AST = null; tmp2564_AST = (JPNode)astFactory.create(LT(1)); astFactory.addASTChild(currentAST, tmp2564_AST); @@ -45066,7 +45049,7 @@ public final void record_opt() throws RecognitionException, TokenStreamException field(); astFactory.addASTChild(currentAST, returnAST); { - _loop1462: + _loop1460: do { if ((LA(1)==AND)) { JPNode tmp2570_AST = null; @@ -45077,7 +45060,7 @@ public final void record_opt() throws RecognitionException, TokenStreamException astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1462; + break _loop1460; } } while (true); @@ -45131,10 +45114,10 @@ public final void record_opt() throws RecognitionException, TokenStreamException break; } default: - boolean synPredMatched1459 = false; + boolean synPredMatched1457 = false; if (((LA(1)==WHERE) && (_tokenSet_123.member(LA(2))))) { - int _m1459 = mark(); - synPredMatched1459 = true; + int _m1457 = mark(); + synPredMatched1457 = true; inputState.guessing++; try { { @@ -45180,12 +45163,12 @@ public final void record_opt() throws RecognitionException, TokenStreamException } } catch (RecognitionException pe) { - synPredMatched1459 = false; + synPredMatched1457 = false; } - rewind(_m1459); + rewind(_m1457); inputState.guessing--; } - if ( synPredMatched1459 ) { + if ( synPredMatched1457 ) { JPNode tmp2575_AST = null; tmp2575_AST = (JPNode)astFactory.create(LT(1)); astFactory.makeASTRoot(currentAST, tmp2575_AST); @@ -45393,7 +45376,7 @@ public final void reposition_opt() throws RecognitionException, TokenStreamExcep expression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1479: + _loop1477: do { if ((LA(1)==COMMA)) { JPNode tmp2588_AST = null; @@ -45404,7 +45387,7 @@ public final void reposition_opt() throws RecognitionException, TokenStreamExcep astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1479; + break _loop1477; } } while (true); @@ -45826,14 +45809,14 @@ public final void selectionlistphrase() throws RecognitionException, TokenStream astFactory.makeASTRoot(currentAST, tmp2608_AST); match(SELECTIONLIST); { - _loop1528: + _loop1526: do { if ((_tokenSet_240.member(LA(1))) && (_tokenSet_162.member(LA(2)))) { selectionlist_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1528; + break _loop1526; } } while (true); @@ -45885,7 +45868,7 @@ public final void selectionlist_opt() throws RecognitionException, TokenStreamEx constant(); astFactory.addASTChild(currentAST, returnAST); { - _loop1531: + _loop1529: do { if ((LA(1)==COMMA) && (_tokenSet_25.member(LA(2)))) { JPNode tmp2613_AST = null; @@ -45896,7 +45879,7 @@ public final void selectionlist_opt() throws RecognitionException, TokenStreamEx astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1531; + break _loop1529; } } while (true); @@ -45913,7 +45896,7 @@ public final void selectionlist_opt() throws RecognitionException, TokenStreamEx constant(); astFactory.addASTChild(currentAST, returnAST); { - _loop1533: + _loop1531: do { if ((LA(1)==COMMA) && (_tokenSet_25.member(LA(2)))) { JPNode tmp2615_AST = null; @@ -45924,7 +45907,7 @@ public final void selectionlist_opt() throws RecognitionException, TokenStreamEx astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1533; + break _loop1531; } } while (true); @@ -46016,14 +45999,14 @@ public final void sliderphrase() throws RecognitionException, TokenStreamExcepti astFactory.makeASTRoot(currentAST, tmp2621_AST); match(SLIDER); { - _loop1552: + _loop1550: do { if ((_tokenSet_241.member(LA(1))) && (_tokenSet_162.member(LA(2)))) { slider_opt(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1552; + break _loop1550; } } while (true); @@ -46461,7 +46444,7 @@ public final void sysdiagetfile_opt() throws RecognitionException, TokenStreamEx expression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1594: + _loop1592: do { if ((LA(1)==COMMA)) { JPNode tmp2650_AST = null; @@ -46474,7 +46457,7 @@ public final void sysdiagetfile_opt() throws RecognitionException, TokenStreamEx astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1594; + break _loop1592; } } while (true); @@ -46949,7 +46932,7 @@ public final void textphrase() throws RecognitionException, TokenStreamException astFactory.makeASTRoot(currentAST, tmp2686_AST); match(TEXT); { - _loop1613: + _loop1611: do { if (((LA(1) >= SIZE && LA(1) <= SIZEPIXELS)) && (_tokenSet_8.member(LA(2)))) { sizephrase(); @@ -46960,7 +46943,7 @@ else if ((LA(1)==TOOLTIP) && (_tokenSet_216.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1613; + break _loop1611; } } while (true); @@ -46980,7 +46963,7 @@ public final void toggleboxphrase() throws RecognitionException, TokenStreamExce astFactory.makeASTRoot(currentAST, tmp2687_AST); match(TOGGLEBOX); { - _loop1623: + _loop1621: do { if (((LA(1) >= SIZE && LA(1) <= SIZEPIXELS)) && (_tokenSet_8.member(LA(2)))) { sizephrase(); @@ -46991,7 +46974,7 @@ else if ((LA(1)==TOOLTIP) && (_tokenSet_216.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1623; + break _loop1621; } } while (true); @@ -47007,14 +46990,14 @@ public final void trigger_block() throws RecognitionException, TokenStreamExcept JPNode trigger_block_AST = null; { - _loop1631: + _loop1629: do { if ((LA(1)==ON)) { trigger_on(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1631; + break _loop1629; } } while (true); @@ -47352,7 +47335,7 @@ public final void sqlupdatestate() throws RecognitionException, TokenStreamExcep sqlupdate_equal(); astFactory.addASTChild(currentAST, returnAST); { - _loop1859: + _loop1857: do { if ((LA(1)==COMMA)) { JPNode tmp2705_AST = null; @@ -47363,7 +47346,7 @@ public final void sqlupdatestate() throws RecognitionException, TokenStreamExcep astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1859; + break _loop1857; } } while (true); @@ -51259,7 +51242,7 @@ else if ((_tokenSet_243.member(LA(1))) && (_tokenSet_244.member(LA(2)))) { } { - _loop1876: + _loop1874: do { switch ( LA(1)) { case COLUMNLABEL: @@ -51290,7 +51273,7 @@ else if ((_tokenSet_243.member(LA(1))) && (_tokenSet_244.member(LA(2)))) { } default: { - break _loop1876; + break _loop1874; } } } while (true); @@ -51318,7 +51301,7 @@ public final void createtable_unique() throws RecognitionException, TokenStreamE astFactory.addASTChild(currentAST, tmp3114_AST); match(ID); { - _loop1746: + _loop1744: do { if ((LA(1)==COMMA)) { JPNode tmp3115_AST = null; @@ -51331,7 +51314,7 @@ public final void createtable_unique() throws RecognitionException, TokenStreamE match(ID); } else { - break _loop1746; + break _loop1744; } } while (true); @@ -51811,18 +51794,18 @@ public final void grant_rev_opt() throws RecognitionException, TokenStreamExcept case COMMA: { { - int _cnt1780=0; - _loop1780: + int _cnt1778=0; + _loop1778: do { if ((_tokenSet_248.member(LA(1)))) { grant_rev_opt2(); astFactory.addASTChild(currentAST, returnAST); } else { - if ( _cnt1780>=1 ) { break _loop1780; } else {throw new NoViableAltException(LT(1), getFilename());} + if ( _cnt1778>=1 ) { break _loop1778; } else {throw new NoViableAltException(LT(1), getFilename());} } - _cnt1780++; + _cnt1778++; } while (true); } grant_rev_opt_AST = (JPNode)currentAST.root; @@ -51877,7 +51860,7 @@ else if ((_tokenSet_42.member(LA(1))) && (_tokenSet_41.member(LA(2)))) { filename(); astFactory.addASTChild(currentAST, returnAST); { - _loop1787: + _loop1785: do { if ((LA(1)==COMMA)) { JPNode tmp3140_AST = null; @@ -51888,7 +51871,7 @@ else if ((_tokenSet_42.member(LA(1))) && (_tokenSet_41.member(LA(2)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1787; + break _loop1785; } } while (true); @@ -52015,7 +51998,7 @@ else if ((LA(1)==COMMA||LA(1)==RIGHTPAREN)) { } { - _loop1795: + _loop1793: do { if ((LA(1)==COMMA)) { JPNode tmp3148_AST = null; @@ -52038,7 +52021,7 @@ else if ((LA(1)==COMMA||LA(1)==RIGHTPAREN)) { } } else { - break _loop1795; + break _loop1793; } } while (true); @@ -52230,7 +52213,7 @@ else if ((_tokenSet_247.member(LA(1))) && (_tokenSet_249.member(LA(2)))) { } { - _loop1819: + _loop1817: do { if ((LA(1)==COMMA)) { JPNode tmp3153_AST = null; @@ -52289,7 +52272,7 @@ else if ((_tokenSet_247.member(LA(1))) && (_tokenSet_249.member(LA(2)))) { } } else { - break _loop1819; + break _loop1817; } } while (true); @@ -52336,7 +52319,7 @@ else if ((LA(1)==FROM||LA(1)==COMMA)) { } { - _loop1824: + _loop1822: do { if ((LA(1)==COMMA)) { JPNode tmp3155_AST = null; @@ -52359,7 +52342,7 @@ else if ((LA(1)==FROM||LA(1)==COMMA)) { } } else { - break _loop1824; + break _loop1822; } } while (true); @@ -52381,7 +52364,7 @@ public final void select_from() throws RecognitionException, TokenStreamExceptio select_from_spec(); astFactory.addASTChild(currentAST, returnAST); { - _loop1827: + _loop1825: do { if ((LA(1)==COMMA)) { JPNode tmp3157_AST = null; @@ -52392,7 +52375,7 @@ public final void select_from() throws RecognitionException, TokenStreamExceptio astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1827; + break _loop1825; } } while (true); @@ -52418,7 +52401,7 @@ public final void select_group() throws RecognitionException, TokenStreamExcepti sqlscalar(); astFactory.addASTChild(currentAST, returnAST); { - _loop1844: + _loop1842: do { if ((LA(1)==COMMA)) { JPNode tmp3160_AST = null; @@ -52429,7 +52412,7 @@ public final void select_group() throws RecognitionException, TokenStreamExcepti astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1844; + break _loop1842; } } while (true); @@ -52553,7 +52536,7 @@ public final void select_order() throws RecognitionException, TokenStreamExcepti } } { - _loop1853: + _loop1851: do { if ((LA(1)==COMMA)) { JPNode tmp3167_AST = null; @@ -52622,7 +52605,7 @@ public final void select_order() throws RecognitionException, TokenStreamExcepti } } else { - break _loop1853; + break _loop1851; } } while (true); @@ -52698,14 +52681,14 @@ public final void select_from_spec() throws RecognitionException, TokenStreamExc select_sqltableref(); astFactory.addASTChild(currentAST, returnAST); { - _loop1830: + _loop1828: do { if ((_tokenSet_250.member(LA(1)))) { select_join(); astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1830; + break _loop1828; } } while (true); @@ -52749,10 +52732,10 @@ public final void select_sqltableref() throws RecognitionException, TokenStreamE JPNode select_sqltableref_AST = null; { - boolean synPredMatched1839 = false; + boolean synPredMatched1837 = false; if (((_tokenSet_13.member(LA(1))) && (_tokenSet_251.member(LA(2))))) { - int _m1839 = mark(); - synPredMatched1839 = true; + int _m1837 = mark(); + synPredMatched1837 = true; inputState.guessing++; try { { @@ -52760,12 +52743,12 @@ public final void select_sqltableref() throws RecognitionException, TokenStreamE } } catch (RecognitionException pe) { - synPredMatched1839 = false; + synPredMatched1837 = false; } - rewind(_m1839); + rewind(_m1837); inputState.guessing--; } - if ( synPredMatched1839 ) { + if ( synPredMatched1837 ) { record(); astFactory.addASTChild(currentAST, returnAST); } @@ -52941,7 +52924,7 @@ public final void sqlscalar() throws RecognitionException, TokenStreamException sqlmultiplicativeExpression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1922: + _loop1920: do { if ((LA(1)==MINUS||LA(1)==PLUS)) { { @@ -52976,7 +52959,7 @@ public final void sqlscalar() throws RecognitionException, TokenStreamException astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1922; + break _loop1920; } } while (true); @@ -53119,7 +53102,7 @@ public final void sqlorExpression() throws RecognitionException, TokenStreamExce sqlandExpression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1882: + _loop1880: do { if ((LA(1)==OR)) { JPNode tmp3197_AST = null; @@ -53134,7 +53117,7 @@ public final void sqlorExpression() throws RecognitionException, TokenStreamExce } } else { - break _loop1882; + break _loop1880; } } while (true); @@ -53152,7 +53135,7 @@ public final void sqlandExpression() throws RecognitionException, TokenStreamExc sqlnotExpression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1885: + _loop1883: do { if ((LA(1)==AND)) { JPNode tmp3198_AST = null; @@ -53167,7 +53150,7 @@ public final void sqlandExpression() throws RecognitionException, TokenStreamExc } } else { - break _loop1885; + break _loop1883; } } while (true); @@ -53386,10 +53369,10 @@ else if ((_tokenSet_121.member(LA(1)))) { support.attrOp(sqlrelationalExpression_AST); } { - boolean synPredMatched1893 = false; + boolean synPredMatched1891 = false; if (((_tokenSet_259.member(LA(1))) && (LA(2)==SELECT||LA(2)==LEFTPAREN))) { - int _m1893 = mark(); - synPredMatched1893 = true; + int _m1891 = mark(); + synPredMatched1891 = true; inputState.guessing++; try { { @@ -53425,12 +53408,12 @@ else if ((_tokenSet_121.member(LA(1)))) { } } catch (RecognitionException pe) { - synPredMatched1893 = false; + synPredMatched1891 = false; } - rewind(_m1893); + rewind(_m1891); inputState.guessing--; } - if ( synPredMatched1893 ) { + if ( synPredMatched1891 ) { sql_comp_query(); astFactory.addASTChild(currentAST, returnAST); } @@ -53445,10 +53428,10 @@ else if ((_tokenSet_121.member(LA(1))) && (_tokenSet_260.member(LA(2)))) { } } else { - boolean synPredMatched1896 = false; + boolean synPredMatched1894 = false; if (((LA(1)==BEGINS||LA(1)==NOT) && (_tokenSet_261.member(LA(2))))) { - int _m1896 = mark(); - synPredMatched1896 = true; + int _m1894 = mark(); + synPredMatched1894 = true; inputState.guessing++; try { { @@ -53473,12 +53456,12 @@ else if ((_tokenSet_121.member(LA(1))) && (_tokenSet_260.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched1896 = false; + synPredMatched1894 = false; } - rewind(_m1896); + rewind(_m1894); inputState.guessing--; } - if ( synPredMatched1896 ) { + if ( synPredMatched1894 ) { { switch ( LA(1)) { case NOT: @@ -53515,10 +53498,10 @@ else if ((_tokenSet_121.member(LA(1))) && (_tokenSet_260.member(LA(2)))) { } } else { - boolean synPredMatched1900 = false; + boolean synPredMatched1898 = false; if (((LA(1)==BETWEEN||LA(1)==NOT) && (_tokenSet_262.member(LA(2))))) { - int _m1900 = mark(); - synPredMatched1900 = true; + int _m1898 = mark(); + synPredMatched1898 = true; inputState.guessing++; try { { @@ -53543,12 +53526,12 @@ else if ((_tokenSet_121.member(LA(1))) && (_tokenSet_260.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched1900 = false; + synPredMatched1898 = false; } - rewind(_m1900); + rewind(_m1898); inputState.guessing--; } - if ( synPredMatched1900 ) { + if ( synPredMatched1898 ) { { switch ( LA(1)) { case NOT: @@ -53591,10 +53574,10 @@ else if ((_tokenSet_121.member(LA(1))) && (_tokenSet_260.member(LA(2)))) { } } else { - boolean synPredMatched1904 = false; + boolean synPredMatched1902 = false; if (((LA(1)==IN_KW||LA(1)==NOT) && (LA(2)==IN_KW||LA(2)==LEFTPAREN))) { - int _m1904 = mark(); - synPredMatched1904 = true; + int _m1902 = mark(); + synPredMatched1902 = true; inputState.guessing++; try { { @@ -53619,12 +53602,12 @@ else if ((_tokenSet_121.member(LA(1))) && (_tokenSet_260.member(LA(2)))) { } } catch (RecognitionException pe) { - synPredMatched1904 = false; + synPredMatched1902 = false; } - rewind(_m1904); + rewind(_m1902); inputState.guessing--; } - if ( synPredMatched1904 ) { + if ( synPredMatched1902 ) { { switch ( LA(1)) { case NOT: @@ -53662,7 +53645,7 @@ else if ((_tokenSet_263.member(LA(1)))) { sql_in_val(); astFactory.addASTChild(currentAST, returnAST); { - _loop1908: + _loop1906: do { if ((LA(1)==COMMA)) { JPNode tmp3219_AST = null; @@ -53673,7 +53656,7 @@ else if ((_tokenSet_263.member(LA(1)))) { astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1908; + break _loop1906; } } while (true); @@ -53698,10 +53681,10 @@ else if ((_tokenSet_263.member(LA(1)))) { } } else { - boolean synPredMatched1911 = false; + boolean synPredMatched1909 = false; if (((LA(1)==LIKE||LA(1)==NOT) && (_tokenSet_264.member(LA(2))))) { - int _m1911 = mark(); - synPredMatched1911 = true; + int _m1909 = mark(); + synPredMatched1909 = true; inputState.guessing++; try { { @@ -53726,12 +53709,12 @@ else if ((_tokenSet_263.member(LA(1)))) { } } catch (RecognitionException pe) { - synPredMatched1911 = false; + synPredMatched1909 = false; } - rewind(_m1911); + rewind(_m1909); inputState.guessing--; } - if ( synPredMatched1911 ) { + if ( synPredMatched1909 ) { { switch ( LA(1)) { case NOT: @@ -53999,7 +53982,7 @@ public final void sqlmultiplicativeExpression() throws RecognitionException, Tok sqlunaryExpression(); astFactory.addASTChild(currentAST, returnAST); { - _loop1926: + _loop1924: do { if ((LA(1)==MODULO||LA(1)==SLASH||LA(1)==STAR) && (_tokenSet_121.member(LA(2)))) { { @@ -54048,7 +54031,7 @@ public final void sqlmultiplicativeExpression() throws RecognitionException, Tok astFactory.addASTChild(currentAST, returnAST); } else { - break _loop1926; + break _loop1924; } } while (true); diff --git a/src/com/joanju/proparse/proparse.g b/src/com/joanju/proparse/proparse.g index 102a5a0..c5307d6 100644 --- a/src/com/joanju/proparse/proparse.g +++ b/src/com/joanju/proparse/proparse.g @@ -797,7 +797,7 @@ exprt // Also has to be checked before systemhandlename, because you want to pick up all // of FILE-INFO:FILE-TYPE rather than just FILE-INFO, for example. (widname (OBJCOLON|DOUBLECOLON))=> widname attr_colon {##=#([Widget_ref],##);} - | (exprt2)=> exprt2 (options{greedy=true;}: attr_colon {##=#([Widget_ref],##);} )? + | exprt2 (options{greedy=true;}: attr_colon {##=#([Widget_ref],##);} )? ; exprt2 diff --git a/src/org/prorefactor/core/unittest/BugFixTests.java b/src/org/prorefactor/core/unittest/BugFixTests.java index 2b7cc69..e3a7b08 100644 --- a/src/org/prorefactor/core/unittest/BugFixTests.java +++ b/src/org/prorefactor/core/unittest/BugFixTests.java @@ -45,6 +45,7 @@ public void test01() throws Exception { Collection files = FileUtils.listFiles(directory, extensions, true); for (Iterator it = files.iterator(); it.hasNext();) { File file = (File) it.next(); + System.out.println("Parse: " + file.getAbsolutePath()); ParseUnit pu = new ParseUnit(file); pu.parse(); pu.treeParser(new JPTreeParser()); @@ -53,16 +54,3 @@ public void test01() throws Exception { } } - - -/* -import org.prorefactor.core.JPNodeLister; -import org.prorefactor.core.TokenTypes; - - boolean debug = true; - if (debug && file.getName().equals("bug06.p")) { - JPNodeLister lister = new JPNodeLister(pu.getTopNode(), "C:\\temp\\nodelister.txt", new TokenTypes()); - lister.print(); - } - -*/