From: kpouer Date: Fri, 7 Mar 2003 13:06:53 +0000 (+0000) Subject: ugly syntax supported (endif, endwhile endfor) X-Git-Url: http://git.phpeclipse.com?hp=ecbdbe25546834ac4b63f11d8f01607e119388c7 ugly syntax supported (endif, endwhile endfor) --- diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 30ecd2f..515e143 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -181,7 +181,11 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } public void parse(String s) throws CoreException { - ReInit(new StringReader(s)); + StringReader stream = new StringReader(s); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); try { parse(); } catch (ParseException e) { @@ -320,11 +324,15 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants jj_la1[2] = jj_gen; ; } - classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); - currentSegment.add(classDeclaration); - currentSegment = classDeclaration; + if (currentSegment != null) { + classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); + currentSegment.add(classDeclaration); + currentSegment = classDeclaration; + } ClassBody(); - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + } } static final public void ClassBody() throws ParseException { @@ -376,7 +384,9 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants PHPVarDeclaration variableDeclaration; jj_consume_token(VAR); variableDeclaration = VariableDeclarator(); - currentSegment.add(variableDeclaration); + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -389,7 +399,9 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } jj_consume_token(COMMA); variableDeclaration = VariableDeclarator(); - currentSegment.add(variableDeclaration); + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } } try { jj_consume_token(SEMICOLON); @@ -677,10 +689,14 @@ StringBuffer buff = new StringBuffer("("); PHPFunctionDeclaration functionDeclaration; jj_consume_token(FUNCTION); functionDeclaration = MethodDeclarator(); - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; + if (currentSegment != null) { + currentSegment.add(functionDeclaration); + currentSegment = functionDeclaration; + } Block(); - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + } } static final public PHPFunctionDeclaration MethodDeclarator() throws ParseException { @@ -1160,6 +1176,7 @@ StringBuffer buff = new StringBuffer("("); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EQ: case NE: + case DIF: case BANGDOUBLEEQUAL: case TRIPLEEQUAL: ; @@ -1172,6 +1189,9 @@ StringBuffer buff = new StringBuffer("("); case EQ: operator = jj_consume_token(EQ); break; + case DIF: + operator = jj_consume_token(DIF); + break; case NE: operator = jj_consume_token(NE); break; @@ -1914,8 +1934,8 @@ StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: jj_la1[64] = jj_gen; @@ -2019,14 +2039,16 @@ StringBuffer buff = new StringBuffer(); case REQUIRE: jj_consume_token(REQUIRE); expr = Expression(); - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); + } try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: jj_la1[67] = jj_gen; @@ -2042,14 +2064,16 @@ StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: jj_consume_token(REQUIRE_ONCE); expr = Expression(); - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr)); + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr)); + } try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: jj_la1[68] = jj_gen; @@ -2065,14 +2089,16 @@ StringBuffer buff = new StringBuffer(); case INCLUDE: jj_consume_token(INCLUDE); expr = Expression(); - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); + } try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: jj_la1[69] = jj_gen; @@ -2088,14 +2114,16 @@ StringBuffer buff = new StringBuffer(); case INCLUDE_ONCE: jj_consume_token(INCLUDE_ONCE); expr = Expression(); - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr)); + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr)); + } try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: jj_la1[70] = jj_gen; @@ -2146,8 +2174,8 @@ StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: jj_la1[73] = jj_gen; @@ -2182,8 +2210,8 @@ StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: jj_la1[75] = jj_gen; @@ -2218,8 +2246,8 @@ StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: jj_la1[77] = jj_gen; @@ -2542,28 +2570,7 @@ StringBuffer buff = new StringBuffer(); static final public void IfStatement() throws ParseException { jj_consume_token(IF); Condition("if"); - Statement(); - label_30: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ELSEIF: - ; - break; - default: - jj_la1[87] = jj_gen; - break label_30; - } - ElseIfStatement(); - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ELSE: - jj_consume_token(ELSE); - Statement(); - break; - default: - jj_la1[88] = jj_gen; - ; - } + IfStatement0(); } static final public void Condition(String keyword) throws ParseException { @@ -2584,6 +2591,270 @@ StringBuffer buff = new StringBuffer(); } } + static final public void IfStatement0() throws ParseException { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COLON: + jj_consume_token(COLON); + label_30: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case BREAK: + case CONTINUE: + case DO: + case FALSE: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + ; + break; + default: + jj_la1[87] = jj_gen; + break label_30; + } + Statement(); + } + label_31: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ELSEIF: + ; + break; + default: + jj_la1[88] = jj_gen; + break label_31; + } + ElseIfStatementColon(); + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ELSE: + ElseStatementColon(); + break; + default: + jj_la1[89] = jj_gen; + ; + } + jj_consume_token(ENDIF); + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { + errorMessage = "';' expected 'endif' keyword"; + errorLevel = ERROR; + {if (true) throw e;} + } + break; + case IF: + case ARRAY: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case BREAK: + case CONTINUE: + case DO: + case FALSE: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + Statement(); + label_32: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ELSEIF: + ; + break; + default: + jj_la1[90] = jj_gen; + break label_32; + } + ElseIfStatement(); + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ELSE: + jj_consume_token(ELSE); + Statement(); + break; + default: + jj_la1[91] = jj_gen; + ; + } + break; + default: + jj_la1[92] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + + static final public void ElseIfStatementColon() throws ParseException { + jj_consume_token(ELSEIF); + Condition("elseif"); + jj_consume_token(COLON); + label_33: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case BREAK: + case CONTINUE: + case DO: + case FALSE: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + ; + break; + default: + jj_la1[93] = jj_gen; + break label_33; + } + Statement(); + } + } + + static final public void ElseStatement() throws ParseException { + jj_consume_token(ELSE); + Statement(); + } + + static final public void ElseStatementColon() throws ParseException { + jj_consume_token(ELSE); + jj_consume_token(COLON); + label_34: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case BREAK: + case CONTINUE: + case DO: + case FALSE: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + ; + break; + default: + jj_la1[94] = jj_gen; + break label_34; + } + Statement(); + } + } + static final public void ElseIfStatement() throws ParseException { jj_consume_token(ELSEIF); Condition("elseif"); @@ -2600,7 +2871,7 @@ StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_31: + label_35: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: @@ -2644,8 +2915,8 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[89] = jj_gen; - break label_31; + jj_la1[95] = jj_gen; + break label_35; } Statement(); } @@ -2655,16 +2926,16 @@ StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: - jj_la1[90] = jj_gen; + jj_la1[96] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "';' expected after 'endwhile' keyword"; errorLevel = ERROR; {if (true) throw e;} } @@ -2710,7 +2981,7 @@ StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[91] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2726,11 +2997,11 @@ StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 132: - jj_consume_token(132); + case 135: + jj_consume_token(135); break; default: - jj_la1[92] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2753,7 +3024,7 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[93] = jj_gen; + jj_la1[99] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2774,7 +3045,7 @@ StringBuffer buff = new StringBuffer(); ForInit(); break; default: - jj_la1[94] = jj_gen; + jj_la1[100] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2802,7 +3073,7 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[95] = jj_gen; + jj_la1[101] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2817,11 +3088,116 @@ StringBuffer buff = new StringBuffer(); ForUpdate(); break; default: - jj_la1[96] = jj_gen; + jj_la1[102] = jj_gen; ; } jj_consume_token(RPAREN); - Statement(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case BREAK: + case CONTINUE: + case DO: + case FALSE: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + Statement(); + break; + case COLON: + jj_consume_token(COLON); + label_36: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case BREAK: + case CONTINUE: + case DO: + case FALSE: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + ; + break; + default: + jj_la1[103] = jj_gen; + break label_36; + } + Statement(); + } + jj_consume_token(ENDFOR); + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { + errorMessage = "';' expected 'endfor' keyword"; + errorLevel = ERROR; + {if (true) throw e;} + } + break; + default: + jj_la1[104] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } static final public void ForInit() throws ParseException { @@ -2839,7 +3215,7 @@ StringBuffer buff = new StringBuffer(); StatementExpressionList(); break; default: - jj_la1[97] = jj_gen; + jj_la1[105] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2848,15 +3224,15 @@ StringBuffer buff = new StringBuffer(); static final public void StatementExpressionList() throws ParseException { StatementExpression(); - label_32: + label_37: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[98] = jj_gen; - break label_32; + jj_la1[106] = jj_gen; + break label_37; } jj_consume_token(COMMA); StatementExpression(); @@ -2874,7 +3250,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(IDENTIFIER); break; default: - jj_la1[99] = jj_gen; + jj_la1[107] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2887,7 +3263,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(IDENTIFIER); break; default: - jj_la1[100] = jj_gen; + jj_la1[108] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2919,7 +3295,7 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[101] = jj_gen; + jj_la1[109] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2974,233 +3350,157 @@ StringBuffer buff = new StringBuffer(); return retval; } - static final private boolean jj_3R_114() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_121()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_38() { - if (jj_scan_token(132)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_139() { - if (jj_scan_token(LT)) return true; + static final private boolean jj_3_5() { + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_132() { Token xsp; xsp = jj_scanpos; - if (jj_3R_139()) { - jj_scanpos = xsp; - if (jj_3R_140()) { - jj_scanpos = xsp; - if (jj_3R_141()) { + if (jj_3R_42()) { jj_scanpos = xsp; - if (jj_3R_142()) return true; + if (jj_3R_43()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_131()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_128() { - if (jj_scan_token(ARRAYASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_129() { - if (jj_3R_131()) return true; + static final private boolean jj_3R_142() { + if (jj_scan_token(TRIPLEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_132()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_34() { - if (jj_3R_36()) return true; + static final private boolean jj_3R_141() { + if (jj_scan_token(BANGDOUBLEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_128()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_6() { - if (jj_3R_39()) return true; + static final private boolean jj_3R_107() { + if (jj_scan_token(INTEGER_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_37() { - if (jj_scan_token(SEMICOLON)) return true; + static final private boolean jj_3R_140() { + if (jj_scan_token(NE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_102() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + static final private boolean jj_3R_139() { + if (jj_scan_token(DIF)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_93() { + static final private boolean jj_3R_98() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_100() { + static final private boolean jj_3R_105() { if (jj_scan_token(INTEGER_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_5() { - if (jj_3R_36()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_37()) { - jj_scanpos = xsp; - if (jj_3R_38()) return true; + static final private boolean jj_3R_138() { + if (jj_scan_token(EQ)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_136() { - if (jj_scan_token(TRIPLEEQUAL)) return true; + static final private boolean jj_3R_97() { + if (jj_3R_109()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_135() { - if (jj_scan_token(BANGDOUBLEEQUAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_92() { - if (jj_3R_104()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_134() { - if (jj_scan_token(NE)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_138()) { + jj_scanpos = xsp; + if (jj_3R_139()) { + jj_scanpos = xsp; + if (jj_3R_140()) { + jj_scanpos = xsp; + if (jj_3R_141()) { + jj_scanpos = xsp; + if (jj_3R_142()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_133() { - if (jj_scan_token(EQ)) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_134()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_91() { + static final private boolean jj_3R_96() { if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_102()) { + if (jj_3R_107()) { jj_scanpos = xsp; - if (jj_3R_103()) return true; + if (jj_3R_108()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_118() { - if (jj_3R_56()) return true; + static final private boolean jj_3R_123() { + if (jj_3R_61()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_130() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_133()) { - jj_scanpos = xsp; - if (jj_3R_134()) { - jj_scanpos = xsp; - if (jj_3R_135()) { - jj_scanpos = xsp; - if (jj_3R_136()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_129()) return true; + static final private boolean jj_3R_131() { + if (jj_3R_134()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_135()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_90() { + static final private boolean jj_3R_95() { if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_100()) { + if (jj_3R_105()) { jj_scanpos = xsp; - if (jj_3R_101()) return true; + if (jj_3R_106()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_126() { - if (jj_3R_129()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_130()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_89() { - if (jj_3R_99()) return true; + static final private boolean jj_3R_94() { + if (jj_3R_104()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_71() { + static final private boolean jj_3R_76() { Token xsp; xsp = jj_scanpos; - if (jj_3R_89()) { + if (jj_3R_94()) { jj_scanpos = xsp; - if (jj_3R_90()) { + if (jj_3R_95()) { jj_scanpos = xsp; - if (jj_3R_91()) { + if (jj_3R_96()) { jj_scanpos = xsp; - if (jj_3R_92()) { + if (jj_3R_97()) { jj_scanpos = xsp; - if (jj_3R_93()) return true; + if (jj_3R_98()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -3209,120 +3509,132 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_117() { - if (jj_scan_token(LBRACE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; + static final private boolean jj_3R_202() { + if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_196() { - if (jj_scan_token(COMMA)) return true; + static final private boolean jj_3R_122() { + if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_195() { - if (jj_3R_36()) return true; + static final private boolean jj_3R_201() { + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_196()) { jj_scanpos = xsp; break; } + if (jj_3R_202()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_66() { + static final private boolean jj_3R_132() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_131()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_71() { if (jj_scan_token(DOLLAR_ID)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_118()) jj_scanpos = xsp; + if (jj_3R_123()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_127() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_126()) return true; + static final private boolean jj_3R_200() { + if (jj_3R_201()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_65() { + static final private boolean jj_3R_70() { if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_56()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_194() { - if (jj_3R_195()) return true; + if (jj_3R_61()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_122() { - if (jj_3R_126()) return true; + static final private boolean jj_3R_127() { + if (jj_3R_131()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_127()) { jj_scanpos = xsp; break; } + if (jj_3R_132()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_64() { + static final private boolean jj_3R_69() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_117()) jj_scanpos = xsp; + if (jj_3R_122()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_98() { + static final private boolean jj_3R_103() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_63() { + static final private boolean jj_3R_198() { + if (jj_scan_token(LPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_200()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_68() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_56() { + static final private boolean jj_3R_61() { Token xsp; xsp = jj_scanpos; - if (jj_3R_63()) { + if (jj_3R_68()) { jj_scanpos = xsp; - if (jj_3R_64()) { + if (jj_3R_69()) { jj_scanpos = xsp; - if (jj_3R_65()) { + if (jj_3R_70()) { jj_scanpos = xsp; - if (jj_3R_66()) return true; + if (jj_3R_71()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -3330,176 +3642,158 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_192() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_194()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_88() { - if (jj_scan_token(DOLLAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_56()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_123() { + static final private boolean jj_3R_128() { if (jj_scan_token(XOR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_122()) return true; + if (jj_3R_127()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_120() { + static final private boolean jj_3R_125() { if (jj_scan_token(NULL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_7() { - if (jj_3R_40()) return true; + static final private boolean jj_3R_93() { + if (jj_scan_token(DOLLAR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_61()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_115() { - if (jj_3R_122()) return true; + static final private boolean jj_3R_120() { + if (jj_3R_127()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_123()) { jj_scanpos = xsp; break; } + if (jj_3R_128()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_87() { + static final private boolean jj_3R_130() { + if (jj_scan_token(FALSE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_92() { if (jj_scan_token(DOLLAR_ID)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_98()) jj_scanpos = xsp; + if (jj_3R_103()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_70() { + static final private boolean jj_3R_75() { Token xsp; xsp = jj_scanpos; - if (jj_3R_87()) { + if (jj_3R_92()) { jj_scanpos = xsp; - if (jj_3R_88()) return true; + if (jj_3R_93()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_125() { - if (jj_scan_token(FALSE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_119() { + static final private boolean jj_3R_124() { Token xsp; xsp = jj_scanpos; - if (jj_3R_124()) { + if (jj_3R_129()) { jj_scanpos = xsp; - if (jj_3R_125()) return true; + if (jj_3R_130()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_124() { + static final private boolean jj_3R_129() { if (jj_scan_token(TRUE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_1() { - if (jj_3R_33()) return true; + static final private boolean jj_3R_118() { + if (jj_3R_125()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_113() { - if (jj_3R_120()) return true; + static final private boolean jj_3R_117() { + if (jj_3R_124()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_112() { - if (jj_3R_119()) return true; + static final private boolean jj_3_1() { + if (jj_3R_38()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_116() { + static final private boolean jj_3R_121() { if (jj_scan_token(BIT_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; + if (jj_3R_120()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_111() { + static final private boolean jj_3R_116() { if (jj_scan_token(STRING_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_61() { - if (jj_3R_70()) return true; + static final private boolean jj_3R_115() { + if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_110() { + if (jj_3R_120()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_1()) { jj_scanpos = xsp; break; } + if (jj_3R_121()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_105() { - if (jj_3R_115()) return true; + static final private boolean jj_3R_66() { + if (jj_3R_75()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_116()) { jj_scanpos = xsp; break; } + if (jj_3_1()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_110() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_99() { + static final private boolean jj_3R_104() { Token xsp; xsp = jj_scanpos; - if (jj_3R_109()) { + if (jj_3R_114()) { jj_scanpos = xsp; - if (jj_3R_110()) { + if (jj_3R_115()) { jj_scanpos = xsp; - if (jj_3R_111()) { + if (jj_3R_116()) { jj_scanpos = xsp; - if (jj_3R_112()) { + if (jj_3R_117()) { jj_scanpos = xsp; - if (jj_3R_113()) return true; + if (jj_3R_118()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -3508,475 +3802,465 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_109() { + static final private boolean jj_3R_114() { if (jj_scan_token(INTEGER_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_57() { - if (jj_3R_36()) return true; + static final private boolean jj_3R_62() { + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_106() { + static final private boolean jj_3R_111() { if (jj_scan_token(DOT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_105()) return true; + if (jj_3R_110()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_108() { + static final private boolean jj_3R_113() { if (jj_scan_token(_ANDL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_62() { + static final private boolean jj_3R_67() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_71()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_54() { - if (jj_3R_61()) return true; + if (jj_3R_76()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_62()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_94() { - if (jj_3R_105()) return true; + static final private boolean jj_3R_99() { + if (jj_3R_110()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_106()) { jj_scanpos = xsp; break; } + if (jj_3R_111()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_42() { + static final private boolean jj_3R_47() { if (jj_scan_token(LBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_57()) jj_scanpos = xsp; + if (jj_3R_62()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_41() { + static final private boolean jj_3R_59() { + if (jj_3R_66()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_67()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_46() { if (jj_scan_token(CLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_56()) return true; + if (jj_3R_61()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_33() { + static final private boolean jj_3R_38() { Token xsp; xsp = jj_scanpos; - if (jj_3R_41()) { + if (jj_3R_46()) { jj_scanpos = xsp; - if (jj_3R_42()) return true; + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_189() { - if (jj_3R_33()) return true; + static final private boolean jj_3R_195() { + if (jj_3R_38()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_188() { - if (jj_3R_192()) return true; + static final private boolean jj_3R_194() { + if (jj_3R_198()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_186() { + static final private boolean jj_3R_192() { Token xsp; xsp = jj_scanpos; - if (jj_3R_188()) { + if (jj_3R_194()) { jj_scanpos = xsp; - if (jj_3R_189()) return true; + if (jj_3R_195()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_107() { + static final private boolean jj_3R_112() { if (jj_scan_token(SC_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_95() { + static final private boolean jj_3R_100() { Token xsp; xsp = jj_scanpos; - if (jj_3R_107()) { + if (jj_3R_112()) { jj_scanpos = xsp; - if (jj_3R_108()) return true; + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_94()) return true; + if (jj_3R_99()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_97() { + static final private boolean jj_3R_102() { if (jj_scan_token(_ORL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_72() { - if (jj_3R_94()) return true; + static final private boolean jj_3R_77() { + if (jj_3R_99()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_95()) { jj_scanpos = xsp; break; } + if (jj_3R_100()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_191() { - if (jj_3R_61()) return true; + static final private boolean jj_3R_197() { + if (jj_3R_66()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_190() { + static final private boolean jj_3R_196() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_187() { + static final private boolean jj_3R_193() { Token xsp; xsp = jj_scanpos; - if (jj_3R_190()) { + if (jj_3R_196()) { jj_scanpos = xsp; - if (jj_3R_191()) return true; + if (jj_3R_197()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_68() { + static final private boolean jj_3R_73() { if (jj_scan_token(HOOK)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(COLON)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_59()) return true; + if (jj_3R_64()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_182() { - if (jj_3R_61()) return true; + static final private boolean jj_3R_188() { + if (jj_3R_66()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_96() { + static final private boolean jj_3R_101() { if (jj_scan_token(SC_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_73() { + static final private boolean jj_3R_78() { Token xsp; xsp = jj_scanpos; - if (jj_3R_96()) { + if (jj_3R_101()) { jj_scanpos = xsp; - if (jj_3R_97()) return true; + if (jj_3R_102()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_72()) return true; + if (jj_3R_77()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_181() { + static final private boolean jj_3R_187() { if (jj_scan_token(NEW)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_187()) return true; + if (jj_3R_193()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_184() { + static final private boolean jj_3R_190() { if (jj_scan_token(DECR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_180() { + static final private boolean jj_3R_186() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_178() { + static final private boolean jj_3R_184() { Token xsp; xsp = jj_scanpos; - if (jj_3R_180()) { + if (jj_3R_186()) { jj_scanpos = xsp; - if (jj_3R_181()) { + if (jj_3R_187()) { jj_scanpos = xsp; - if (jj_3R_182()) return true; + if (jj_3R_188()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_67() { - if (jj_3R_72()) return true; + static final private boolean jj_3R_72() { + if (jj_3R_77()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_73()) { jj_scanpos = xsp; break; } + if (jj_3R_78()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_104() { - if (jj_scan_token(ARRAY)) return true; + static final private boolean jj_3R_60() { + if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_114()) return true; + if (jj_3R_59()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_59() { - if (jj_3R_67()) return true; + static final private boolean jj_3R_109() { + if (jj_scan_token(ARRAY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_119()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_68()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_183() { + static final private boolean jj_3R_189() { if (jj_scan_token(INCR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_179() { + static final private boolean jj_3R_185() { Token xsp; xsp = jj_scanpos; - if (jj_3R_183()) { + if (jj_3R_189()) { jj_scanpos = xsp; - if (jj_3R_184()) return true; + if (jj_3R_190()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_177() { - if (jj_3R_104()) return true; + static final private boolean jj_3R_183() { + if (jj_3R_109()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_185() { - if (jj_3R_186()) return true; + static final private boolean jj_3R_64() { + if (jj_3R_72()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_73()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_55() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_54()) return true; + static final private boolean jj_3R_191() { + if (jj_3R_192()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_176() { - if (jj_3R_178()) return true; + static final private boolean jj_3R_182() { + if (jj_3R_184()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_185()) { jj_scanpos = xsp; break; } + if (jj_3R_191()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_193() { - if (jj_3R_186()) return true; + static final private boolean jj_3R_45() { + if (jj_3R_59()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_60()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_86() { - if (jj_scan_token(TILDEEQUAL)) return true; + static final private boolean jj_3R_199() { + if (jj_3R_192()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_85() { - if (jj_scan_token(DOTASSIGN)) return true; + static final private boolean jj_3R_91() { + if (jj_scan_token(TILDEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_173() { + static final private boolean jj_3R_179() { Token xsp; xsp = jj_scanpos; if (jj_3_4()) { jj_scanpos = xsp; - if (jj_3R_176()) { + if (jj_3R_182()) { jj_scanpos = xsp; - if (jj_3R_177()) return true; + if (jj_3R_183()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } + static final private boolean jj_3R_90() { + if (jj_scan_token(DOTASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3_4() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(STATICCLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_187()) return true; + if (jj_3R_193()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_193()) { jj_scanpos = xsp; break; } + if (jj_3R_199()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_84() { + static final private boolean jj_3R_89() { if (jj_scan_token(ORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_83() { + static final private boolean jj_3R_88() { if (jj_scan_token(XORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_82() { + static final private boolean jj_3R_87() { if (jj_scan_token(ANDASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_81() { + static final private boolean jj_3R_86() { if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_80() { + static final private boolean jj_3R_85() { if (jj_scan_token(LSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_79() { + static final private boolean jj_3R_84() { if (jj_scan_token(MINUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_40() { - if (jj_3R_54()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_55()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_78() { + static final private boolean jj_3R_83() { if (jj_scan_token(PLUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_77() { - if (jj_scan_token(REMASSIGN)) return true; + static final private boolean jj_3R_181() { + if (jj_3R_179()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_185()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_175() { - if (jj_3R_173()) return true; + static final private boolean jj_3R_82() { + if (jj_scan_token(REMASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_179()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_76() { + static final private boolean jj_3R_81() { if (jj_scan_token(SLASHASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_75() { + static final private boolean jj_3R_80() { if (jj_scan_token(STARASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_74() { + static final private boolean jj_3R_79() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_69() { + static final private boolean jj_3R_74() { Token xsp; xsp = jj_scanpos; - if (jj_3R_74()) { - jj_scanpos = xsp; - if (jj_3R_75()) { - jj_scanpos = xsp; - if (jj_3R_76()) { - jj_scanpos = xsp; - if (jj_3R_77()) { - jj_scanpos = xsp; - if (jj_3R_78()) { - jj_scanpos = xsp; if (jj_3R_79()) { jj_scanpos = xsp; if (jj_3R_80()) { @@ -3991,7 +4275,17 @@ StringBuffer buff = new StringBuffer(); jj_scanpos = xsp; if (jj_3R_85()) { jj_scanpos = xsp; - if (jj_3R_86()) return true; + if (jj_3R_86()) { + jj_scanpos = xsp; + if (jj_3R_87()) { + jj_scanpos = xsp; + if (jj_3R_88()) { + jj_scanpos = xsp; + if (jj_3R_89()) { + jj_scanpos = xsp; + if (jj_3R_90()) { + jj_scanpos = xsp; + if (jj_3R_91()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4008,14 +4302,22 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_174() { + static final private boolean jj_3R_44() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(COLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_180() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_35()) return true; + if (jj_3R_40()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_148()) return true; + if (jj_3R_154()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4023,96 +4325,96 @@ StringBuffer buff = new StringBuffer(); static final private boolean jj_3_3() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_35()) return true; + if (jj_3R_40()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_172() { + static final private boolean jj_3R_178() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_171() { - if (jj_3R_99()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_60() { - if (jj_3R_69()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; + static final private boolean jj_3R_177() { + if (jj_3R_104()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_39() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_65() { + if (jj_3R_74()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_170() { - if (jj_3R_175()) return true; + static final private boolean jj_3R_176() { + if (jj_3R_181()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_53() { - if (jj_3R_59()) return true; + static final private boolean jj_3R_58() { + if (jj_3R_64()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_60()) jj_scanpos = xsp; + if (jj_3R_65()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_169() { - if (jj_3R_174()) return true; + static final private boolean jj_3R_175() { + if (jj_3R_180()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_36() { + static final private boolean jj_3R_41() { Token xsp; xsp = jj_scanpos; - if (jj_3R_52()) { + if (jj_3R_57()) { jj_scanpos = xsp; - if (jj_3R_53()) return true; + if (jj_3R_58()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_52() { - if (jj_3R_58()) return true; + static final private boolean jj_3R_57() { + if (jj_3R_63()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_167() { + static final private boolean jj_3R_174() { + if (jj_scan_token(BANG)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_154()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_173() { Token xsp; xsp = jj_scanpos; - if (jj_3R_168()) { + if (jj_3R_174()) { jj_scanpos = xsp; - if (jj_3R_169()) { + if (jj_3R_175()) { jj_scanpos = xsp; - if (jj_3R_170()) { + if (jj_3R_176()) { jj_scanpos = xsp; - if (jj_3R_171()) { + if (jj_3R_177()) { jj_scanpos = xsp; - if (jj_3R_172()) return true; + if (jj_3R_178()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4121,116 +4423,122 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_168() { - if (jj_scan_token(BANG)) return true; + static final private boolean jj_3R_172() { + if (jj_scan_token(DECR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_148()) return true; + if (jj_3R_179()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_51() { + static final private boolean jj_3R_56() { if (jj_scan_token(OBJECT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_166() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_173()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_50() { + static final private boolean jj_3R_55() { if (jj_scan_token(INTEGER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_49() { + static final private boolean jj_3R_54() { if (jj_scan_token(INT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_48() { - if (jj_scan_token(FLOAT)) return true; + static final private boolean jj_3R_171() { + if (jj_scan_token(INCR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_179()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_165() { - if (jj_scan_token(INCR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_173()) return true; + static final private boolean jj_3R_53() { + if (jj_scan_token(FLOAT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_164() { + static final private boolean jj_3R_170() { if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_47() { + static final private boolean jj_3R_52() { if (jj_scan_token(DOUBLE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_46() { + static final private boolean jj_3R_51() { if (jj_scan_token(REAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_45() { + static final private boolean jj_3R_63() { + if (jj_scan_token(PRINT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_50() { if (jj_scan_token(BOOLEAN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_162() { - if (jj_3R_167()) return true; + static final private boolean jj_3R_168() { + if (jj_3R_173()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_44() { + static final private boolean jj_3R_49() { if (jj_scan_token(BOOL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_161() { - if (jj_3R_166()) return true; + static final private boolean jj_3R_167() { + if (jj_3R_172()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_162() { + if (jj_scan_token(REM)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_35() { + static final private boolean jj_3R_40() { Token xsp; xsp = jj_scanpos; - if (jj_3R_43()) { + if (jj_3R_48()) { jj_scanpos = xsp; - if (jj_3R_44()) { + if (jj_3R_49()) { jj_scanpos = xsp; - if (jj_3R_45()) { + if (jj_3R_50()) { jj_scanpos = xsp; - if (jj_3R_46()) { + if (jj_3R_51()) { jj_scanpos = xsp; - if (jj_3R_47()) { + if (jj_3R_52()) { jj_scanpos = xsp; - if (jj_3R_48()) { + if (jj_3R_53()) { jj_scanpos = xsp; - if (jj_3R_49()) { + if (jj_3R_54()) { jj_scanpos = xsp; - if (jj_3R_50()) { + if (jj_3R_55()) { jj_scanpos = xsp; - if (jj_3R_51()) return true; + if (jj_3R_56()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4243,40 +4551,34 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_43() { + static final private boolean jj_3R_48() { if (jj_scan_token(STRING)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_156() { - if (jj_scan_token(REM)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_160() { - if (jj_3R_165()) return true; + static final private boolean jj_3R_166() { + if (jj_3R_171()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_163() { + static final private boolean jj_3R_169() { if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_157() { + static final private boolean jj_3R_163() { Token xsp; xsp = jj_scanpos; - if (jj_3R_159()) { + if (jj_3R_165()) { jj_scanpos = xsp; - if (jj_3R_160()) { + if (jj_3R_166()) { jj_scanpos = xsp; - if (jj_3R_161()) { + if (jj_3R_167()) { jj_scanpos = xsp; - if (jj_3R_162()) return true; + if (jj_3R_168()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4284,237 +4586,320 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_159() { + static final private boolean jj_3R_165() { Token xsp; xsp = jj_scanpos; - if (jj_3R_163()) { + if (jj_3R_169()) { jj_scanpos = xsp; - if (jj_3R_164()) return true; + if (jj_3R_170()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_148()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_58() { - if (jj_scan_token(PRINT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_36()) return true; + if (jj_3R_154()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_158() { + static final private boolean jj_3R_164() { if (jj_scan_token(AT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_153() { + static final private boolean jj_3R_159() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_158()) { jj_scanpos = xsp; break; } + if (jj_3R_164()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } - if (jj_3R_157()) return true; + if (jj_3R_163()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_155() { + static final private boolean jj_3R_161() { if (jj_scan_token(SLASH)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_148() { + static final private boolean jj_3R_154() { Token xsp; xsp = jj_scanpos; - if (jj_3R_152()) { + if (jj_3R_158()) { jj_scanpos = xsp; - if (jj_3R_153()) return true; + if (jj_3R_159()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_152() { + static final private boolean jj_3R_158() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_157()) return true; + if (jj_3R_163()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_147() { + static final private boolean jj_3R_153() { if (jj_scan_token(RUNSIGNEDSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_151() { + static final private boolean jj_3R_157() { if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_154() { + static final private boolean jj_3R_160() { if (jj_scan_token(STAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_149() { + static final private boolean jj_3R_155() { Token xsp; xsp = jj_scanpos; - if (jj_3R_154()) { + if (jj_3R_160()) { jj_scanpos = xsp; - if (jj_3R_155()) { + if (jj_3R_161()) { jj_scanpos = xsp; - if (jj_3R_156()) return true; + if (jj_3R_162()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_148()) return true; + if (jj_3R_154()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_142() { + static final private boolean jj_3R_148() { if (jj_scan_token(GE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_143() { - if (jj_3R_148()) return true; + static final private boolean jj_3R_149() { + if (jj_3R_154()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_149()) { jj_scanpos = xsp; break; } + if (jj_3R_155()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_146() { + static final private boolean jj_3R_152() { if (jj_scan_token(RSIGNEDSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_150() { + static final private boolean jj_3R_156() { if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_144() { + static final private boolean jj_3R_150() { Token xsp; xsp = jj_scanpos; - if (jj_3R_150()) { + if (jj_3R_156()) { jj_scanpos = xsp; - if (jj_3R_151()) return true; + if (jj_3R_157()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_143()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_141() { + static final private boolean jj_3R_147() { if (jj_scan_token(LE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_137() { - if (jj_3R_143()) return true; + static final private boolean jj_3R_143() { + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_144()) { jj_scanpos = xsp; break; } + if (jj_3R_150()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_145() { + static final private boolean jj_3R_151() { if (jj_scan_token(LSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_2() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_34()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_138() { + static final private boolean jj_3R_144() { Token xsp; xsp = jj_scanpos; - if (jj_3R_145()) { + if (jj_3R_151()) { jj_scanpos = xsp; - if (jj_3R_146()) { + if (jj_3R_152()) { jj_scanpos = xsp; - if (jj_3R_147()) return true; + if (jj_3R_153()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_137()) return true; + if (jj_3R_143()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_140() { + static final private boolean jj_3R_146() { if (jj_scan_token(GT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_121() { - if (jj_3R_34()) return true; + static final private boolean jj_3R_136() { + if (jj_3R_143()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_2()) { jj_scanpos = xsp; break; } + if (jj_3R_144()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_131() { - if (jj_3R_137()) return true; + static final private boolean jj_3_2() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_39()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_126() { + if (jj_3R_39()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_138()) { jj_scanpos = xsp; break; } + if (jj_3_2()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_103() { + static final private boolean jj_3R_108() { if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_101() { + static final private boolean jj_3R_106() { if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } + static final private boolean jj_3R_43() { + if (jj_scan_token(135)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_145() { + if (jj_scan_token(LT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_119() { + if (jj_scan_token(LPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_126()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_137() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_145()) { + jj_scanpos = xsp; + if (jj_3R_146()) { + jj_scanpos = xsp; + if (jj_3R_147()) { + jj_scanpos = xsp; + if (jj_3R_148()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_136()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_134() { + if (jj_3R_136()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_137()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + static final private boolean jj_3_6() { + if (jj_3R_44()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_133() { + if (jj_scan_token(ARRAYASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_42() { + if (jj_scan_token(SEMICOLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_39() { + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_133()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3_7() { + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static private boolean jj_initialized_once = false; static public PHPParserTokenManager token_source; static SimpleCharStream jj_input_stream; @@ -4525,7 +4910,7 @@ StringBuffer buff = new StringBuffer(); static public boolean lookingAhead = false; static private boolean jj_semLA; static private int jj_gen; - static final private int[] jj_la1 = new int[102]; + static final private int[] jj_la1 = new int[110]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -4539,19 +4924,19 @@ StringBuffer buff = new StringBuffer(); jj_la1_4(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0x2,0xff960000,0x0,0xc0000,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0xfe900000,0x0,0x0,0x0,0x0,0x3c000000,0x0,0x0,0x0,0x0,0x0,0x0,0xff960000,0xff960000,0x0,0x0,0x0,0x800000,0x0,0xff960000,0x0,0x200000,0x400000,0xff900000,0x0,0xff900000,0x0,0x0,0x800000,0x1800000,0x800000,0x800000,0x0,0x0,0x0,0x1800000,}; + jj_la1_0 = new int[] {0x2,0xff960000,0x0,0xc0000,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0xfe900000,0x0,0x0,0x0,0x0,0x3c000000,0x0,0x0,0x0,0x0,0x0,0x0,0xff960000,0xff960000,0x0,0x0,0x0,0x800000,0x0,0xff960000,0x0,0xff900000,0x200000,0x400000,0x200000,0x400000,0xff900000,0xff900000,0xff900000,0xff900000,0x0,0xff900000,0x0,0x0,0x800000,0x1800000,0x800000,0xff900000,0xff900000,0x800000,0x0,0x0,0x0,0x1800000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x0,0x5aed48,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84400,0x4,0x86400,0x0,0x0,0x0,0x0,0xff000000,0x0,0x86400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x86400,0x0,0x86400,0x0,0x86400,0x0,0x0,0x1,0x1,0x2000,0x2000,0x0,0x1,0x86400,0x1,0x84400,0x80400,0x86400,0x0,0x0,0x0,0x52a948,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5aed48,0x5aed48,0x0,0x0,0x0,0x2000,0x90,0x5aed48,0x90,0x0,0x0,0x5aed48,0x0,0x5aed48,0x0,0x4,0x2000,0x86400,0x2000,0x2000,0x0,0x0,0x0,0x86400,}; + jj_la1_1 = new int[] {0x0,0x11aed48,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84400,0x4,0x86400,0x0,0x0,0x0,0x0,0xfc000000,0x0,0x86400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x86400,0x0,0x86400,0x0,0x86400,0x0,0x0,0x1,0x1,0x2000,0x2000,0x0,0x1,0x86400,0x1,0x84400,0x80400,0x86400,0x0,0x0,0x0,0x112a948,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11aed48,0x11aed48,0x0,0x0,0x0,0x2000,0x90,0x11aed48,0x90,0x11aed48,0x0,0x0,0x0,0x0,0x11aed48,0x11aed48,0x11aed48,0x11aed48,0x0,0x11aed48,0x0,0x4,0x2000,0x86400,0x2000,0x11aed48,0x11aed48,0x2000,0x0,0x0,0x0,0x86400,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x0,0x8c8a2288,0x0,0x0,0x0,0x1000000,0x10000000,0x80000,0x8000000,0x80000,0x8082000,0x8082000,0x88,0x88,0x2288,0x0,0x8c022288,0x0,0x1000000,0x8000000,0x0,0x1,0x10000000,0x8c022288,0x10000000,0x0,0x2,0x2,0x4,0x4,0x2000000,0x0,0x0,0x0,0x0,0x0,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x8c022288,0x0,0x88022288,0x80000000,0x8022288,0x0,0x0,0x220000,0x220000,0x8002000,0x8002000,0x8002000,0x220000,0x8c022288,0x200000,0x288,0x0,0x8c022288,0x1000000,0x800000,0x4000000,0xc882000,0x800000,0x800000,0x800000,0x800000,0x0,0x1000000,0x800000,0x1000000,0x800000,0x1000000,0x800000,0x8c8a2288,0x8c8a2288,0x1000000,0x10000000,0x10000000,0x8002000,0x0,0x8c8a2288,0x0,0x0,0x0,0x8c8a2288,0x800000,0x8c8a2288,0x800000,0x0,0x8002000,0x8c022288,0x8002000,0x8002000,0x1000000,0x2000,0x2000,0x8c022288,}; + jj_la1_2 = new int[] {0x0,0x32288a20,0x0,0x0,0x0,0x4000000,0x40000000,0x200000,0x20000000,0x200000,0x20208000,0x20208000,0x220,0x220,0x8a20,0x0,0x30088a20,0x0,0x4000000,0x20000000,0x0,0x7,0x40000000,0x30088a20,0x40000000,0x0,0x8,0x8,0x10,0x10,0x8000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x30088a20,0x0,0x20088a20,0x0,0x20088a20,0x0,0x0,0x880000,0x880000,0x20008000,0x20008000,0x20008000,0x880000,0x30088a20,0x800000,0xa20,0x0,0x30088a20,0x4000000,0x2000000,0x10000000,0x32208000,0x2000000,0x2000000,0x2000000,0x2000000,0x0,0x4000000,0x2000000,0x4000000,0x2000000,0x4000000,0x2000000,0x32288a20,0x32288a20,0x4000000,0x40000000,0x40000000,0x20008000,0x0,0x32288a20,0x0,0x32288a20,0x0,0x0,0x0,0x0,0x32288a20,0x32288a20,0x32288a20,0x32288a20,0x2000000,0x32288a20,0x2000000,0x0,0x20008000,0x30088a20,0x20008000,0x32288a20,0x32288a20,0x20008000,0x4000000,0x8000,0x8000,0x30088a20,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x0,0x4f00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc00,0x0,0x4f00,0x4000,0x0,0x4000,0x4000,0x0,0xffe00000,0x4f00,0xffe00000,0x1,0x40,0x40,0x80,0x80,0x0,0x8000,0x10000,0x4000,0x24,0x24,0x18,0x18,0x1c0000,0x1c0000,0xc00,0xc00,0x23000,0x23000,0x0,0x4f00,0xc00,0xf00,0x0,0x0,0x300,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x4f00,0x0,0x0,0x0,0x4f00,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4f00,0x4f00,0x0,0xffe00300,0xffe00300,0x300,0x0,0x4f00,0x0,0x0,0x0,0x4f00,0x0,0x4f02,0x0,0x0,0x300,0x4f00,0x300,0x300,0x0,0x0,0x0,0x4f00,}; + jj_la1_3 = new int[] {0x0,0x27802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x27802,0x20000,0x0,0x20000,0x20000,0x0,0xff000000,0x27802,0xff000000,0x4,0x200,0x200,0x400,0x400,0x0,0x40000,0x80000,0x20000,0x190,0x190,0x61,0x61,0xe00000,0xe00000,0x6000,0x6000,0x118000,0x118000,0x0,0x27802,0x6000,0x7802,0x2,0x0,0x1800,0x1800,0x0,0x0,0x0,0x0,0x0,0x0,0x27802,0x0,0x0,0x0,0x27802,0x0,0x0,0x0,0x1800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x27802,0x27802,0x0,0xff001800,0xff001800,0x1800,0x0,0x27802,0x0,0x27802,0x0,0x0,0x0,0x0,0x2780a,0x27802,0x27802,0x27802,0x0,0x2780a,0x0,0x0,0x1800,0x27802,0x1800,0x27802,0x2780a,0x1800,0x0,0x0,0x0,0x27802,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x0,0x0,0x4,0x8,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x8,0x8,0x8,0x0,0x8,0x0,0x0,0x0,0x8,0x0,0x10,0x0,0x8,0x10,0x10,0x10,0x10,0x0,0x0,0x10,0x0,0x10,0x0,0x10,0x8,0x8,0x0,0x4,0x4,0x8,0x0,0x8,0x0,0x0,0x0,0x8,0x10,0x8,0x10,0x0,0x8,0x8,0x8,0x8,0x0,0x0,0x0,0x8,}; + jj_la1_4 = new int[] {0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x0,0x27,0x40,0x27,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40,0x40,0x0,0x40,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x40,0x80,0x80,0x80,0x80,0x0,0x0,0x80,0x0,0x80,0x0,0x80,0x40,0x40,0x0,0x27,0x27,0x40,0x0,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40,0x40,0x40,0x80,0x40,0x80,0x0,0x40,0x40,0x40,0x40,0x40,0x40,0x0,0x0,0x0,0x40,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[7]; static private boolean jj_rescan = false; @@ -4570,7 +4955,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; i++) jj_la1[i] = -1; + for (int i = 0; i < 110; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4580,7 +4965,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; i++) jj_la1[i] = -1; + for (int i = 0; i < 110; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4597,7 +4982,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; i++) jj_la1[i] = -1; + for (int i = 0; i < 110; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4607,7 +4992,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; i++) jj_la1[i] = -1; + for (int i = 0; i < 110; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4623,7 +5008,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; i++) jj_la1[i] = -1; + for (int i = 0; i < 110; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4632,7 +5017,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; i++) jj_la1[i] = -1; + for (int i = 0; i < 110; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4739,15 +5124,15 @@ StringBuffer buff = new StringBuffer(); static public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[133]; - for (int i = 0; i < 133; i++) { + boolean[] la1tokens = new boolean[136]; + for (int i = 0; i < 136; i++) { la1tokens[i] = false; } if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 102; i++) { + for (int i = 0; i < 110; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< | < WHILE: "while" > | < ENDWHILE : "endwhile" > +| +| | | } @@ -487,6 +493,7 @@ MORE : | =" > | " > | | | @@ -566,13 +573,17 @@ void ClassDeclaration() : { className = [ ] { - classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); - currentSegment.add(classDeclaration); - currentSegment = classDeclaration; + if (currentSegment != null) { + classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); + currentSegment.add(classDeclaration); + currentSegment = classDeclaration; + } } ClassBody() { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + } } } @@ -610,10 +621,18 @@ void FieldDeclaration() : } { variableDeclaration = VariableDeclarator() - {currentSegment.add(variableDeclaration);} + { + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } + } ( - variableDeclaration = VariableDeclarator() - {currentSegment.add(variableDeclaration);} + variableDeclaration = VariableDeclarator() + { + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } + } )* try { @@ -777,12 +796,16 @@ void MethodDeclaration() : { functionDeclaration = MethodDeclarator() { - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; + if (currentSegment != null) { + currentSegment.add(functionDeclaration); + currentSegment = functionDeclaration; + } } Block() { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + } } } @@ -1111,6 +1134,7 @@ String EqualityExpression() : {buff.append(expr);} ( ( operator = + | operator = | operator = | operator = | operator = @@ -1562,7 +1586,11 @@ void IncludeStatement() : { expr = Expression() - {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr));} + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); + } + } try { ( | "?>") } catch (ParseException e) { @@ -1573,7 +1601,11 @@ void IncludeStatement() : | expr = Expression() - {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr));} + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr)); + } + } try { ( | "?>") } catch (ParseException e) { @@ -1584,7 +1616,11 @@ void IncludeStatement() : | expr = Expression() - {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr));} + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); + } + } try { ( | "?>") } catch (ParseException e) { @@ -1595,7 +1631,11 @@ void IncludeStatement() : | expr = Expression() - {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr));} + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr)); + } + } try { ( | "?>") } catch (ParseException e) { @@ -1740,7 +1780,7 @@ void IfStatement() : */ {} { - Condition("if") Statement() ( LOOKAHEAD(1) ElseIfStatement() )* [ LOOKAHEAD(1) Statement() ] + Condition("if") IfStatement0() } void Condition(String keyword) : @@ -1763,6 +1803,39 @@ void Condition(String keyword) : } } +void IfStatement0() : +{} +{ + (Statement())* (ElseIfStatementColon())* [ElseStatementColon()] + try { + + } catch (ParseException e) { + errorMessage = "';' expected 'endif' keyword"; + errorLevel = ERROR; + throw e; + } +| + Statement() ( LOOKAHEAD(1) ElseIfStatement() )* [ LOOKAHEAD(1) Statement() ] +} + +void ElseIfStatementColon() : +{} +{ + Condition("elseif") (Statement())* +} + +void ElseStatement() : +{} +{ + Statement() +} + +void ElseStatementColon() : +{} +{ + (Statement())* +} + void ElseIfStatement() : {} { @@ -1782,7 +1855,7 @@ void WhileStatement0() : try { ( | "?>") } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "';' expected after 'endwhile' keyword"; errorLevel = ERROR; throw e; } @@ -1812,7 +1885,19 @@ void ForeachStatement() : void ForStatement() : {} { - [ ForInit() ] [ Expression() ] [ ForUpdate() ] Statement() + [ ForInit() ] [ Expression() ] [ ForUpdate() ] + ( + Statement() + | + (Statement())* + try { + + } catch (ParseException e) { + errorMessage = "';' expected 'endfor' keyword"; + errorLevel = ERROR; + throw e; + } + ) } void ForInit() : diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java index 1d8793c..8248034 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java @@ -47,84 +47,87 @@ public interface PHPParserConstants { int TRUE = 51; int WHILE = 52; int ENDWHILE = 53; - int FOREACH = 54; - int AS = 55; - int STRING = 56; - int OBJECT = 57; - int BOOL = 58; - int BOOLEAN = 59; - int REAL = 60; - int DOUBLE = 61; - int FLOAT = 62; - int INT = 63; - int INTEGER = 64; - int _ORL = 65; - int _ANDL = 66; - int INTEGER_LITERAL = 67; - int DECIMAL_LITERAL = 68; - int HEX_LITERAL = 69; - int OCTAL_LITERAL = 70; - int FLOATING_POINT_LITERAL = 71; - int EXPONENT = 72; - int STRING_LITERAL = 73; - int STRING_1 = 74; - int STRING_2 = 75; - int STRING_3 = 76; - int IDENTIFIER = 77; - int LETTER = 78; - int DIGIT = 79; - int SPECIAL = 80; - int LPAREN = 81; - int RPAREN = 82; - int LBRACE = 83; - int RBRACE = 84; - int LBRACKET = 85; - int RBRACKET = 86; - int SEMICOLON = 87; - int COMMA = 88; - int DOT = 89; - int AT = 90; - int DOLLAR = 91; - int ASSIGN = 92; - int GT = 93; - int LT = 94; - int BANG = 95; - int HOOK = 96; - int COLON = 97; - int EQ = 98; - int LE = 99; - int GE = 100; - int NE = 101; - int SC_OR = 102; - int SC_AND = 103; - int INCR = 104; - int DECR = 105; - int PLUS = 106; - int MINUS = 107; - int STAR = 108; - int SLASH = 109; - int BIT_AND = 110; - int BIT_OR = 111; - int XOR = 112; - int REM = 113; - int LSHIFT = 114; - int RSIGNEDSHIFT = 115; - int RUNSIGNEDSHIFT = 116; - int PLUSASSIGN = 117; - int MINUSASSIGN = 118; - int STARASSIGN = 119; - int SLASHASSIGN = 120; - int ANDASSIGN = 121; - int ORASSIGN = 122; - int XORASSIGN = 123; - int DOTASSIGN = 124; - int REMASSIGN = 125; - int LSHIFTASSIGN = 126; - int RSIGNEDSHIFTASSIGN = 127; - int BANGDOUBLEEQUAL = 128; - int TRIPLEEQUAL = 129; - int TILDEEQUAL = 130; - int DOLLAR_ID = 131; + int ENDIF = 54; + int ENDFOR = 55; + int FOREACH = 56; + int AS = 57; + int STRING = 58; + int OBJECT = 59; + int BOOL = 60; + int BOOLEAN = 61; + int REAL = 62; + int DOUBLE = 63; + int FLOAT = 64; + int INT = 65; + int INTEGER = 66; + int _ORL = 67; + int _ANDL = 68; + int INTEGER_LITERAL = 69; + int DECIMAL_LITERAL = 70; + int HEX_LITERAL = 71; + int OCTAL_LITERAL = 72; + int FLOATING_POINT_LITERAL = 73; + int EXPONENT = 74; + int STRING_LITERAL = 75; + int STRING_1 = 76; + int STRING_2 = 77; + int STRING_3 = 78; + int IDENTIFIER = 79; + int LETTER = 80; + int DIGIT = 81; + int SPECIAL = 82; + int LPAREN = 83; + int RPAREN = 84; + int LBRACE = 85; + int RBRACE = 86; + int LBRACKET = 87; + int RBRACKET = 88; + int SEMICOLON = 89; + int COMMA = 90; + int DOT = 91; + int AT = 92; + int DOLLAR = 93; + int ASSIGN = 94; + int GT = 95; + int LT = 96; + int BANG = 97; + int HOOK = 98; + int COLON = 99; + int EQ = 100; + int LE = 101; + int GE = 102; + int NE = 103; + int DIF = 104; + int SC_OR = 105; + int SC_AND = 106; + int INCR = 107; + int DECR = 108; + int PLUS = 109; + int MINUS = 110; + int STAR = 111; + int SLASH = 112; + int BIT_AND = 113; + int BIT_OR = 114; + int XOR = 115; + int REM = 116; + int LSHIFT = 117; + int RSIGNEDSHIFT = 118; + int RUNSIGNEDSHIFT = 119; + int PLUSASSIGN = 120; + int MINUSASSIGN = 121; + int STARASSIGN = 122; + int SLASHASSIGN = 123; + int ANDASSIGN = 124; + int ORASSIGN = 125; + int XORASSIGN = 126; + int DOTASSIGN = 127; + int REMASSIGN = 128; + int LSHIFTASSIGN = 129; + int RSIGNEDSHIFTASSIGN = 130; + int BANGDOUBLEEQUAL = 131; + int TRIPLEEQUAL = 132; + int TILDEEQUAL = 133; + int DOLLAR_ID = 134; int DEFAULT = 0; int PHPPARSING = 1; @@ -187,6 +190,8 @@ public interface PHPParserConstants { "\"true\"", "\"while\"", "\"endwhile\"", + "\"endif\"", + "\"endfor\"", "\"foreach\"", "\"as\"", "\"string\"", @@ -235,6 +240,7 @@ public interface PHPParserConstants { "\"<=\"", "\">=\"", "\"!=\"", + "\"<>\"", "\"||\"", "\"&&\"", "\"++\"", diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index f207bee..5555d08 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -52,7 +52,7 @@ static private final int jjMoveStringLiteralDfa0_0() switch(curChar) { case 63: - return jjMoveStringLiteralDfa1_0(0x10L); + return jjMoveStringLiteralDfa1_0(0x80L); default : return jjMoveNfa_0(0, 0); } @@ -67,8 +67,8 @@ static private final int jjMoveStringLiteralDfa1_0(long active2) switch(curChar) { case 62: - if ((active2 & 0x10L) != 0L) - return jjStopAtPos(1, 132); + if ((active2 & 0x80L) != 0L) + return jjStopAtPos(1, 135); break; default : break; @@ -344,106 +344,106 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0xfffffff8fffe0000L) != 0L || (active1 & 0x7L) != 0L) - { - jjmatchedKind = 77; - return 14; - } - if ((active0 & 0xa00L) != 0L || (active1 & 0x100200000000000L) != 0L) + if ((active0 & 0xa00L) != 0L || (active1 & 0x801000000000000L) != 0L) return 2; - if ((active1 & 0x8000000L) != 0L) + if ((active1 & 0x20000000L) != 0L) return 16; - if ((active1 & 0x1000000002000000L) != 0L) + if ((active1 & 0x8000000008000000L) != 0L) return 8; + if ((active0 & 0xfffffff8fffe0000L) != 0L || (active1 & 0x1fL) != 0L) + { + jjmatchedKind = 79; + return 14; + } return -1; case 1: if ((active0 & 0x800L) != 0L) return 0; - if ((active0 & 0x2080010000100000L) != 0L || (active1 & 0x2L) != 0L) - return 14; - if ((active0 & 0xdf7ffef8ffee0000L) != 0L || (active1 & 0x5L) != 0L) + if ((active0 & 0x7dfffef8ffee0000L) != 0L || (active1 & 0x17L) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 1; } return 14; } + if ((active0 & 0x8200010000100000L) != 0L || (active1 & 0x8L) != 0L) + return 14; return -1; case 2: - if ((active0 & 0x8040280000080000L) != 0L || (active1 & 0x5L) != 0L) + if ((active0 & 0x100280000080000L) != 0L || (active1 & 0x16L) != 0L) return 14; - if ((active0 & 0x7f3fd6f8ffe60000L) != 0L) + if ((active0 & 0xfcffd6f8ffe60000L) != 0L || (active1 & 0x1L) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0x1c0c501002600000L) != 0L) + if ((active0 & 0x700c501002600000L) != 0L) return 14; - if ((active0 & 0x637386e8fd860000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0x8df386e8fd860000L) != 0L || (active1 & 0x5L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0x2b6282c0fc240000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0xada282c0fc240000L) != 0L || (active1 & 0x4L) != 0L) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 4; return 14; } - if ((active0 & 0x4011042801820000L) != 0L) + if ((active0 & 0x51042801820000L) != 0L || (active1 & 0x1L) != 0L) return 14; return -1; case 5: - if ((active0 & 0x23028000c0200000L) != 0L) + if ((active0 & 0x8c828000c0200000L) != 0L) return 14; - if ((active0 & 0x86002c03c040000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0x212002c03c040000L) != 0L || (active1 & 0x4L) != 0L) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x84002803c000000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0x210002803c000000L) != 0L || (active1 & 0x4L) != 0L) return 14; if ((active0 & 0x20004000040000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 6; } return 14; } return -1; case 7: + if ((active0 & 0x20004000040000L) != 0L) + return 14; if ((active0 & 0x30000000L) != 0L) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 7; return 14; } - if ((active0 & 0x20004000040000L) != 0L) - return 14; return -1; case 8: if ((active0 & 0x30000000L) != 0L) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 8; return 14; } @@ -451,7 +451,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac case 9: if ((active0 & 0x30000000L) != 0L) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 9; return 14; } @@ -459,7 +459,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac case 10: if ((active0 & 0x30000000L) != 0L) { - jjmatchedKind = 77; + jjmatchedKind = 79; jjmatchedPos = 10; return 14; } @@ -485,102 +485,102 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 95; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000L, 0x1L); + jjmatchedKind = 97; + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000L, 0x8L); case 36: - return jjStartNfaWithStates_1(0, 91, 16); + return jjStartNfaWithStates_1(0, 93, 16); case 37: - jjmatchedKind = 113; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000000L, 0x0L); + jjmatchedKind = 116; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x1L); case 38: - jjmatchedKind = 110; - return jjMoveStringLiteralDfa1_1(0x0L, 0x200008000000000L, 0x0L); + jjmatchedKind = 113; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1000040000000000L, 0x0L); case 40: - return jjStopAtPos(0, 81); + return jjStopAtPos(0, 83); case 41: - return jjStopAtPos(0, 82); + return jjStopAtPos(0, 84); case 42: - jjmatchedKind = 108; - return jjMoveStringLiteralDfa1_1(0x0L, 0x80000000000000L, 0x0L); + jjmatchedKind = 111; + return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000000L, 0x0L); case 43: - jjmatchedKind = 106; - return jjMoveStringLiteralDfa1_1(0x0L, 0x20010000000000L, 0x0L); + jjmatchedKind = 109; + return jjMoveStringLiteralDfa1_1(0x0L, 0x100080000000000L, 0x0L); case 44: - return jjStopAtPos(0, 88); + return jjStopAtPos(0, 90); case 45: - jjmatchedKind = 107; - return jjMoveStringLiteralDfa1_1(0x100000000L, 0x40020000000000L, 0x0L); + jjmatchedKind = 110; + return jjMoveStringLiteralDfa1_1(0x100000000L, 0x200100000000000L, 0x0L); case 46: - jjmatchedKind = 89; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000000L, 0x0L); + jjmatchedKind = 91; + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000000L, 0x0L); case 47: - jjmatchedKind = 109; - return jjMoveStringLiteralDfa1_1(0xa00L, 0x100000000000000L, 0x0L); + jjmatchedKind = 112; + return jjMoveStringLiteralDfa1_1(0xa00L, 0x800000000000000L, 0x0L); case 58: - jjmatchedKind = 97; + jjmatchedKind = 99; return jjMoveStringLiteralDfa1_1(0x200000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 87); + return jjStopAtPos(0, 89); case 60: - jjmatchedKind = 94; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4004000800000000L, 0x0L); + jjmatchedKind = 96; + return jjMoveStringLiteralDfa1_1(0x0L, 0x20012000000000L, 0x2L); case 61: - jjmatchedKind = 92; - return jjMoveStringLiteralDfa1_1(0x400000000L, 0x400000000L, 0x2L); + jjmatchedKind = 94; + return jjMoveStringLiteralDfa1_1(0x400000000L, 0x1000000000L, 0x10L); case 62: - jjmatchedKind = 93; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8018001000000000L, 0x0L); + jjmatchedKind = 95; + return jjMoveStringLiteralDfa1_1(0x0L, 0xc0004000000000L, 0x4L); case 63: - jjmatchedKind = 96; + jjmatchedKind = 98; return jjMoveStringLiteralDfa1_1(0x4L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 90); + return jjStopAtPos(0, 92); case 91: - return jjStopAtPos(0, 85); + return jjStopAtPos(0, 87); case 93: - return jjStopAtPos(0, 86); + return jjStopAtPos(0, 88); case 94: - jjmatchedKind = 112; - return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000000L, 0x0L); + jjmatchedKind = 115; + return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000000L, 0x0L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x80000000800000L, 0x4L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200000000800000L, 0x10L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0xc00000800000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x3000000800000000L, 0x0L, 0x0L); case 67: case 99: return jjMoveStringLiteralDfa1_1(0x7000020000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x2000018000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000018000000000L, 0x0L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x20020002600000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xe0020002600000L, 0x0L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x40400c0000040000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1000c0000040000L, 0x1L, 0x0L); case 71: case 103: return jjMoveStringLiteralDfa1_1(0x100040000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x8000000014100000L, 0x1L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x14100000L, 0x6L, 0x0L); case 78: case 110: return jjMoveStringLiteralDfa1_1(0x600000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x200000000000000L, 0x2L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800000000000000L, 0x8L, 0x0L); case 80: case 112: return jjMoveStringLiteralDfa1_1(0x1000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x1000800028000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4000800028000000L, 0x0L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x103000080000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x403000080000000L, 0x0L, 0x0L); case 84: case 116: return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L, 0x0L); @@ -591,14 +591,14 @@ static private final int jjMoveStringLiteralDfa0_1() case 119: return jjMoveStringLiteralDfa1_1(0x10000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 83); + return jjStopAtPos(0, 85); case 124: - jjmatchedKind = 111; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400004000000000L, 0x0L); + jjmatchedKind = 114; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000020000000000L, 0x0L); case 125: - return jjStopAtPos(0, 84); + return jjStopAtPos(0, 86); case 126: - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x20L); default : return jjMoveNfa_1(3, 0); } @@ -613,20 +613,20 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x8000000000L) != 0L) - return jjStopAtPos(1, 103); + if ((active1 & 0x40000000000L) != 0L) + return jjStopAtPos(1, 106); break; case 42: if ((active0 & 0x800L) != 0L) return jjStartNfaWithStates_1(1, 11, 0); break; case 43: - if ((active1 & 0x10000000000L) != 0L) - return jjStopAtPos(1, 104); + if ((active1 & 0x80000000000L) != 0L) + return jjStopAtPos(1, 107); break; case 45: - if ((active1 & 0x20000000000L) != 0L) - return jjStopAtPos(1, 105); + if ((active1 & 0x100000000000L) != 0L) + return jjStopAtPos(1, 108); break; case 47: if ((active0 & 0x200L) != 0L) @@ -637,33 +637,27 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 33); break; case 60: - if ((active1 & 0x4000000000000L) != 0L) + if ((active1 & 0x20000000000000L) != 0L) { - jjmatchedKind = 114; + jjmatchedKind = 117; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x4000000000000000L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x2L); case 61: - if ((active1 & 0x400000000L) != 0L) + if ((active1 & 0x1000000000L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 100; jjmatchedPos = 1; } - else if ((active1 & 0x800000000L) != 0L) - return jjStopAtPos(1, 99); - else if ((active1 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 100); else if ((active1 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 101); + else if ((active1 & 0x4000000000L) != 0L) + return jjStopAtPos(1, 102); + else if ((active1 & 0x8000000000L) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 103; jjmatchedPos = 1; } - else if ((active1 & 0x20000000000000L) != 0L) - return jjStopAtPos(1, 117); - else if ((active1 & 0x40000000000000L) != 0L) - return jjStopAtPos(1, 118); - else if ((active1 & 0x80000000000000L) != 0L) - return jjStopAtPos(1, 119); else if ((active1 & 0x100000000000000L) != 0L) return jjStopAtPos(1, 120); else if ((active1 & 0x200000000000000L) != 0L) @@ -676,9 +670,15 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 124); else if ((active1 & 0x2000000000000000L) != 0L) return jjStopAtPos(1, 125); - else if ((active2 & 0x4L) != 0L) - return jjStopAtPos(1, 130); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x3L); + else if ((active1 & 0x4000000000000000L) != 0L) + return jjStopAtPos(1, 126); + else if ((active1 & 0x8000000000000000L) != 0L) + return jjStopAtPos(1, 127); + else if ((active2 & 0x1L) != 0L) + return jjStopAtPos(1, 128); + else if ((active2 & 0x20L) != 0L) + return jjStopAtPos(1, 133); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x18L); case 62: if ((active0 & 0x4L) != 0L) return jjStopAtPos(1, 2); @@ -686,24 +686,26 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 32); else if ((active0 & 0x400000000L) != 0L) return jjStopAtPos(1, 34); - else if ((active1 & 0x8000000000000L) != 0L) + else if ((active1 & 0x10000000000L) != 0L) + return jjStopAtPos(1, 104); + else if ((active1 & 0x40000000000000L) != 0L) { - jjmatchedKind = 115; + jjmatchedKind = 118; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x8010000000000000L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x80000000000000L, active2, 0x4L); case 65: case 97: return jjMoveStringLiteralDfa2_1(active0, 0x41000080000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0x200000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x800000000000000L, active1, 0L, active2, 0L); case 67: case 99: return jjMoveStringLiteralDfa2_1(active0, 0x2000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x1000a08028000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x4000a08028000000L, active1, 0L, active2, 0L); case 70: case 102: if ((active0 & 0x100000L) != 0L) @@ -714,10 +716,10 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjMoveStringLiteralDfa2_1(active0, 0x14000000000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x4000000040620000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40620000L, active1, 0x1L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x8020000014000000L, active1, 0x5L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xe0000014000000L, active1, 0x16L, active2, 0L); case 79: case 111: if ((active0 & 0x10000000000L) != 0L) @@ -725,20 +727,20 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l jjmatchedKind = 40; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0x2c40186000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xb100186000000000L, active1, 0L, active2, 0L); case 82: case 114: - if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_1(1, 65, 14); + if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_1(1, 67, 14); return jjMoveStringLiteralDfa2_1(active0, 0x8000801800000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 55, 14); + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(1, 57, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x100000080000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x400000080000000L, active1, 0L, active2, 0L); case 85: case 117: return jjMoveStringLiteralDfa2_1(active0, 0x1400000040000L, active1, 0L, active2, 0L); @@ -749,8 +751,8 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l case 120: return jjMoveStringLiteralDfa2_1(active0, 0x20000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 102); + if ((active1 & 0x20000000000L) != 0L) + return jjStopAtPos(1, 105); break; default : break; @@ -769,30 +771,30 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x4000000000000000L) != 0L) - return jjStopAtPos(2, 126); - else if ((active1 & 0x8000000000000000L) != 0L) - return jjStopAtPos(2, 127); - else if ((active2 & 0x1L) != 0L) - return jjStopAtPos(2, 128); - else if ((active2 & 0x2L) != 0L) + if ((active2 & 0x2L) != 0L) return jjStopAtPos(2, 129); + else if ((active2 & 0x4L) != 0L) + return jjStopAtPos(2, 130); + else if ((active2 & 0x8L) != 0L) + return jjStopAtPos(2, 131); + else if ((active2 & 0x10L) != 0L) + return jjStopAtPos(2, 132); break; case 62: - if ((active1 & 0x10000000000000L) != 0L) - return jjStopAtPos(2, 116); + if ((active1 & 0x80000000000000L) != 0L) + return jjStopAtPos(2, 119); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x1000000080020000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000080020000L, active1, 0L, active2, 0L); case 67: case 99: return jjMoveStringLiteralDfa3_1(active0, 0x14000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(2, 66, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(2, 68, 14); + return jjMoveStringLiteralDfa3_1(active0, 0xe0000000000000L, active1, 0L, active2, 0L); case 69: case 101: return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0L, active2, 0L); @@ -807,7 +809,7 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long return jjMoveStringLiteralDfa3_1(active0, 0x16000001000000L, active1, 0L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0x200000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x800000000000000L, active1, 0L, active2, 0L); case 76: case 108: return jjMoveStringLiteralDfa3_1(active0, 0x440000000000L, active1, 0L, active2, 0L); @@ -816,7 +818,7 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long return jjMoveStringLiteralDfa3_1(active0, 0x6000040000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x4c00000040000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x3000000040000000L, active1, 0x1L, active2, 0L); case 80: case 112: return jjMoveStringLiteralDfa3_1(active0, 0x1000000000000L, active1, 0L, active2, 0L); @@ -832,21 +834,21 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long jjmatchedKind = 43; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x140000000800000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x500000000800000L, active1, 0L, active2, 0L); case 83: case 115: return jjMoveStringLiteralDfa3_1(active0, 0x1000600000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active0 & 0x8000000000000000L) != 0L) + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 63; + jjmatchedKind = 65; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x920000000000L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x920000000000L, active1, 0x4L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x2008000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8008000000000000L, active1, 0L, active2, 0L); case 87: case 119: if ((active0 & 0x200000000000L) != 0L) @@ -870,10 +872,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x4000008800800000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x8800800000L, active1, 0x1L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x2000000040000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x8000000040000000L, active1, 0L); case 67: case 99: return jjMoveStringLiteralDfa4_1(active0, 0x40000L, active1, 0L); @@ -888,22 +890,25 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long return jjStartNfaWithStates_1(3, 36, 14); else if ((active0 & 0x8000000000000L) != 0L) return jjStartNfaWithStates_1(3, 51, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x241020000200000L, active1, 0x1L); + return jjMoveStringLiteralDfa4_1(active0, 0x901020000200000L, active1, 0x4L); + case 70: + case 102: + return jjMoveStringLiteralDfa4_1(active0, 0x80000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x440000000000000L, active1, 0L); case 76: case 108: if ((active0 & 0x400000000000L) != 0L) return jjStartNfaWithStates_1(3, 46, 14); - else if ((active0 & 0x400000000000000L) != 0L) + else if ((active0 & 0x1000000000000000L) != 0L) { - jjmatchedKind = 58; + jjmatchedKind = 60; jjmatchedPos = 3; } - else if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 60, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x810000014000000L, active1, 0L); + else if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 62, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x2010000014000000L, active1, 0L); case 78: case 110: return jjMoveStringLiteralDfa4_1(active0, 0x1000000L, active1, 0L); @@ -946,20 +951,25 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x40000040000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x100000040000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x202000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x802000000000000L, active1, 0L); case 69: case 101: if ((active0 & 0x40000000000L) != 0L) return jjStartNfaWithStates_1(4, 42, 14); else if ((active0 & 0x10000000000000L) != 0L) return jjStartNfaWithStates_1(4, 52, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L); + case 70: + case 102: + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 54, 14); + break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); case 72: case 104: return jjMoveStringLiteralDfa5_1(active0, 0x20000000000000L, active1, 0L); @@ -973,10 +983,13 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x100020000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x400020000000000L, active1, 0L); + case 79: + case 111: + return jjMoveStringLiteralDfa5_1(active0, 0x80000000000000L, active1, 0L); case 82: case 114: if ((active0 & 0x1000000000000L) != 0L) @@ -993,8 +1006,8 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long return jjStartNfaWithStates_1(4, 24, 14); else if ((active0 & 0x2000000000L) != 0L) return jjStartNfaWithStates_1(4, 37, 14); - else if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 62, 14); + else if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(4, 64, 14); return jjMoveStringLiteralDfa5_1(active0, 0x40000L, active1, 0L); case 85: case 117: @@ -1022,20 +1035,20 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L); case 67: case 99: if ((active0 & 0x80000000L) != 0L) return jjStartNfaWithStates_1(5, 31, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x100000000000000L, active1, 0L); case 68: case 100: return jjMoveStringLiteralDfa6_1(active0, 0x20014000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 61, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x1L); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 63, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x4L); case 70: case 102: if ((active0 & 0x200000L) != 0L) @@ -1043,8 +1056,8 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long break; case 71: case 103: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 56, 14); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 58, 14); break; case 72: case 104: @@ -1066,11 +1079,13 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L, active1, 0L); case 82: case 114: + if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 55, 14); return jjMoveStringLiteralDfa6_1(active0, 0x28000000L, active1, 0L); case 84: case 116: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 57, 14); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 59, 14); break; default : break; @@ -1103,24 +1118,24 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long return jjMoveStringLiteralDfa7_1(active0, 0x30000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 54, 14); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 56, 14); break; case 76: case 108: return jjMoveStringLiteralDfa7_1(active0, 0x20000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 59, 14); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 61, 14); break; case 79: case 111: return jjMoveStringLiteralDfa7_1(active0, 0x40000L, active1, 0L); case 82: case 114: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(6, 64, 14); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_1(6, 66, 14); break; case 83: case 115: @@ -1287,14 +1302,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 67) - kind = 67; + if (kind > 69) + kind = 69; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 67) - kind = 67; + if (kind > 69) + kind = 69; jjCheckNAddStates(21, 23); } break; @@ -1313,15 +1328,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 69) + kind = 69; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 69) + kind = 69; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1331,8 +1346,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 73) + kind = 73; jjCheckNAddStates(24, 26); break; case 10: @@ -1342,15 +1357,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 73) + kind = 73; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 77) - kind = 77; + if (kind > 79) + kind = 79; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1360,8 +1375,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 131) - kind = 131; + if (kind > 134) + kind = 134; jjstateSet[jjnewStateCnt++] = 17; break; case 18: @@ -1375,15 +1390,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 71) - kind = 71; + if (kind > 73) + kind = 73; jjCheckNAddStates(27, 29); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 73) + kind = 73; jjCheckNAddStates(27, 29); break; case 23: @@ -1393,8 +1408,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 73) + kind = 73; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1408,8 +1423,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 73) + kind = 73; jjCheckNAddTwoStates(28, 12); break; case 29: @@ -1427,22 +1442,22 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 67) - kind = 67; + if (kind > 69) + kind = 69; jjCheckNAddStates(21, 23); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 69) + kind = 69; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 69) + kind = 69; jjCheckNAddTwoStates(36, 6); break; case 37: @@ -1458,8 +1473,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(33, 35); break; case 41: - if (curChar == 34 && kind > 73) - kind = 73; + if (curChar == 34 && kind > 75) + kind = 75; break; case 42: if ((0xfffffffbffffffffL & l) != 0L) @@ -1470,8 +1485,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(36, 38); break; case 45: - if (curChar == 34 && kind > 74) - kind = 74; + if (curChar == 34 && kind > 76) + kind = 76; break; case 46: if (curChar == 39) @@ -1486,8 +1501,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(39, 41); break; case 50: - if (curChar == 39 && kind > 73) - kind = 73; + if (curChar == 39 && kind > 75) + kind = 75; break; case 51: if ((0xffffff7fffffffffL & l) != 0L) @@ -1498,8 +1513,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(42, 44); break; case 54: - if (curChar == 39 && kind > 75) - kind = 75; + if (curChar == 39 && kind > 77) + kind = 77; break; case 56: jjAddStates(45, 47); @@ -1521,8 +1536,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 77) - kind = 77; + if (kind > 79) + kind = 79; jjCheckNAdd(14); } else if (curChar == 96) @@ -1533,31 +1548,31 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 10; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 67) - kind = 67; + if ((0x100000001000L & l) != 0L && kind > 69) + kind = 69; break; case 9: if ((0x2000000020L & l) != 0L) jjAddStates(57, 58); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 71) - kind = 71; + if ((0x5000000050L & l) != 0L && kind > 73) + kind = 73; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 77) - kind = 77; + if (kind > 79) + kind = 79; jjCheckNAdd(14); break; case 16: case 17: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 131) - kind = 131; + if (kind > 134) + kind = 134; jjCheckNAdd(17); break; case 22: @@ -1579,8 +1594,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 67) - kind = 67; + if (kind > 69) + kind = 69; jjCheckNAddTwoStates(35, 6); break; case 38: @@ -1628,8 +1643,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 57; break; case 59: - if (curChar == 96 && kind > 73) - kind = 73; + if (curChar == 96 && kind > 75) + kind = 75; break; case 60: if ((0xfffffffeffffffffL & l) != 0L) @@ -1644,8 +1659,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 61; break; case 63: - if (curChar == 96 && kind > 76) - kind = 76; + if (curChar == 96 && kind > 78) + kind = 78; break; default : break; } @@ -1663,8 +1678,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 77) - kind = 77; + if (kind > 79) + kind = 79; jjCheckNAdd(14); break; case 1: @@ -1675,8 +1690,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 131) - kind = 131; + if (kind > 134) + kind = 134; jjCheckNAdd(17); break; case 38: @@ -1761,12 +1776,12 @@ null, null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, nu null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -"\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", "\56", "\100", "\44", -"\75", "\76", "\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", "\41\75", -"\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", "\174", -"\136", "\45", "\74\74", "\76\76", "\76\76\76", "\53\75", "\55\75", "\52\75", -"\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\74\74\75", "\76\76\75", -"\41\75\75", "\75\75\75", "\176\75", null, "\77\76", }; +null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", "\56", +"\100", "\44", "\75", "\76", "\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", +"\41\75", "\74\76", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", +"\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", "\53\75", +"\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", +"\74\74\75", "\76\76\75", "\41\75\75", "\75\75\75", "\176\75", null, "\77\76", }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", @@ -1780,10 +1795,10 @@ public static final int[] jjnewLexState = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffffffffffe2007L, 0xfffffffffffe3e8fL, 0x1fL, + 0xfffffffffffe2007L, 0xfffffffffff8fa3fL, 0xffL, }; static final long[] jjtoSkip = { 0xd1f8L, 0x0L, 0x0L,