From: kpouer Date: Wed, 5 Mar 2003 20:28:29 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://secure.phpeclipse.com *** empty log message *** --- diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 2e38206..c20eb33 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -391,9 +391,8 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants static final public PHPVarDeclaration VariableDeclarator() throws ParseException { String varName; String varValue = null; - int pos; + int pos = jj_input_stream.bufpos; varName = VariableDeclaratorId(); - pos = jj_input_stream.tokenBegin; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); @@ -535,8 +534,25 @@ Token token; static final public String VariableInitializer() throws ParseException { String expr; - expr = Literal(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case FALSE: + case NULL: + case TRUE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + expr = Literal(); + {if (true) return expr;} + break; + case ARRAY: + expr = ArrayDeclarator(); {if (true) return expr;} + break; + default: + jj_la1[12] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); } @@ -552,7 +568,7 @@ StringBuffer buff = new StringBuffer(); buff.append("=>").append(expr); break; default: - jj_la1[12] = jj_gen; + jj_la1[13] = jj_gen; ; } {if (true) return buff.toString();} @@ -599,7 +615,7 @@ StringBuffer buff = new StringBuffer("("); } break; default: - jj_la1[13] = jj_gen; + jj_la1[14] = jj_gen; ; } jj_consume_token(RPAREN); @@ -629,7 +645,7 @@ StringBuffer buff = new StringBuffer("("); methodDeclaration.append("&"); break; default: - jj_la1[14] = jj_gen; + jj_la1[15] = jj_gen; ; } identifier = jj_consume_token(IDENTIFIER); @@ -663,7 +679,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[15] = jj_gen; + jj_la1[16] = jj_gen; break label_7; } jj_consume_token(COMMA); @@ -672,7 +688,7 @@ StringBuffer buff = new StringBuffer("("); } break; default: - jj_la1[16] = jj_gen; + jj_la1[17] = jj_gen; ; } try { @@ -696,7 +712,7 @@ StringBuffer buff = new StringBuffer("("); buff.append("&"); break; default: - jj_la1[17] = jj_gen; + jj_la1[18] = jj_gen; ; } variableDeclaration = VariableDeclarator(); @@ -740,7 +756,7 @@ StringBuffer buff = new StringBuffer("("); {if (true) return "integer";} break; default: - jj_la1[18] = jj_gen; + jj_la1[19] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -791,10 +807,16 @@ StringBuffer buff = new StringBuffer("("); case RSIGNEDSHIFTASSIGN: case RUNSIGNEDSHIFTASSIGN: assignOperator = AssignmentOperator(); - expr2 = Expression(); + try { + expr2 = Expression(); + } catch (ParseException e) { + errorMessage = "expression expected"; + errorLevel = ERROR; + {if (true) throw generateParseException();} + } break; default: - jj_la1[19] = jj_gen; + jj_la1[20] = jj_gen; ; } if (expr2 == null) { @@ -804,7 +826,7 @@ StringBuffer buff = new StringBuffer("("); } break; default: - jj_la1[20] = jj_gen; + jj_la1[21] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -812,7 +834,6 @@ StringBuffer buff = new StringBuffer("("); } static final public String AssignmentOperator() throws ParseException { - Token assignOperator; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); @@ -867,7 +888,7 @@ StringBuffer buff = new StringBuffer("("); {if (true) return ".=";} break; default: - jj_la1[21] = jj_gen; + jj_la1[22] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -887,7 +908,7 @@ StringBuffer buff = new StringBuffer("("); expr3 = ConditionalExpression(); break; default: - jj_la1[22] = jj_gen; + jj_la1[23] = jj_gen; ; } if (expr3 == null) { @@ -913,7 +934,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[23] = jj_gen; + jj_la1[24] = jj_gen; break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -924,7 +945,7 @@ StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(_ORL); break; default: - jj_la1[24] = jj_gen; + jj_la1[25] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -951,7 +972,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[25] = jj_gen; + jj_la1[26] = jj_gen; break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -962,7 +983,7 @@ StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(_ANDL); break; default: - jj_la1[26] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -987,7 +1008,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[27] = jj_gen; + jj_la1[28] = jj_gen; break label_10; } jj_consume_token(DOT); @@ -1012,7 +1033,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[28] = jj_gen; + jj_la1[29] = jj_gen; break label_11; } jj_consume_token(BIT_OR); @@ -1037,7 +1058,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[29] = jj_gen; + jj_la1[30] = jj_gen; break label_12; } jj_consume_token(XOR); @@ -1062,7 +1083,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[30] = jj_gen; + jj_la1[31] = jj_gen; break label_13; } jj_consume_token(BIT_AND); @@ -1089,7 +1110,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[31] = jj_gen; + jj_la1[32] = jj_gen; break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1100,7 +1121,7 @@ StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(NE); break; default: - jj_la1[32] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1129,7 +1150,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[33] = jj_gen; + jj_la1[34] = jj_gen; break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1146,7 +1167,7 @@ StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(GE); break; default: - jj_la1[34] = jj_gen; + jj_la1[35] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1174,7 +1195,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[35] = jj_gen; + jj_la1[36] = jj_gen; break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1188,7 +1209,7 @@ StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(RUNSIGNEDSHIFT); break; default: - jj_la1[36] = jj_gen; + jj_la1[37] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1215,7 +1236,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[37] = jj_gen; + jj_la1[38] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1226,7 +1247,7 @@ StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(MINUS); break; default: - jj_la1[38] = jj_gen; + jj_la1[39] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1253,7 +1274,7 @@ StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[39] = jj_gen; + jj_la1[40] = jj_gen; break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1267,7 +1288,7 @@ StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(REM); break; default: - jj_la1[40] = jj_gen; + jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1281,7 +1302,7 @@ StringBuffer buff = new StringBuffer("("); static final public String UnaryExpression() throws ParseException { String expr; - final StringBuffer buff = new StringBuffer(); + Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: jj_consume_token(AT); @@ -1292,21 +1313,18 @@ StringBuffer buff = new StringBuffer("("); case MINUS: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: - jj_consume_token(PLUS); - buff.append("+"); + token = jj_consume_token(PLUS); break; case MINUS: - jj_consume_token(MINUS); - buff.append("-"); + token = jj_consume_token(MINUS); break; default: - jj_la1[41] = jj_gen; + jj_la1[42] = jj_gen; jj_consume_token(-1); throw new ParseException(); } expr = UnaryExpression(); - buff.append(expr); - {if (true) return buff.toString();} + {if (true) return token.image + expr;} break; case INCR: expr = PreIncrementExpression(); @@ -1334,7 +1352,7 @@ StringBuffer buff = new StringBuffer("("); {if (true) return expr;} break; default: - jj_la1[42] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1366,7 +1384,7 @@ String expr; {if (true) return "!" + expr;} break; default: - jj_la1[43] = jj_gen; + jj_la1[44] = jj_gen; if (jj_2_3(2147483647)) { expr = CastExpression(); {if (true) return expr;} @@ -1397,7 +1415,7 @@ String expr; {if (true) return "("+expr+")";} break; default: - jj_la1[44] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1432,13 +1450,13 @@ String expr; operator = jj_consume_token(DECR); break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; ; } if (operator == null) { @@ -1466,7 +1484,7 @@ String expr; ; break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; break label_19; } expr = PrimarySuffix(); @@ -1491,7 +1509,7 @@ String expr; ; break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; break label_20; } expr = PrimarySuffix(); @@ -1500,12 +1518,11 @@ String expr; {if (true) return buff.toString();} break; case ARRAY: - jj_consume_token(ARRAY); - expr = ArrayInitializer(); + expr = ArrayDeclarator(); {if (true) return "array" + expr;} break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1513,6 +1530,14 @@ String expr; throw new Error("Missing return statement in function"); } + static final public String ArrayDeclarator() throws ParseException { + String expr; + jj_consume_token(ARRAY); + expr = ArrayInitializer(); + {if (true) return "array" + expr;} + throw new Error("Missing return statement in function"); + } + static final public String PrimaryPrefix() throws ParseException { String expr; Token token = null; @@ -1528,7 +1553,7 @@ String expr; token = jj_consume_token(BIT_AND); break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; ; } jj_consume_token(NEW); @@ -1544,7 +1569,7 @@ String expr; {if (true) return expr;} break; default: - jj_la1[51] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1565,7 +1590,7 @@ String expr; {if (true) return expr;} break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1585,7 +1610,7 @@ String expr; {if (true) return expr;} break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1626,17 +1651,23 @@ String expr; expr = Expression(); break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; ; } - jj_consume_token(RBRACKET); + try { + jj_consume_token(RBRACKET); + } catch (ParseException e) { + errorMessage = "']' expected"; + errorLevel = ERROR; + {if (true) throw generateParseException();} + } if(expr == null) { {if (true) return "[]";} } {if (true) return "[" + expr + "]";} break; default: - jj_la1[55] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1675,7 +1706,7 @@ String expr; {if (true) return expr;} break; default: - jj_la1[56] = jj_gen; + jj_la1[57] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1693,7 +1724,7 @@ String expr; {if (true) return "false";} break; default: - jj_la1[57] = jj_gen; + jj_la1[58] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1733,7 +1764,7 @@ String expr = null; expr = ArgumentList(); break; default: - jj_la1[58] = jj_gen; + jj_la1[59] = jj_gen; ; } try { @@ -1762,7 +1793,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[59] = jj_gen; + jj_la1[60] = jj_gen; break label_21; } jj_consume_token(COMMA); @@ -1785,17 +1816,23 @@ StringBuffer buff = new StringBuffer(); static final public void Statement() throws ParseException { if (jj_2_5(2)) { Expression(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[60] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[61] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } } else if (jj_2_6(2)) { LabeledStatement(); @@ -1861,7 +1898,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(AT); break; default: - jj_la1[61] = jj_gen; + jj_la1[62] = jj_gen; ; } IncludeStatement(); @@ -1873,7 +1910,7 @@ StringBuffer buff = new StringBuffer(); GlobalStatement(); break; default: - jj_la1[62] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1881,84 +1918,103 @@ StringBuffer buff = new StringBuffer(); } static final public void IncludeStatement() throws ParseException { - Token token; String expr; - int pos; + int pos = jj_input_stream.bufpos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case REQUIRE: - token = jj_consume_token(REQUIRE); - pos = token.beginLine; + jj_consume_token(REQUIRE); expr = Expression(); currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[63] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[64] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } break; case REQUIRE_ONCE: - token = jj_consume_token(REQUIRE_ONCE); - pos = token.beginLine; + jj_consume_token(REQUIRE_ONCE); expr = Expression(); currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr)); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[64] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[65] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } break; case INCLUDE: - token = jj_consume_token(INCLUDE); - pos = token.beginLine; + jj_consume_token(INCLUDE); expr = Expression(); currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[65] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[66] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } break; case INCLUDE_ONCE: - token = jj_consume_token(INCLUDE_ONCE); - pos = token.beginLine; + jj_consume_token(INCLUDE_ONCE); expr = Expression(); currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr)); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[66] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[67] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } break; default: - jj_la1[67] = jj_gen; + jj_la1[68] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1984,7 +2040,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[68] = jj_gen; + jj_la1[69] = jj_gen; break label_22; } jj_consume_token(COMMA); @@ -1999,7 +2055,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2020,23 +2076,29 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[70] = jj_gen; + jj_la1[71] = jj_gen; break label_23; } jj_consume_token(COMMA); VariableDeclaratorId(); } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[71] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[72] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } } @@ -2050,23 +2112,29 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[72] = jj_gen; + jj_la1[73] = jj_gen; break label_24; } jj_consume_token(COMMA); VariableDeclarator(); } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[73] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[74] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } } @@ -2129,7 +2197,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[74] = jj_gen; + jj_la1[75] = jj_gen; break label_25; } BlockStatement(); @@ -2185,7 +2253,7 @@ StringBuffer buff = new StringBuffer(); MethodDeclaration(); break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2200,7 +2268,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[76] = jj_gen; + jj_la1[77] = jj_gen; break label_26; } jj_consume_token(COMMA); @@ -2267,18 +2335,18 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; ; } break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2298,7 +2366,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; break label_27; } SwitchLabel(); @@ -2347,7 +2415,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; break label_28; } BlockStatement(); @@ -2368,7 +2436,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(COLON); break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2385,7 +2453,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; break label_29; } ElseIfStatement(); @@ -2396,7 +2464,7 @@ StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; ; } } @@ -2478,23 +2546,29 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; break label_30; } Statement(); } jj_consume_token(ENDWHILE); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[86] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[87] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } break; case IF: @@ -2537,7 +2611,7 @@ StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2548,17 +2622,23 @@ StringBuffer buff = new StringBuffer(); Statement(); jj_consume_token(WHILE); Condition("while"); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[88] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + case 127: + jj_consume_token(127); + break; + default: + jj_la1[89] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + {if (true) throw e;} } } @@ -2577,7 +2657,7 @@ StringBuffer buff = new StringBuffer(); ForInit(); break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2605,7 +2685,7 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2621,7 +2701,7 @@ StringBuffer buff = new StringBuffer(); ForUpdate(); break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2644,7 +2724,7 @@ StringBuffer buff = new StringBuffer(); StatementExpressionList(); break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2660,7 +2740,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; break label_31; } jj_consume_token(COMMA); @@ -2679,7 +2759,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(IDENTIFIER); break; default: - jj_la1[94] = jj_gen; + jj_la1[95] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2692,7 +2772,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(IDENTIFIER); break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2724,7 +2804,7 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2779,92 +2859,44 @@ StringBuffer buff = new StringBuffer(); return retval; } - static final private boolean jj_3R_140() { - 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_132() { - Token xsp; - xsp = jj_scanpos; - 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; - } 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_125() { - 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_126() { - 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_132()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_129() { + static final private boolean jj_3R_135() { 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_133() { + static final private boolean jj_3R_139() { 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_127() { + static final private boolean jj_3R_133() { Token xsp; xsp = jj_scanpos; - if (jj_3R_133()) { + if (jj_3R_139()) { jj_scanpos = xsp; - if (jj_3R_134()) return true; + if (jj_3R_140()) 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_126()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_56() { - if (jj_scan_token(PRINT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_35()) return true; + if (jj_3R_132()) return true; 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_130() { 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_120() { - if (jj_3R_126()) return true; + static final private boolean jj_3R_126() { + if (jj_3R_132()) 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_133()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -2878,7 +2910,7 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_176() { + static final private boolean jj_3R_112() { if (jj_3R_33()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; @@ -2890,203 +2922,239 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_128() { + static final private boolean jj_3R_134() { if (jj_scan_token(LSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_121() { + static final private boolean jj_3R_127() { Token xsp; xsp = jj_scanpos; - if (jj_3R_128()) { + if (jj_3R_134()) { jj_scanpos = xsp; - if (jj_3R_129()) { + if (jj_3R_135()) { jj_scanpos = xsp; - if (jj_3R_130()) return true; + 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; - if (jj_3R_120()) return true; + if (jj_3R_126()) 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_129() { 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_167() { - 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_176()) 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_116() { - if (jj_3R_120()) return true; + static final private boolean jj_3R_122() { + if (jj_3R_126()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_121()) { jj_scanpos = xsp; break; } + if (jj_3R_127()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_177() { - if (jj_scan_token(ARRAYASSIGN)) return true; + static final private boolean jj_3R_105() { + if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_35()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_112()) 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_33() { + static final private boolean jj_3R_119() { + if (jj_scan_token(ARRAYASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_35()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_177()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_107() { - if (jj_3R_54()) return true; + static final private boolean jj_3R_128() { + 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_122() { - if (jj_scan_token(LT)) return true; + static final private boolean jj_3R_33() { + if (jj_3R_35()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_119()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_117() { + static final private boolean jj_3R_123() { Token xsp; xsp = jj_scanpos; - if (jj_3R_122()) { + if (jj_3R_128()) { jj_scanpos = xsp; - if (jj_3R_123()) { + if (jj_3R_129()) { jj_scanpos = xsp; - if (jj_3R_124()) { + if (jj_3R_130()) { jj_scanpos = xsp; - if (jj_3R_125()) return true; + if (jj_3R_131()) 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_116()) return true; + if (jj_3R_122()) 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_125() { 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_114() { - if (jj_3R_116()) return true; + static final private boolean jj_3R_120() { + if (jj_3R_122()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_117()) { jj_scanpos = xsp; break; } + if (jj_3R_123()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_69() { - if (jj_3R_87()) return true; + static final private boolean jj_3R_109() { + if (jj_3R_54()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_106() { - if (jj_scan_token(LBRACE)) return true; + static final private boolean jj_3R_37() { + if (jj_scan_token(127)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_35()) return true; + return false; + } + + static final private boolean jj_3R_88() { + if (jj_3R_95()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; + return false; + } + + static final private boolean jj_3R_87() { + if (jj_3R_94()) 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(127)) return true; + static final private boolean jj_3R_69() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_87()) { + jj_scanpos = xsp; + if (jj_3R_88()) 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() { + static final private boolean jj_3R_108() { + if (jj_scan_token(LBRACE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_35()) 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_124() { if (jj_scan_token(EQ)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_64() { - if (jj_scan_token(DOLLAR_ID)) return true; + static final private boolean jj_3_6() { + if (jj_3R_38()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_107()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_115() { + static final private boolean jj_3R_121() { Token xsp; xsp = jj_scanpos; - if (jj_3R_118()) { + if (jj_3R_124()) { jj_scanpos = xsp; - if (jj_3R_119()) return true; + if (jj_3R_125()) 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_114()) 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_63() { - if (jj_scan_token(DOLLAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_54()) return true; + static final private boolean jj_3R_36() { + 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_112() { - if (jj_3R_114()) return true; + static final private boolean jj_3R_117() { + 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_3R_115()) { 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_36() { - if (jj_scan_token(SEMICOLON)) return true; + static final private boolean jj_3R_64() { + 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_109()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_92() { + static final private boolean jj_3_5() { + if (jj_3R_35()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_36()) { + jj_scanpos = xsp; + if (jj_3R_37()) 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_63() { + if (jj_scan_token(DOLLAR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_54()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_93() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_35()) return true; @@ -3101,7 +3169,7 @@ StringBuffer buff = new StringBuffer(); if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_106()) jj_scanpos = xsp; + if (jj_3R_108()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3133,48 +3201,49 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_113() { + static final private boolean jj_3R_118() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_112()) return true; + if (jj_3R_117()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_6() { - if (jj_3R_38()) return true; + static final private boolean jj_3R_113() { + if (jj_3R_117()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_118()) { 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(DOLLAR)) return true; + static final private boolean jj_3R_183() { + if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_54()) return true; + if (jj_3R_35()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_5() { - if (jj_3R_35()) return true; + static final private boolean jj_3R_86() { + if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_36()) { - jj_scanpos = xsp; - if (jj_3R_37()) return true; + if (jj_3R_54()) 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_110() { - if (jj_3R_112()) return true; + static final private boolean jj_3R_182() { + if (jj_3R_35()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_113()) { jj_scanpos = xsp; break; } + if (jj_3R_183()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -3185,7 +3254,7 @@ StringBuffer buff = new StringBuffer(); if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_92()) jj_scanpos = xsp; + if (jj_3R_93()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3201,49 +3270,47 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_180() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_35()) return true; + static final private boolean jj_3R_181() { + if (jj_3R_182()) 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_114() { if (jj_scan_token(XOR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_110()) return true; + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_1() { - if (jj_3R_32()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_179() { - if (jj_3R_35()) return true; + static final private boolean jj_3R_106() { + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_180()) { jj_scanpos = xsp; break; } + if (jj_3R_114()) { 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_3R_110()) return true; + static final private boolean jj_3_1() { + if (jj_3R_32()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_179() { + if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_111()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } + xsp = jj_scanpos; + if (jj_3R_181()) 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; } @@ -3259,165 +3326,141 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_178() { - if (jj_3R_179()) return true; + static final private boolean jj_3R_111() { + if (jj_scan_token(NULL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_105() { + static final private boolean jj_3R_107() { if (jj_scan_token(BIT_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_104()) return true; + if (jj_3R_106()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_174() { - 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_178()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + static final private boolean jj_3R_116() { + 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_60() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_69()) return true; + static final private boolean jj_3_7() { + if (jj_3R_39()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_98() { - if (jj_3R_104()) return true; + static final private boolean jj_3R_96() { + if (jj_3R_106()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_105()) { jj_scanpos = xsp; break; } + if (jj_3R_107()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_52() { - if (jj_3R_59()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_60()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_103() { - if (jj_scan_token(NULL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_109() { - 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_102() { + static final private boolean jj_3R_110() { Token xsp; xsp = jj_scanpos; - if (jj_3R_108()) { + if (jj_3R_115()) { jj_scanpos = xsp; - if (jj_3R_109()) return true; + if (jj_3R_116()) 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_108() { + static final private boolean jj_3R_115() { if (jj_scan_token(TRUE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_99() { - if (jj_scan_token(DOT)) return true; + static final private boolean jj_3R_60() { + if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_98()) return true; + if (jj_3R_69()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_101() { - if (jj_scan_token(_ANDL)) return true; + static final private boolean jj_3R_104() { + if (jj_3R_111()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_97() { - if (jj_3R_103()) return true; + static final private boolean jj_3R_52() { + if (jj_3R_59()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_60()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_88() { - if (jj_3R_98()) return true; + static final private boolean jj_3R_103() { + 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_99()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_96() { - if (jj_3R_102()) return true; + static final private boolean jj_3R_97() { + if (jj_scan_token(DOT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_96()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_95() { - if (jj_scan_token(STRING_LITERAL)) return true; + static final private boolean jj_3R_99() { + 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_94() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + static final private boolean jj_3R_102() { + 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_100() { - if (jj_scan_token(SC_AND)) return true; + static final private boolean jj_3R_101() { + 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_93() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + static final private boolean jj_3R_89() { + if (jj_3R_96()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_97()) { 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_94() { Token xsp; xsp = jj_scanpos; - if (jj_3R_93()) { + if (jj_3R_100()) { jj_scanpos = xsp; - if (jj_3R_94()) { + if (jj_3R_101()) { jj_scanpos = xsp; - if (jj_3R_95()) { + if (jj_3R_102()) { jj_scanpos = xsp; - if (jj_3R_96()) { + if (jj_3R_103()) { jj_scanpos = xsp; - if (jj_3R_97()) return true; + if (jj_3R_104()) 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; @@ -3426,55 +3469,55 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_91() { + static final private boolean jj_3R_100() { + 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_55() { + if (jj_3R_35()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_98() { + 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_92() { 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_89() { + static final private boolean jj_3R_90() { Token xsp; xsp = jj_scanpos; - if (jj_3R_100()) { + if (jj_3R_98()) { jj_scanpos = xsp; - if (jj_3R_101()) return true; + if (jj_3R_99()) 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_88()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_55() { - if (jj_3R_35()) return true; + if (jj_3R_89()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_70() { - if (jj_3R_88()) return true; + if (jj_3R_89()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_89()) { jj_scanpos = xsp; break; } + if (jj_3R_90()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_66() { - if (jj_scan_token(HOOK)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_35()) 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_57()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_41() { if (jj_scan_token(LBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -3506,51 +3549,57 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_90() { - if (jj_scan_token(SC_OR)) return true; + static final private boolean jj_3R_66() { + if (jj_scan_token(HOOK)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_35()) 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_57()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_71() { - Token xsp; - xsp = jj_scanpos; - 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; - if (jj_3R_70()) return true; + static final private boolean jj_3R_176() { + if (jj_3R_32()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_7() { - if (jj_3R_39()) return true; + static final private boolean jj_3R_175() { + if (jj_3R_179()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_171() { - if (jj_3R_32()) return true; + static final private boolean jj_3R_173() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_175()) { + jj_scanpos = xsp; + if (jj_3R_176()) 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_170() { - if (jj_3R_174()) return true; + static final private boolean jj_3R_91() { + 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_168() { + static final private boolean jj_3R_71() { Token xsp; xsp = jj_scanpos; - if (jj_3R_170()) { + if (jj_3R_91()) { jj_scanpos = xsp; - if (jj_3R_171()) return true; + if (jj_3R_92()) 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_70()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3566,29 +3615,35 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_173() { + static final private boolean jj_3R_178() { if (jj_3R_59()) 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_177() { 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_169() { + static final private boolean jj_3R_174() { Token xsp; xsp = jj_scanpos; - if (jj_3R_172()) { + if (jj_3R_177()) { jj_scanpos = xsp; - if (jj_3R_173()) 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; return false; } + static final private boolean jj_3R_168() { + if (jj_3R_59()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_57() { if (jj_3R_65()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -3599,38 +3654,52 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_162() { - if (jj_3R_59()) return true; + static final private boolean jj_3R_171() { + if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_164() { - if (jj_scan_token(DECR)) return true; + static final private boolean jj_3R_167() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_171()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NEW)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_174()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_84() { - if (jj_scan_token(DOTASSIGN)) return true; + static final private boolean jj_3R_170() { + 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_165() { - if (jj_scan_token(BIT_AND)) return true; + static final private boolean jj_3R_164() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_166()) { + jj_scanpos = xsp; + if (jj_3R_167()) { + jj_scanpos = xsp; + 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; return false; } - static final private boolean jj_3R_161() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_165()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(NEW)) return true; + static final private boolean jj_3R_166() { + if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_169()) return true; + return false; + } + + static final private boolean jj_3R_84() { + if (jj_scan_token(DOTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3647,34 +3716,30 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_158() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_160()) { - jj_scanpos = xsp; - if (jj_3R_161()) { - jj_scanpos = xsp; - if (jj_3R_162()) return true; + static final private boolean jj_3R_81() { + if (jj_scan_token(ANDASSIGN)) 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_160() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_95() { + if (jj_scan_token(ARRAY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_105()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_81() { - if (jj_scan_token(ANDASSIGN)) return true; + static final private boolean jj_3R_80() { + if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_80() { - if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true; + static final private boolean jj_3R_53() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_52()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3697,33 +3762,31 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_155() { - if (jj_scan_token(ARRAY)) return true; + static final private boolean jj_3R_169() { + if (jj_scan_token(INCR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_167()) return true; + return false; + } + + static final private boolean jj_3R_161() { + if (jj_3R_95()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; 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; return false; } - static final private boolean jj_3R_163() { - 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_166() { - if (jj_3R_168()) return true; + static final private boolean jj_3R_172() { + if (jj_3R_173()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3740,13 +3803,13 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_154() { - if (jj_3R_158()) return true; + static final private boolean jj_3R_160() { + if (jj_3R_164()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_166()) { jj_scanpos = xsp; break; } + if (jj_3R_172()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -3764,8 +3827,8 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_175() { - if (jj_3R_168()) return true; + static final private boolean jj_3R_180() { + if (jj_3R_173()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3825,31 +3888,43 @@ StringBuffer buff = new StringBuffer(); 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_169()) return true; + if (jj_3R_174()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_175()) { jj_scanpos = xsp; break; } + if (jj_3R_180()) { jj_scanpos = xsp; break; } 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_3_4()) { jj_scanpos = xsp; - if (jj_3R_154()) { + if (jj_3R_160()) { jj_scanpos = xsp; - if (jj_3R_155()) return true; + if (jj_3R_161()) 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_39() { + if (jj_3R_52()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_53()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + static final private boolean jj_3R_58() { if (jj_3R_67()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -3858,22 +3933,22 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_51() { - if (jj_3R_57()) return true; + static final private boolean jj_3R_163() { + if (jj_3R_154()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_58()) jj_scanpos = xsp; + if (jj_3R_165()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_157() { - if (jj_3R_148()) return true; + static final private boolean jj_3R_51() { + if (jj_3R_57()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_159()) jj_scanpos = xsp; + if (jj_3R_58()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3895,14 +3970,14 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_156() { + static final private boolean jj_3R_162() { if (jj_scan_token(LPAREN)) 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; if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_131()) return true; + if (jj_3R_137()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3913,8 +3988,10 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_48() { - if (jj_scan_token(INT)) return true; + static final private boolean jj_3R_38() { + 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; } @@ -3929,13 +4006,13 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_47() { - if (jj_scan_token(FLOAT)) return true; + static final private boolean jj_3R_48() { + 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_153() { + static final private boolean jj_3R_159() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_35()) return true; @@ -3945,10 +4022,14 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_53() { - if (jj_scan_token(COMMA)) return true; + static final private boolean jj_3R_47() { + if (jj_scan_token(FLOAT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_52()) return true; + return false; + } + + static final private boolean jj_3R_158() { + if (jj_3R_94()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3959,8 +4040,8 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_152() { - if (jj_3R_87()) return true; + static final private boolean jj_3R_157() { + if (jj_3R_163()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3971,8 +4052,8 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_151() { - if (jj_3R_157()) return true; + static final private boolean jj_3R_156() { + if (jj_3R_162()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3983,30 +4064,18 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_150() { - if (jj_3R_156()) 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(BOOL)) 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() { Token xsp; xsp = jj_scanpos; - if (jj_3R_149()) { + if (jj_3R_155()) { jj_scanpos = xsp; - if (jj_3R_150()) { + if (jj_3R_156()) { jj_scanpos = xsp; - if (jj_3R_151()) { + if (jj_3R_157()) { jj_scanpos = xsp; - 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; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4015,10 +4084,16 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_149() { + static final private boolean jj_3R_155() { if (jj_scan_token(BANG)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_131()) return true; + if (jj_3R_137()) 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(BOOL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4058,109 +4133,97 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_144() { - if (jj_scan_token(MINUS)) return true; + static final private boolean jj_3R_152() { + if (jj_scan_token(DECR)) 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_146() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_148()) return true; + static final private boolean jj_3R_148() { + 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_39() { - if (jj_3R_52()) return true; + static final private boolean jj_3R_151() { + if (jj_scan_token(INCR)) 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; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_53()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_142() { - if (jj_scan_token(REM)) return true; + static final private boolean jj_3R_150() { + 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_145() { - if (jj_scan_token(INCR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_148()) return true; + if (jj_3R_153()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_139() { - if (jj_3R_147()) return true; + static final private boolean jj_3R_144() { + if (jj_3R_152()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_138() { - if (jj_3R_146()) return true; + static final private boolean jj_3R_143() { + if (jj_3R_151()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_137() { - if (jj_3R_145()) return true; + static final private boolean jj_3R_147() { + 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_141() { - if (jj_scan_token(SLASH)) return true; + static final private boolean jj_3R_56() { + if (jj_scan_token(PRINT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_35()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_143() { + static final private boolean jj_3R_149() { 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_136() { + static final private boolean jj_3R_142() { Token xsp; xsp = jj_scanpos; - if (jj_3R_143()) { + if (jj_3R_149()) { jj_scanpos = xsp; - if (jj_3R_144()) return true; + if (jj_3R_150()) 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_131()) 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(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; + if (jj_3R_137()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_131() { + static final private boolean jj_3R_137() { Token xsp; xsp = jj_scanpos; - if (jj_3R_135()) { + if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_136()) { + if (jj_3R_142()) { jj_scanpos = xsp; - if (jj_3R_137()) { + if (jj_3R_143()) { jj_scanpos = xsp; - if (jj_3R_138()) { + if (jj_3R_144()) { jj_scanpos = xsp; - if (jj_3R_139()) return true; + if (jj_3R_145()) 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; @@ -4169,26 +4232,66 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_135() { + static final private boolean jj_3R_141() { if (jj_scan_token(AT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_131()) return true; + if (jj_3R_137()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_130() { + static final private boolean jj_3R_136() { 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_134() { + static final private boolean jj_3R_140() { 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_146() { + 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_138() { + Token xsp; + xsp = jj_scanpos; + 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; + if (jj_3R_137()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_131() { + 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_132() { + if (jj_3R_137()) 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_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; @@ -4199,7 +4302,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[97]; + static final private int[] jj_la1 = new int[98]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -4211,16 +4314,16 @@ StringBuffer buff = new StringBuffer(); jj_la1_3(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0x2,0x7fcb0000,0x0,0x60000,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x400000,0x0,0x0,0x80000000,0x80000000,0x400000,0x0,0x0,0x0,0x80000000,0xc00000,0x80000000,0x0,0x0,0xc00000,0x0,0x0,0x0,0x7f480000,0x0,0x0,0x0,0x0,0x1e000000,0x0,0x0,0x0,0x0,0x0,0x0,0x7fcb0000,0x7fcb0000,0x0,0x0,0x0,0x400000,0x0,0x7fcb0000,0x0,0x100000,0x200000,0x7fc80000,0x0,0x7fc80000,0x0,0x400000,0xc00000,0x400000,0x400000,0x0,0x0,0x0,0xc00000,}; + jj_la1_0 = new int[] {0x2,0x7fcb0000,0x0,0x60000,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x400000,0x0,0x0,0x80000000,0x80000000,0x400000,0x0,0x0,0x0,0x80000000,0xc00000,0x80000000,0x0,0x0,0xc00000,0x0,0x0,0x0,0x7f480000,0x0,0x0,0x0,0x0,0x1e000000,0x0,0x0,0x0,0x0,0x0,0x0,0x7fcb0000,0x7fcb0000,0x0,0x0,0x0,0x400000,0x0,0x7fcb0000,0x0,0x100000,0x200000,0x7fc80000,0x0,0x7fc80000,0x0,0x400000,0xc00000,0x400000,0x400000,0x0,0x0,0x0,0xc00000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x0,0xd76a4,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x43200,0x0,0x0,0x0,0x0,0x3fa00000,0x0,0x43200,0x0,0x0,0x40000000,0x40000000,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x43200,0x0,0x43200,0x0,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x43200,0x0,0x42200,0x40200,0x43200,0x0,0x0,0x0,0x954a4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd76a4,0xd76a4,0x0,0x0,0x0,0x1000,0x48,0xd76a4,0x48,0x0,0x0,0xd76a4,0x0,0xd76a4,0x0,0x1000,0x43200,0x1000,0x1000,0x0,0x0,0x0,0x43200,}; + jj_la1_1 = new int[] {0x0,0xd76a4,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42200,0x2,0x43200,0x0,0x0,0x0,0x0,0x3fa00000,0x0,0x43200,0x0,0x0,0x40000000,0x40000000,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x43200,0x0,0x43200,0x0,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x43200,0x0,0x42200,0x40200,0x43200,0x0,0x0,0x0,0x954a4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd76a4,0xd76a4,0x0,0x0,0x0,0x1000,0x48,0xd76a4,0x48,0x0,0x0,0xd76a4,0x0,0xd76a4,0x0,0x1000,0x43200,0x1000,0x1000,0x0,0x0,0x0,0x43200,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x0,0x11914451,0x0,0x0,0x0,0x200000,0x2000000,0x10000,0x1000000,0x10000,0x1010400,0x1010400,0x0,0x11804451,0x0,0x200000,0x1000000,0x0,0x0,0x2000000,0x11804451,0x2000000,0x20000000,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x80000000,0x80000000,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11804451,0x10000000,0x1004451,0x0,0x0,0x44000,0x44000,0x1000400,0x0,0x1000400,0x1000400,0x44000,0x11804451,0x40000,0x51,0x0,0x11804451,0x200000,0x100000,0x800000,0x1910400,0x100000,0x100000,0x100000,0x100000,0x0,0x200000,0x100000,0x200000,0x100000,0x200000,0x100000,0x11914451,0x11914451,0x200000,0x2000000,0x2000000,0x1000400,0x0,0x11914451,0x0,0x0,0x0,0x11914451,0x100000,0x51914451,0x100000,0x1000400,0x11804451,0x1000400,0x1000400,0x200000,0x400,0x400,0x11804451,}; + jj_la1_2 = new int[] {0x0,0x11914451,0x0,0x0,0x0,0x200000,0x2000000,0x10000,0x1000000,0x10000,0x1010400,0x1010400,0x51,0x0,0x11804451,0x0,0x200000,0x1000000,0x0,0x0,0x2000000,0x11804451,0x2000000,0x20000000,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x80000000,0x80000000,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11804451,0x10000000,0x1004451,0x0,0x0,0x44000,0x44000,0x1000400,0x0,0x1000400,0x1000400,0x44000,0x11804451,0x40000,0x51,0x0,0x11804451,0x200000,0x100000,0x800000,0x1910400,0x100000,0x100000,0x100000,0x100000,0x0,0x200000,0x100000,0x200000,0x100000,0x200000,0x100000,0x11914451,0x11914451,0x200000,0x2000000,0x2000000,0x1000400,0x0,0x11914451,0x0,0x0,0x0,0x11914451,0x100000,0x51914451,0x100000,0x1000400,0x11804451,0x1000400,0x1000400,0x200000,0x400,0x400,0x11804451,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x0,0x400009e0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x40000000,0x40000000,0x0,0x400009e0,0x800,0x0,0x40000800,0x800,0x0,0x3ffc0000,0x400009e0,0x3ffc0000,0x0,0x8,0x8,0x10,0x10,0x0,0x1000,0x2000,0x800,0x4,0x4,0x3,0x3,0x38000,0x38000,0x180,0x180,0x4600,0x4600,0x180,0x400009e0,0x0,0x40000800,0x60,0x60,0x0,0x0,0x40000800,0x800,0x40000800,0x40000000,0x0,0x400009e0,0x0,0x0,0x0,0x400009e0,0x0,0x80000000,0x0,0x40000860,0x80000000,0x80000000,0x80000000,0x80000000,0x0,0x0,0x80000000,0x0,0x80000000,0x0,0x80000000,0x400009e0,0x400009e0,0x0,0x3ffc0060,0x3ffc0060,0x40000860,0x0,0x400009e0,0x0,0x0,0x0,0x400009e0,0x80000000,0x400009e0,0x80000000,0x40000860,0x400009e0,0x40000860,0x40000860,0x0,0x0,0x0,0x400009e0,}; + jj_la1_3 = new int[] {0x0,0x400009e0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x40000000,0x40000000,0x0,0x0,0x400009e0,0x800,0x0,0x40000800,0x800,0x0,0x3ffc0000,0x400009e0,0x3ffc0000,0x0,0x8,0x8,0x10,0x10,0x0,0x1000,0x2000,0x800,0x4,0x4,0x3,0x3,0x38000,0x38000,0x180,0x180,0x4600,0x4600,0x180,0x400009e0,0x0,0x40000800,0x60,0x60,0x0,0x0,0x40000800,0x800,0x40000800,0x40000000,0x0,0x400009e0,0x0,0x0,0x0,0x400009e0,0x0,0x80000000,0x0,0x40000860,0x80000000,0x80000000,0x80000000,0x80000000,0x0,0x0,0x80000000,0x0,0x80000000,0x0,0x80000000,0x400009e0,0x400009e0,0x0,0x3ffc0060,0x3ffc0060,0x40000860,0x0,0x400009e0,0x0,0x0,0x0,0x400009e0,0x80000000,0x400009e0,0x80000000,0x40000860,0x400009e0,0x40000860,0x40000860,0x0,0x0,0x0,0x400009e0,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[7]; static private boolean jj_rescan = false; @@ -4239,7 +4342,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 97; i++) jj_la1[i] = -1; + for (int i = 0; i < 98; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4249,7 +4352,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 97; i++) jj_la1[i] = -1; + for (int i = 0; i < 98; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4266,7 +4369,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 97; i++) jj_la1[i] = -1; + for (int i = 0; i < 98; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4276,7 +4379,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 97; i++) jj_la1[i] = -1; + for (int i = 0; i < 98; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4292,7 +4395,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 97; i++) jj_la1[i] = -1; + for (int i = 0; i < 98; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4301,7 +4404,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 97; i++) jj_la1[i] = -1; + for (int i = 0; i < 98; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4416,7 +4519,7 @@ StringBuffer buff = new StringBuffer(); la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 97; i++) { + for (int i = 0; i < 98; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< | | )> | < STRING_1: "\"" - ( (~["\""]) - | "\\\"" + ( + ~["\""] + | + "\\\"" )* "\"" > | < STRING_2: "'" - ( (~["'"]))* + ( + ~["'"] + | + "\\'" + )* "'" > | < STRING_3: "`" - ( (~["`"]))* + ( + ~["`"] + | + "\\`" + )* "`" > } @@ -456,43 +466,43 @@ MORE : { | -| < ASSIGN: "=" > -| < GT: ">" > -| < LT: "<" > -| < BANG: "!" > -| < HOOK: "?" > -| < COLON: ":" > -| < EQ: "==" > -| < LE: "<=" > -| < GE: ">=" > -| < NE: "!=" > -| < SC_OR: "||" > -| < SC_AND: "&&" > -| < INCR: "++" > -| < DECR: "--" > -| < PLUS: "+" > -| < MINUS: "-" > -| < STAR: "*" > -| < SLASH: "/" > -| < BIT_AND: "&" > -| < BIT_OR: "|" > -| < XOR: "^" > -| < REM: "%" > -| < LSHIFT: "<<" > -| < RSIGNEDSHIFT: ">>" > -| < RUNSIGNEDSHIFT: ">>>" > -| < PLUSASSIGN: "+=" > -| < MINUSASSIGN: "-=" > -| < STARASSIGN: "*=" > -| < SLASHASSIGN: "/=" > -| < ANDASSIGN: "&=" > -| < ORASSIGN: "|=" > -| < XORASSIGN: "^=" > -| < DOTASSIGN: ".=" > -| < REMASSIGN: "%=" > -| < LSHIFTASSIGN: "<<=" > -| < RSIGNEDSHIFTASSIGN: ">>=" > -| < RUNSIGNEDSHIFTASSIGN: ">>>=" > +| " > +| +| +| +| +| +| =" > +| +| +| +| +| +| +| +| +| +| +| +| +| +| >" > +| >>" > +| +| >=" > +| >>=" > } TOKEN : @@ -599,11 +609,10 @@ PHPVarDeclaration VariableDeclarator() : { String varName; String varValue = null; - int pos; + int pos = jj_input_stream.bufpos; } { varName = VariableDeclaratorId() - {pos = jj_input_stream.tokenBegin;} [ try { @@ -696,6 +705,9 @@ String VariableInitializer() : { expr = Literal() {return expr;} +| + expr = ArrayDeclarator() + {return expr;} } String ArrayVariable() : @@ -850,7 +862,13 @@ String Expression() : expr = ConditionalExpression() [ assignOperator = AssignmentOperator() - expr2 = Expression() + try { + expr2 = Expression() + } catch (ParseException e) { + errorMessage = "expression expected"; + errorLevel = ERROR; + throw generateParseException(); + } ] { if (expr2 == null) { @@ -862,9 +880,7 @@ String Expression() : } String AssignmentOperator() : -{ - Token assignOperator; -} +{} { {return "=";} @@ -1152,16 +1168,15 @@ String MultiplicativeExpression() : String UnaryExpression() : { String expr; - final StringBuffer buff = new StringBuffer(); + Token token; } { expr = UnaryExpression() {return "@" + expr;} | - ( {buff.append("+");}| {buff.append("-");}) expr = UnaryExpression() + ( token = | token = ) expr = UnaryExpression() { - buff.append(expr); - return buff.toString(); + return token.image + expr; } | expr = PreIncrementExpression() @@ -1259,6 +1274,15 @@ String PrimaryExpression() : ( expr = PrimarySuffix() {buff.append(expr);} )* {return buff.toString();} | + expr = ArrayDeclarator() + {return "array" + expr;} +} + +String ArrayDeclarator() : +{ + String expr; +} +{ expr = ArrayInitializer() {return "array" + expr;} } @@ -1317,7 +1341,14 @@ String VariableSuffix() : expr = VariableName() {return "->" + expr;} | - [ expr = Expression() ] + [ expr = Expression() ] + try { + + } catch (ParseException e) { + errorMessage = "']' expected"; + errorLevel = ERROR; + throw generateParseException(); + } { if(expr == null) { return "[]"; @@ -1423,7 +1454,14 @@ void Statement() : {} { LOOKAHEAD(2) - Expression() ( | "?>") + Expression() + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | LOOKAHEAD(2) LabeledStatement() @@ -1468,34 +1506,53 @@ void Statement() : void IncludeStatement() : { - Token token; String expr; - int pos; + int pos = jj_input_stream.bufpos; } { - token = - {pos = token.beginLine;} + expr = Expression() {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr));} - ( | "?>") + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | - token = - {pos = token.beginLine;} + expr = Expression() {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr));} - ( | "?>") + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | - token = - {pos = token.beginLine;} + expr = Expression() {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr));} - ( | "?>") + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | - token = - {pos = token.beginLine;} + expr = Expression() {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr));} - ( | "?>") + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } } String PrintExpression() : @@ -1527,13 +1584,27 @@ void EchoStatement() : void GlobalStatement() : {} { - VariableDeclaratorId() ( VariableDeclaratorId())* ( | "?>") + VariableDeclaratorId() ( VariableDeclaratorId())* + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } } void StaticStatement() : {} { - VariableDeclarator() ( VariableDeclarator())* ( | "?>") + VariableDeclarator() ( VariableDeclarator())* + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } } void LabeledStatement() : @@ -1579,11 +1650,6 @@ void EmptyStatement() : } void StatementExpression() : -/* - * The last expansion of this production accepts more than the legal - * Java expansions for StatementExpression. This expansion does not - * use PostfixExpression for performance reasons. - */ {} { PreIncrementExpression() @@ -1662,7 +1728,14 @@ void WhileStatement() : void WhileStatement0() : {} { - (Statement())* ( | "?>") + (Statement())* + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | Statement() } @@ -1670,7 +1743,14 @@ void WhileStatement0() : void DoStatement() : {} { - Statement() Condition("while") ( | "?>") + Statement() Condition("while") + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } } void ForStatement() : diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index ad97563..e8a8a8e 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -1203,7 +1203,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 56; + jjnewStateCnt = 64; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1222,9 +1222,9 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(2, 8); else if (curChar == 39) - jjCheckNAddStates(9, 12); + jjCheckNAddStates(9, 14); else if (curChar == 34) - jjCheckNAddStates(13, 18); + jjCheckNAddStates(15, 20); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1241,7 +1241,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { if (kind > 64) kind = 64; - jjCheckNAddStates(19, 21); + jjCheckNAddStates(21, 23); } break; case 0: @@ -1279,7 +1279,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 68) kind = 68; - jjCheckNAddStates(22, 24); + jjCheckNAddStates(24, 26); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1323,14 +1323,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 68) kind = 68; - jjCheckNAddStates(25, 27); + jjCheckNAddStates(27, 29); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 68) kind = 68; - jjCheckNAddStates(25, 27); + jjCheckNAddStates(27, 29); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1360,7 +1360,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(28, 30); + jjCheckNAddStates(30, 32); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1375,7 +1375,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 64) kind = 64; - jjCheckNAddStates(19, 21); + jjCheckNAddStates(21, 23); break; case 35: if ((0x3ff000000000000L & l) == 0L) @@ -1393,15 +1393,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 37: if (curChar == 34) - jjCheckNAddStates(13, 18); + jjCheckNAddStates(15, 20); break; case 38: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(31, 33); + jjCheckNAddStates(33, 35); break; case 39: if (curChar == 34) - jjCheckNAddStates(31, 33); + jjCheckNAddStates(33, 35); break; case 41: if (curChar == 34 && kind > 70) @@ -1409,11 +1409,11 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(34, 36); + jjCheckNAddStates(36, 38); break; case 43: if (curChar == 34) - jjCheckNAddStates(34, 36); + jjCheckNAddStates(36, 38); break; case 45: if (curChar == 34 && kind > 71) @@ -1421,29 +1421,37 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 46: if (curChar == 39) - jjCheckNAddStates(9, 12); + jjCheckNAddStates(9, 14); break; case 47: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddTwoStates(47, 48); + jjCheckNAddStates(39, 41); break; case 48: + if (curChar == 39) + jjCheckNAddStates(39, 41); + break; + case 50: if (curChar == 39 && kind > 70) kind = 70; break; - case 49: + case 51: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddTwoStates(49, 50); + jjCheckNAddStates(42, 44); break; - case 50: + case 52: + if (curChar == 39) + jjCheckNAddStates(42, 44); + break; + case 54: if (curChar == 39 && kind > 72) kind = 72; break; - case 52: - jjAddStates(37, 38); + case 56: + jjAddStates(45, 47); break; - case 54: - jjAddStates(39, 40); + case 60: + jjAddStates(48, 50); break; default : break; } @@ -1464,7 +1472,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(41, 44); + jjCheckNAddStates(51, 56); break; case 1: if (kind > 10) @@ -1476,7 +1484,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(45, 46); + jjAddStates(57, 58); break; case 12: if ((0x5000000050L & l) != 0L && kind > 68) @@ -1500,15 +1508,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(47, 48); + jjAddStates(59, 60); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(49, 50); + jjAddStates(61, 62); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(51, 52); + jjAddStates(63, 64); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1522,42 +1530,66 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(31, 33); + jjAddStates(33, 35); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; case 42: - jjAddStates(34, 36); + jjAddStates(36, 38); break; case 44: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 43; break; case 47: - jjAddStates(53, 54); + jjAddStates(39, 41); break; case 49: - jjAddStates(55, 56); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 48; break; case 51: + jjAddStates(42, 44); + break; + case 53: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 52; + break; + case 55: if (curChar == 96) - jjCheckNAddStates(41, 44); + jjCheckNAddStates(51, 56); break; - case 52: + case 56: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddTwoStates(52, 53); + jjCheckNAddStates(45, 47); break; - case 53: + case 57: + if (curChar == 96) + jjCheckNAddStates(45, 47); + break; + case 58: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 57; + break; + case 59: if (curChar == 96 && kind > 70) kind = 70; break; - case 54: + case 60: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddTwoStates(54, 55); + jjCheckNAddStates(48, 50); break; - case 55: + case 61: + if (curChar == 96) + jjCheckNAddStates(48, 50); + break; + case 62: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 61; + break; + case 63: if (curChar == 96 && kind > 73) kind = 73; break; @@ -1579,27 +1611,27 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 38: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(31, 33); + jjAddStates(33, 35); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(34, 36); + jjAddStates(36, 38); break; case 47: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(53, 54); + jjAddStates(39, 41); break; - case 49: + case 51: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(55, 56); + jjAddStates(42, 44); break; - case 52: + case 56: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 38); + jjAddStates(45, 47); break; - case 54: + case 60: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(39, 40); + jjAddStates(48, 50); break; default : break; } @@ -1612,7 +1644,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 56 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -1646,10 +1678,11 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) return 2; } static final int[] jjnextStates = { - 4, 5, 19, 20, 25, 26, 29, 30, 12, 47, 48, 49, 50, 38, 40, 41, - 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, - 40, 41, 42, 44, 45, 52, 53, 54, 55, 52, 53, 54, 55, 10, 11, 23, - 24, 27, 28, 31, 32, 47, 48, 49, 50, + 4, 5, 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, + 40, 41, 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, + 12, 38, 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, + 60, 62, 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, + 32, }; public static final String[] jjstrLiteralImages = { "", null, "\77\76", null, null, null, null, null, null, null, null, null, null, @@ -1692,8 +1725,8 @@ static final long[] jjtoMore = { 0x8e00L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; -static private final int[] jjrounds = new int[56]; -static private final int[] jjstateSet = new int[112]; +static private final int[] jjrounds = new int[64]; +static private final int[] jjstateSet = new int[128]; static StringBuffer image; static int jjimageLen; static int lengthOfMatch; @@ -1720,7 +1753,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 56; i-- > 0;) + for (i = 64; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState)