From 11035713b5ed87f2cd571128ec82c899fb33acd3 Mon Sep 17 00:00:00 2001 From: kpouer Date: Tue, 4 Mar 2003 21:50:55 +0000 Subject: [PATCH] *** empty log message *** --- net.sourceforge.phpeclipse/src/test/PHPParser.java | 1524 +++++++++++--------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 258 +++-- .../src/test/PHPParserSuperclass.java | 32 + .../src/test/PHPParserTokenManager.java | 12 +- .../src/test/ParseException.java | 2 +- .../src/test/SimpleCharStream.java | 52 +- net.sourceforge.phpeclipse/src/test/Token.java | 4 +- .../src/test/TokenMgrError.java | 4 +- 8 files changed, 1051 insertions(+), 837 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 0a1f400..2e38206 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -17,6 +17,8 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; import net.sourceforge.phpdt.internal.compiler.parser.PHPSegmentWithChildren; import net.sourceforge.phpdt.internal.compiler.parser.PHPFunctionDeclaration; import net.sourceforge.phpdt.internal.compiler.parser.PHPClassDeclaration; +import net.sourceforge.phpdt.internal.compiler.parser.PHPVarDeclaration; +import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration; /** * A new php parser. @@ -34,9 +36,6 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$ private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$ - public static final int ERROR = 2; - public static final int WARNING = 1; - public static final int INFO = 0; PHPOutlineInfo outlineInfo; private static int errorLevel = ERROR; private static String errorMessage; @@ -83,45 +82,33 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants try { parse(); } catch (ParseException e) { - if (errorMessage == null) { - PHPeclipsePlugin.log(e); - } else { - setMarker(errorMessage, e.currentToken.beginLine, errorLevel); - errorMessage = null; - } + processParseException(e); } return outlineInfo; } - /** - * Create marker for the parse error + * This method will process the parse exception. + * If the error message is null, the parse exception wasn't catched and a trace is written in the log + * @param e the ParseException */ - private static void setMarker(String message, int lineNumber, int errorLevel) { - try { - setMarker(fileToParse, message, lineNumber, errorLevel); - } catch (CoreException e) { + private static void processParseException(final ParseException e) { + if (errorMessage == null) { PHPeclipsePlugin.log(e); + errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it"; } + setMarker(e); + errorMessage = null; } - public static void setMarker(IFile file, String message, int lineNumber, int errorLevel) throws CoreException { - if (file != null) { - Hashtable attributes = new Hashtable(); - MarkerUtilities.setMessage(attributes, message); - switch (errorLevel) { - case ERROR : - attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); - break; - case WARNING : - attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); - break; - case INFO : - attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); - break; - } - MarkerUtilities.setLineNumber(attributes, lineNumber); - MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); + /** + * Create marker for the parse error + */ + private static void setMarker(ParseException e) { + try { + setMarker(fileToParse, errorMessage, jj_input_stream.tokenBegin,jj_input_stream.tokenBegin+e.currentToken.image.length(), errorLevel); + } catch (CoreException e2) { + PHPeclipsePlugin.log(e2); } } @@ -193,12 +180,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants try { parse(); } catch (ParseException e) { - if (errorMessage == null) { - PHPeclipsePlugin.log(e); - } else { - setMarker(errorMessage, e.currentToken.beginLine, errorLevel); - errorMessage = null; - } + processParseException(e); } } @@ -334,7 +316,13 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } static final public void ClassBody() throws ParseException { - jj_consume_token(LBRACE); + try { + jj_consume_token(LBRACE); + } catch (ParseException e) { + errorMessage = "'{' expected"; + errorLevel = ERROR; + {if (true) throw e;} + } label_3: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -348,7 +336,13 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } ClassBodyDeclaration(); } - jj_consume_token(RBRACE); + try { + jj_consume_token(RBRACE); + } catch (ParseException e) { + errorMessage = "'var', 'function' or '}' expected"; + errorLevel = ERROR; + {if (true) throw e;} + } } static final public void ClassBodyDeclaration() throws ParseException { @@ -367,8 +361,10 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } static final public void FieldDeclaration() throws ParseException { + PHPVarDeclaration variableDeclaration; jj_consume_token(VAR); - VariableDeclarator(); + variableDeclaration = VariableDeclarator(); + currentSegment.add(variableDeclaration); label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -380,46 +376,68 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants break label_4; } jj_consume_token(COMMA); - VariableDeclarator(); + variableDeclaration = VariableDeclarator(); + currentSegment.add(variableDeclaration); + } + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { + errorMessage = "';' expected after variable declaration"; + errorLevel = ERROR; + {if (true) throw e;} } - jj_consume_token(SEMICOLON); } - static final public String VariableDeclarator() throws ParseException { - String expr; - StringBuffer buff = new StringBuffer(); - expr = VariableDeclaratorId(); - buff.append(expr); + static final public PHPVarDeclaration VariableDeclarator() throws ParseException { + String varName; + String varValue = null; + int pos; + varName = VariableDeclaratorId(); + pos = jj_input_stream.tokenBegin; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); - expr = VariableInitializer(); - buff.append("=").append(expr); + try { + varValue = VariableInitializer(); + } catch (ParseException e) { + errorMessage = "Literal expression expected in variable initializer"; + errorLevel = ERROR; + {if (true) throw e;} + } break; default: jj_la1[6] = jj_gen; ; } - {if (true) return buff.toString();} + if (varValue == null) { + {if (true) return new PHPVarDeclaration(currentSegment,varName,pos);} + } + {if (true) return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} throw new Error("Missing return statement in function"); } static final public String VariableDeclaratorId() throws ParseException { String expr; StringBuffer buff = new StringBuffer(); - expr = Variable(); - buff.append(expr); - label_5: - while (true) { - if (jj_2_1(2)) { - ; - } else { - break label_5; + try { + expr = Variable(); + buff.append(expr); + label_5: + while (true) { + if (jj_2_1(2)) { + ; + } else { + break label_5; + } + expr = VariableSuffix(); + buff.append(expr); } - expr = VariableSuffix(); - buff.append(expr); + {if (true) return buff.toString();} + } catch (ParseException e) { + errorMessage = "'$' expected for variable identifier"; + errorLevel = ERROR; + {if (true) throw e;} } - {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } @@ -489,8 +507,26 @@ Token token; expr = VariableName(); {if (true) return "$" + expr;} break; + case DOLLAR_ID: + token = jj_consume_token(DOLLAR_ID); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + case LBRACE: + case DOLLAR: + case DOLLAR_ID: + expr = VariableName(); + break; + default: + jj_la1[10] = jj_gen; + ; + } + if (expr == null) { + {if (true) return token.image;} + } + {if (true) return token.image + expr;} + break; default: - jj_la1[10] = jj_gen; + jj_la1[11] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -499,7 +535,7 @@ Token token; static final public String VariableInitializer() throws ParseException { String expr; - expr = Expression(); + expr = Literal(); {if (true) return expr;} throw new Error("Missing return statement in function"); } @@ -516,7 +552,7 @@ StringBuffer buff = new StringBuffer(); buff.append("=>").append(expr); break; default: - jj_la1[11] = jj_gen; + jj_la1[12] = jj_gen; ; } {if (true) return buff.toString();} @@ -563,7 +599,7 @@ StringBuffer buff = new StringBuffer("("); } break; default: - jj_la1[12] = jj_gen; + jj_la1[13] = jj_gen; ; } jj_consume_token(RPAREN); @@ -578,18 +614,7 @@ StringBuffer buff = new StringBuffer("("); functionDeclaration = MethodDeclarator(); currentSegment.add(functionDeclaration); currentSegment = functionDeclaration; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACE: - Block(); - break; - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - default: - jj_la1[13] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + Block(); currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); } @@ -608,22 +633,29 @@ StringBuffer buff = new StringBuffer("("); ; } identifier = jj_consume_token(IDENTIFIER); + methodDeclaration.append(identifier); formalParameters = FormalParameters(); - methodDeclaration.append(identifier).append(formalParameters); + methodDeclaration.append(formalParameters); {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos);} throw new Error("Missing return statement in function"); } static final public String FormalParameters() throws ParseException { String expr; - StringBuffer buff = new StringBuffer("("); - jj_consume_token(LPAREN); + final StringBuffer buff = new StringBuffer("("); + try { + jj_consume_token(LPAREN); + } catch (ParseException e) { + errorMessage = "Formal parameter expected after function identifier"; + errorLevel = ERROR; + jj_consume_token(token.kind); + } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR: case BIT_AND: case DOLLAR_ID: expr = FormalParameter(); - buff.append(expr); + buff.append(expr); label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -636,21 +668,27 @@ StringBuffer buff = new StringBuffer("("); } jj_consume_token(COMMA); expr = FormalParameter(); - buff.append(",").append(expr); + buff.append(",").append(expr); } break; default: jj_la1[16] = jj_gen; ; } - jj_consume_token(RPAREN); + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { + errorMessage = "')' expected"; + errorLevel = ERROR; + {if (true) throw e;} + } buff.append(")"); {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } static final public String FormalParameter() throws ParseException { - String expr; + PHPVarDeclaration variableDeclaration; StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: @@ -661,8 +699,8 @@ StringBuffer buff = new StringBuffer("("); jj_la1[17] = jj_gen; ; } - expr = VariableDeclarator(); - buff.append(expr); + variableDeclaration = VariableDeclarator(); + buff.append(variableDeclaration.toString()); {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } @@ -1201,10 +1239,9 @@ StringBuffer buff = new StringBuffer("("); } static final public String MultiplicativeExpression() throws ParseException { - String expr; + String expr, expr2; Token operator; - String expr2; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); expr = UnaryExpression(); buff.append(expr); label_18: @@ -1244,7 +1281,7 @@ StringBuffer buff = new StringBuffer("("); static final public String UnaryExpression() throws ParseException { String expr; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: jj_consume_token(AT); @@ -1294,7 +1331,7 @@ StringBuffer buff = new StringBuffer("("); case BIT_AND: case DOLLAR_ID: expr = UnaryExpressionNotPlusMinus(); - {if (true) return buff.toString();} + {if (true) return expr;} break; default: jj_la1[42] = jj_gen; @@ -1414,7 +1451,7 @@ String expr; static final public String PrimaryExpression() throws ParseException { Token identifier; String expr; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); if (jj_2_4(2)) { identifier = jj_consume_token(IDENTIFIER); jj_consume_token(STATICCLASSACCESS); @@ -1444,7 +1481,7 @@ String expr; case BIT_AND: case DOLLAR_ID: expr = PrimaryPrefix(); - buff.append(expr); + buff.append(expr); label_20: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1458,7 +1495,7 @@ String expr; break label_20; } expr = PrimarySuffix(); - buff.append(expr); + buff.append(expr); } {if (true) return buff.toString();} break; @@ -1499,7 +1536,7 @@ String expr; if (token == null) { {if (true) return "new " + expr;} } - {if (true) return "new " + expr;} + {if (true) return "new &" + expr;} break; case DOLLAR: case DOLLAR_ID: @@ -1818,6 +1855,15 @@ StringBuffer buff = new StringBuffer(); case REQUIRE: case INCLUDE_ONCE: case REQUIRE_ONCE: + case AT: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AT: + jj_consume_token(AT); + break; + default: + jj_la1[61] = jj_gen; + ; + } IncludeStatement(); break; case STATIC: @@ -1827,7 +1873,7 @@ StringBuffer buff = new StringBuffer(); GlobalStatement(); break; default: - jj_la1[61] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1835,10 +1881,15 @@ StringBuffer buff = new StringBuffer(); } static final public void IncludeStatement() throws ParseException { + Token token; + String expr; + int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case REQUIRE: - jj_consume_token(REQUIRE); - Expression(); + token = jj_consume_token(REQUIRE); + pos = token.beginLine; + expr = Expression(); + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: jj_consume_token(SEMICOLON); @@ -1847,14 +1898,16 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[62] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; case REQUIRE_ONCE: - jj_consume_token(REQUIRE_ONCE); - Expression(); + token = jj_consume_token(REQUIRE_ONCE); + pos = token.beginLine; + 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); @@ -1863,14 +1916,16 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[63] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; case INCLUDE: - jj_consume_token(INCLUDE); - Expression(); + token = jj_consume_token(INCLUDE); + pos = token.beginLine; + expr = Expression(); + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: jj_consume_token(SEMICOLON); @@ -1879,14 +1934,16 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[64] = jj_gen; + jj_la1[65] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; case INCLUDE_ONCE: - jj_consume_token(INCLUDE_ONCE); - Expression(); + token = jj_consume_token(INCLUDE_ONCE); + pos = token.beginLine; + 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); @@ -1895,13 +1952,13 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[65] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[66] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1927,7 +1984,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[67] = jj_gen; + jj_la1[68] = jj_gen; break label_22; } jj_consume_token(COMMA); @@ -1942,7 +1999,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[68] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1963,7 +2020,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; break label_23; } jj_consume_token(COMMA); @@ -1977,7 +2034,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[70] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1993,7 +2050,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[71] = jj_gen; + jj_la1[72] = jj_gen; break label_24; } jj_consume_token(COMMA); @@ -2007,7 +2064,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[72] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2020,7 +2077,13 @@ StringBuffer buff = new StringBuffer(); } static final public void Block() throws ParseException { - jj_consume_token(LBRACE); + try { + jj_consume_token(LBRACE); + } catch (ParseException e) { + errorMessage = "'{' expected"; + errorLevel = ERROR; + {if (true) throw e;} + } label_25: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2066,7 +2129,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[73] = jj_gen; + jj_la1[74] = jj_gen; break label_25; } BlockStatement(); @@ -2122,7 +2185,7 @@ StringBuffer buff = new StringBuffer(); MethodDeclaration(); break; default: - jj_la1[74] = jj_gen; + jj_la1[75] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2137,7 +2200,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; break label_26; } jj_consume_token(COMMA); @@ -2204,18 +2267,18 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[76] = jj_gen; + jj_la1[77] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; ; } break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2235,7 +2298,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; break label_27; } SwitchLabel(); @@ -2284,7 +2347,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; break label_28; } BlockStatement(); @@ -2305,7 +2368,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(COLON); break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2322,7 +2385,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; break label_29; } ElseIfStatement(); @@ -2333,7 +2396,7 @@ StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; ; } } @@ -2415,7 +2478,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; break label_30; } Statement(); @@ -2429,7 +2492,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2474,7 +2537,7 @@ StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2493,7 +2556,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(127); break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2514,7 +2577,7 @@ StringBuffer buff = new StringBuffer(); ForInit(); break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2542,7 +2605,7 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2558,7 +2621,7 @@ StringBuffer buff = new StringBuffer(); ForUpdate(); break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2581,7 +2644,7 @@ StringBuffer buff = new StringBuffer(); StatementExpressionList(); break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2597,7 +2660,7 @@ StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; break label_31; } jj_consume_token(COMMA); @@ -2616,7 +2679,7 @@ StringBuffer buff = new StringBuffer(); jj_consume_token(IDENTIFIER); break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2629,7 +2692,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); @@ -2661,7 +2724,7 @@ StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -2716,249 +2779,92 @@ StringBuffer buff = new StringBuffer(); return retval; } - static final private boolean jj_3R_43() { - if (jj_scan_token(BOOL)) return true; + 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_135() { + static final private boolean jj_3R_132() { Token xsp; xsp = jj_scanpos; - if (jj_3R_137()) { - jj_scanpos = xsp; - if (jj_3R_138()) { - jj_scanpos = xsp; - if (jj_3R_139()) { - jj_scanpos = xsp; if (jj_3R_140()) { jj_scanpos = xsp; - if (jj_3R_141()) 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; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_137() { - if (jj_scan_token(BANG)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_119()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_34() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_42()) { - jj_scanpos = xsp; - if (jj_3R_43()) { - jj_scanpos = xsp; - if (jj_3R_44()) { - jj_scanpos = xsp; - if (jj_3R_45()) { - jj_scanpos = xsp; - if (jj_3R_46()) { - jj_scanpos = xsp; - if (jj_3R_47()) { + if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_48()) { - jj_scanpos = xsp; - if (jj_3R_49()) return true; + 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; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_42() { - if (jj_scan_token(STRING)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_132() { - 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_134() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_136()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_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; - } - - static final private boolean jj_3R_130() { - 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_133() { - if (jj_scan_token(INCR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_136()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_127() { - if (jj_3R_135()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_126() { - if (jj_3R_134()) return true; + 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_3R_133()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_129() { - if (jj_scan_token(SLASH)) return true; + 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_39() { - if (jj_3R_52()) return true; + 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_53()) { jj_scanpos = xsp; break; } + if (jj_3R_132()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_131() { - if (jj_scan_token(PLUS)) return true; + static final private boolean jj_3R_129() { + 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_124() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_131()) { - jj_scanpos = xsp; - if (jj_3R_132()) 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_119()) return true; + static final private boolean jj_3R_133() { + 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_119() { + static final private boolean jj_3R_127() { Token xsp; xsp = jj_scanpos; - if (jj_3R_123()) { + if (jj_3R_133()) { jj_scanpos = xsp; - if (jj_3R_124()) { - jj_scanpos = xsp; - if (jj_3R_125()) { - jj_scanpos = xsp; - if (jj_3R_126()) { - jj_scanpos = xsp; - if (jj_3R_127()) return true; + if (jj_3R_134()) 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; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_123() { - if (jj_scan_token(AT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_119()) 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_118() { - if (jj_scan_token(RUNSIGNEDSHIFT)) 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; - return false; - } - - static final private boolean jj_3R_122() { - if (jj_scan_token(MINUS)) 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_3R_128() { - if (jj_scan_token(STAR)) return true; + static final private boolean jj_3R_124() { + 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() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_128()) { - jj_scanpos = xsp; - if (jj_3R_129()) { - jj_scanpos = xsp; - if (jj_3R_130()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_119()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - 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_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_113() { - 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_114() { - if (jj_3R_119()) return true; + 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_120()) { jj_scanpos = xsp; break; } + if (jj_3R_127()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -2972,7 +2878,7 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_174() { + static final private boolean jj_3R_176() { if (jj_3R_33()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; @@ -2984,62 +2890,59 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_117() { - if (jj_scan_token(RSIGNEDSHIFT)) return true; + static final private boolean jj_3R_128() { + 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() { - 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_115() { Token xsp; xsp = jj_scanpos; - if (jj_3R_121()) { + if (jj_3R_128()) { + jj_scanpos = xsp; + if (jj_3R_129()) { jj_scanpos = xsp; - if (jj_3R_122()) return true; + if (jj_3R_130()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_114()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_120()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_112() { - if (jj_scan_token(LE)) return true; + static final private boolean jj_3R_123() { + 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_163() { + 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_174()) jj_scanpos = xsp; + 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_108() { - if (jj_3R_114()) return true; + static final private boolean jj_3R_116() { + 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_175() { + static final private boolean jj_3R_177() { if (jj_scan_token(ARRAYASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_35()) return true; @@ -3052,115 +2955,138 @@ StringBuffer buff = new StringBuffer(); if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_175()) jj_scanpos = xsp; + 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_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_116() { - if (jj_scan_token(LSHIFT)) return true; + static final private boolean jj_3R_107() { + if (jj_3R_54()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_97() { - 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; + static final private boolean jj_3R_122() { + 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_109() { + static final private boolean jj_3R_117() { Token xsp; xsp = jj_scanpos; - if (jj_3R_116()) { + if (jj_3R_122()) { jj_scanpos = xsp; - if (jj_3R_117()) { + if (jj_3R_123()) { + jj_scanpos = xsp; + if (jj_3R_124()) { jj_scanpos = xsp; - if (jj_3R_118()) 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; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_108()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_116()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_111() { - if (jj_scan_token(GT)) return true; + static final private boolean jj_3R_119() { + 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_104() { - if (jj_3R_108()) return true; + static final private boolean jj_3R_114() { + if (jj_3R_116()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_109()) { jj_scanpos = xsp; break; } + if (jj_3R_117()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_68() { + static final private boolean jj_3R_69() { + if (jj_3R_87()) 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; + 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_63() { - if (jj_scan_token(DOLLAR)) 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_54()) return true; + return false; + } + + static final private boolean jj_3R_118() { + 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_110() { - if (jj_scan_token(LT)) 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_107()) jj_scanpos = xsp; + else 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_115() { Token xsp; xsp = jj_scanpos; - if (jj_3R_110()) { + if (jj_3R_118()) { jj_scanpos = xsp; - if (jj_3R_111()) { - jj_scanpos = xsp; - if (jj_3R_112()) { - jj_scanpos = xsp; - if (jj_3R_113()) return true; + if (jj_3R_119()) 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_104()) return true; + if (jj_3R_114()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_107() { - if (jj_scan_token(NE)) return true; + 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_90() { + static final private boolean jj_3R_112() { + if (jj_3R_114()) 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_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + 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_92() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_35()) return true; @@ -3175,23 +3101,11 @@ StringBuffer buff = new StringBuffer(); if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_97()) jj_scanpos = xsp; + if (jj_3R_106()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_102() { - if (jj_3R_104()) 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_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - static final private boolean jj_3R_61() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -3209,386 +3123,358 @@ StringBuffer buff = new StringBuffer(); jj_scanpos = xsp; if (jj_3R_62()) { jj_scanpos = xsp; - if (jj_3R_63()) return true; + if (jj_3R_63()) { + jj_scanpos = xsp; + if (jj_3R_64()) 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; return false; } - static final private boolean jj_3R_37() { - if (jj_scan_token(127)) return true; + static final private boolean jj_3R_113() { + 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_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_85() { - 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_3_6() { + if (jj_3R_38()) 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(EQ)) 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; + if (jj_3R_54()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_103() { + 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_106()) { + if (jj_3R_36()) { jj_scanpos = xsp; - if (jj_3R_107()) return true; + 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; - if (jj_3R_102()) return true; - 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_110() { + if (jj_3R_112()) 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_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_84() { + static final private boolean jj_3R_85() { 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_90()) jj_scanpos = xsp; + if (jj_3R_92()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_67() { + static final private boolean jj_3R_68() { Token xsp; xsp = jj_scanpos; - if (jj_3R_84()) { + if (jj_3R_85()) { jj_scanpos = xsp; - if (jj_3R_85()) return true; + if (jj_3R_86()) 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_100() { - if (jj_3R_102()) return true; + 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; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_103()) { jj_scanpos = xsp; break; } - 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; + static final private boolean jj_3R_111() { + 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_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_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_59() { - if (jj_3R_67()) return true; + static final private boolean jj_3R_179() { + 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_3_1()) { 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_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_101() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_100()) 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_68()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_98() { - if (jj_3R_100()) return true; + static final private boolean jj_3R_104() { + 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_101()) { jj_scanpos = xsp; break; } + if (jj_3R_111()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_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_178() { - if (jj_scan_token(COMMA)) 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_177() { - if (jj_3R_35()) return true; + static final private boolean jj_3R_59() { + if (jj_3R_68()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_178()) { jj_scanpos = xsp; break; } + if (jj_3_1()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_99() { - if (jj_scan_token(XOR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_98()) return true; + static final private boolean jj_3R_178() { + if (jj_3R_179()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_95() { - if (jj_3R_98()) return true; + static final private boolean jj_3R_105() { + if (jj_scan_token(BIT_OR)) 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_176() { - if (jj_3R_177()) return true; + if (jj_3R_104()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_173() { + static final private boolean jj_3R_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_176()) jj_scanpos = xsp; + 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; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_96() { - if (jj_scan_token(BIT_OR)) 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_95()) 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_91() { - if (jj_3R_95()) return true; + static final private boolean jj_3R_98() { + if (jj_3R_104()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_96()) { jj_scanpos = xsp; break; } + if (jj_3R_105()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_160() { + 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_165() { + 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_159() { + static final private boolean jj_3R_102() { Token xsp; xsp = jj_scanpos; - if (jj_3R_164()) { + if (jj_3R_108()) { jj_scanpos = xsp; - if (jj_3R_165()) return true; + if (jj_3R_109()) 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_164() { + static final private boolean jj_3R_108() { 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_153() { - if (jj_3R_160()) return true; + static final private boolean jj_3R_99() { + if (jj_scan_token(DOT)) 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(_ANDL)) return true; + if (jj_3R_98()) 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(DOT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_91()) return true; + static final private boolean jj_3R_101() { + 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_152() { - if (jj_3R_159()) return true; + static final private boolean jj_3R_97() { + if (jj_3R_103()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_86() { - if (jj_3R_91()) return true; + static final private boolean jj_3R_88() { + if (jj_3R_98()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_92()) { jj_scanpos = xsp; break; } + 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_151() { - if (jj_scan_token(STRING_LITERAL)) return true; + static final private boolean jj_3R_96() { + if (jj_3R_102()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_150() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + static final private boolean jj_3R_95() { + 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_146() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_149()) { - jj_scanpos = xsp; - if (jj_3R_150()) { - jj_scanpos = xsp; - if (jj_3R_151()) { - jj_scanpos = xsp; - if (jj_3R_152()) { - jj_scanpos = xsp; - if (jj_3R_153()) return true; + static final private boolean jj_3R_94() { + if (jj_scan_token(FLOATING_POINT_LITERAL)) 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; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_149() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + static final private boolean jj_3R_100() { + 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_55() { - if (jj_3R_35()) return true; + static final private boolean jj_3R_93() { + 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_93() { - if (jj_scan_token(SC_AND)) return true; + static final private boolean jj_3R_87() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_93()) { + jj_scanpos = xsp; + if (jj_3R_94()) { + jj_scanpos = xsp; + if (jj_3R_95()) { + jj_scanpos = xsp; + if (jj_3R_96()) { + jj_scanpos = xsp; + if (jj_3R_97()) 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; + } else 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_91() { 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_87() { + static final private boolean jj_3R_89() { Token xsp; xsp = jj_scanpos; - if (jj_3R_93()) { + if (jj_3R_100()) { jj_scanpos = xsp; - if (jj_3R_94()) return true; + if (jj_3R_101()) 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_86()) return true; + if (jj_3R_88()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_69() { - if (jj_3R_86()) return true; + 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_70() { + if (jj_3R_88()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_87()) { jj_scanpos = xsp; break; } + if (jj_3R_89()) { 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; @@ -3601,18 +3487,6 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_65() { - 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_40() { if (jj_scan_token(CLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -3632,281 +3506,279 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_169() { - if (jj_3R_32()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_88() { + static final private boolean jj_3R_90() { 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_70() { + static final private boolean jj_3R_71() { Token xsp; xsp = jj_scanpos; - if (jj_3R_88()) { + if (jj_3R_90()) { jj_scanpos = xsp; - if (jj_3R_89()) return true; + 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_69()) return true; + if (jj_3R_70()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_168() { - if (jj_3R_173()) 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_166() { + static final private boolean jj_3R_171() { + if (jj_3R_32()) return true; + 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; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_168() { Token xsp; xsp = jj_scanpos; - if (jj_3R_168()) { + if (jj_3R_170()) { jj_scanpos = xsp; - if (jj_3R_169()) return true; + if (jj_3R_171()) 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_64() { - if (jj_3R_69()) return true; + static final private boolean jj_3R_65() { + if (jj_3R_70()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_70()) { jj_scanpos = xsp; break; } + if (jj_3R_71()) { jj_scanpos = xsp; break; } 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_173() { if (jj_3R_59()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_171() { + static final private boolean jj_3R_172() { 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_167() { + static final private boolean jj_3R_169() { Token xsp; xsp = jj_scanpos; - if (jj_3R_171()) { + if (jj_3R_172()) { jj_scanpos = xsp; - if (jj_3R_172()) return true; + if (jj_3R_173()) 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_3_7() { - if (jj_3R_39()) return true; + static final private boolean jj_3R_57() { + if (jj_3R_65()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_66()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_156() { + static final private boolean jj_3R_162() { 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_64()) return true; + static final private boolean jj_3R_164() { + if (jj_scan_token(DECR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_65()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_158() { - if (jj_scan_token(DECR)) return true; + 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; } - static final private boolean jj_3R_161() { + static final private boolean jj_3R_165() { 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_155() { + static final private boolean jj_3R_161() { Token xsp; xsp = jj_scanpos; - if (jj_3R_161()) jj_scanpos = xsp; + 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; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_167()) return true; + if (jj_3R_169()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_147() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_154()) { - jj_scanpos = xsp; - if (jj_3R_155()) { - jj_scanpos = xsp; - if (jj_3R_156()) return true; + static final private boolean jj_3R_83() { + if (jj_scan_token(ORASSIGN)) 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_154() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_82() { + if (jj_scan_token(XORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_83() { - if (jj_scan_token(DOTASSIGN)) return true; + 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; 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_82() { - if (jj_scan_token(ORASSIGN)) return true; + static final private boolean jj_3R_160() { + 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_81() { - if (jj_scan_token(XORASSIGN)) return true; + if (jj_scan_token(ANDASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_80() { - if (jj_scan_token(ANDASSIGN)) return true; + 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_79() { - if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true; + if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_143() { - if (jj_scan_token(ARRAY)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_163()) return true; + static final private boolean jj_3R_78() { + if (jj_scan_token(LSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_78() { - if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; + static final private boolean jj_3R_77() { + if (jj_scan_token(MINUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_77() { - if (jj_scan_token(LSHIFTASSIGN)) return true; + static final private boolean jj_3R_155() { + if (jj_scan_token(ARRAY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_167()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_148() { + static final private boolean jj_3R_159() { Token xsp; xsp = jj_scanpos; - if (jj_3R_157()) { + if (jj_3R_163()) { jj_scanpos = xsp; - if (jj_3R_158()) return true; + if (jj_3R_164()) 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_157() { + 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_76() { - if (jj_scan_token(MINUSASSIGN)) return true; + static final private boolean jj_3R_166() { + if (jj_3R_168()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_162() { - if (jj_3R_166()) return true; + static final private boolean jj_3R_76() { + if (jj_scan_token(PLUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_75() { - if (jj_scan_token(PLUSASSIGN)) return true; + if (jj_scan_token(REMASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_142() { - if (jj_3R_147()) return true; + static final private boolean jj_3R_154() { + if (jj_3R_158()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_162()) { jj_scanpos = xsp; break; } + if (jj_3R_166()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } static final private boolean jj_3R_74() { - if (jj_scan_token(REMASSIGN)) return true; + if (jj_scan_token(SLASHASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_73() { - if (jj_scan_token(SLASHASSIGN)) return true; + if (jj_scan_token(STARASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_170() { - if (jj_3R_166()) return true; + static final private boolean jj_3R_175() { + if (jj_3R_168()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_72() { - if (jj_scan_token(STARASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_71() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_66() { + static final private boolean jj_3R_67() { Token xsp; xsp = jj_scanpos; - if (jj_3R_71()) { - jj_scanpos = xsp; if (jj_3R_72()) { jj_scanpos = xsp; if (jj_3R_73()) { @@ -3929,7 +3801,9 @@ StringBuffer buff = new StringBuffer(); jj_scanpos = xsp; if (jj_3R_82()) { jj_scanpos = xsp; - if (jj_3R_83()) return true; + if (jj_3R_83()) { + jj_scanpos = xsp; + if (jj_3R_84()) 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; @@ -3951,25 +3825,25 @@ 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_167()) return true; + if (jj_3R_169()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_170()) { jj_scanpos = xsp; break; } + if (jj_3R_175()) { jj_scanpos = xsp; break; } 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_148() { Token xsp; xsp = jj_scanpos; if (jj_3_4()) { jj_scanpos = xsp; - if (jj_3R_142()) { + if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_143()) return true; + if (jj_3R_155()) 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; @@ -3977,29 +3851,29 @@ StringBuffer buff = new StringBuffer(); } static final private boolean jj_3R_58() { - if (jj_3R_66()) return true; + if (jj_3R_67()) 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_145() { - if (jj_3R_136()) 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_148()) jj_scanpos = xsp; + if (jj_3R_58()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_51() { - if (jj_3R_57()) return true; + static final private boolean jj_3R_157() { + if (jj_3R_148()) 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_159()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4021,14 +3895,14 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_144() { + static final private boolean jj_3R_156() { 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_119()) return true; + if (jj_3R_131()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4055,7 +3929,13 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_141() { + static final private boolean jj_3R_47() { + if (jj_scan_token(FLOAT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_153() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_35()) return true; @@ -4065,14 +3945,10 @@ 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_53() { + if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_140() { - if (jj_3R_146()) return true; + if (jj_3R_52()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4083,8 +3959,8 @@ StringBuffer buff = new StringBuffer(); return false; } - static final private boolean jj_3R_139() { - if (jj_3R_145()) return true; + static final private boolean jj_3R_152() { + if (jj_3R_87()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4095,15 +3971,221 @@ StringBuffer buff = new StringBuffer(); return false; } + static final private boolean jj_3R_151() { + if (jj_3R_157()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_44() { if (jj_scan_token(BOOLEAN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } + static final private boolean jj_3R_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() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_149()) { + jj_scanpos = xsp; + if (jj_3R_150()) { + jj_scanpos = xsp; + if (jj_3R_151()) { + jj_scanpos = xsp; + if (jj_3R_152()) { + jj_scanpos = xsp; + if (jj_3R_153()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } 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_149() { + 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_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_34() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_42()) { + jj_scanpos = xsp; + if (jj_3R_43()) { + jj_scanpos = xsp; + if (jj_3R_44()) { + jj_scanpos = xsp; + if (jj_3R_45()) { + jj_scanpos = xsp; + if (jj_3R_46()) { + jj_scanpos = xsp; + if (jj_3R_47()) { + jj_scanpos = xsp; + if (jj_3R_48()) { + jj_scanpos = xsp; + if (jj_3R_49()) 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; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_42() { + if (jj_scan_token(STRING)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_144() { + 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(DECR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_148()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_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_142() { + 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_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_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_139() { + if (jj_3R_147()) 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; + 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; + 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; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_143() { + 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() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_143()) { + jj_scanpos = xsp; if (jj_3R_144()) 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_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_131() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_135()) { + jj_scanpos = xsp; + if (jj_3R_136()) { + jj_scanpos = xsp; + if (jj_3R_137()) { + jj_scanpos = xsp; + if (jj_3R_138()) { + jj_scanpos = xsp; + if (jj_3R_139()) 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; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_135() { + 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_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_130() { + 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() { + if (jj_scan_token(MINUS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4117,11 +4199,29 @@ 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[96]; - static final private int[] jj_la1_0 = {0x2,0x7fcb0000,0x0,0x60000,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc00000,0x0,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,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,}; - static final private int[] jj_la1_1 = {0x0,0xd76a4,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x43200,0x0,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,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,}; - static final private int[] jj_la1_2 = {0x0,0x11914451,0x0,0x0,0x0,0x200000,0x2000000,0x10000,0x1000000,0x10000,0x1010400,0x0,0x11804451,0x110000,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,0x1110400,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,}; - static final private int[] jj_la1_3 = {0x0,0x400009e0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x400009e0,0x0,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,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 int[] jj_la1 = new int[97]; + static private int[] jj_la1_0; + static private int[] jj_la1_1; + static private int[] jj_la1_2; + static private int[] jj_la1_3; + static { + jj_la1_0(); + jj_la1_1(); + jj_la1_2(); + 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,}; + } + 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,}; + } + 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,}; + } + 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,}; + } static final private JJCalls[] jj_2_rtns = new JJCalls[7]; static private boolean jj_rescan = false; static private int jj_gc = 0; @@ -4139,7 +4239,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 96; i++) jj_la1[i] = -1; + for (int i = 0; i < 97; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4149,7 +4249,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 96; i++) jj_la1[i] = -1; + for (int i = 0; i < 97; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4166,7 +4266,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 96; i++) jj_la1[i] = -1; + for (int i = 0; i < 97; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4176,7 +4276,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 96; i++) jj_la1[i] = -1; + for (int i = 0; i < 97; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4192,7 +4292,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 96; i++) jj_la1[i] = -1; + for (int i = 0; i < 97; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4201,7 +4301,7 @@ StringBuffer buff = new StringBuffer(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 96; i++) jj_la1[i] = -1; + for (int i = 0; i < 97; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4306,7 +4406,7 @@ StringBuffer buff = new StringBuffer(); } } - static final public ParseException generateParseException() { + static public ParseException generateParseException() { jj_expentries.removeAllElements(); boolean[] la1tokens = new boolean[128]; for (int i = 0; i < 128; i++) { @@ -4316,7 +4416,7 @@ StringBuffer buff = new StringBuffer(); la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 96; i++) { + for (int i = 0; i < 97; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< ( ClassBodyDeclaration() )* + try { + + } catch (ParseException e) { + errorMessage = "'{' expected"; + errorLevel = ERROR; + throw e; + } + ( ClassBodyDeclaration() )* + try { + + } catch (ParseException e) { + errorMessage = "'var', 'function' or '}' expected"; + errorLevel = ERROR; + throw e; + } } void ClassBodyDeclaration() : @@ -580,23 +576,50 @@ void ClassBodyDeclaration() : } void FieldDeclaration() : -{} { - VariableDeclarator() ( VariableDeclarator() )* + PHPVarDeclaration variableDeclaration; +} +{ + variableDeclaration = VariableDeclarator() + {currentSegment.add(variableDeclaration);} + ( + variableDeclaration = VariableDeclarator() + {currentSegment.add(variableDeclaration);} + )* + try { + + } catch (ParseException e) { + errorMessage = "';' expected after variable declaration"; + errorLevel = ERROR; + throw e; + } } -String VariableDeclarator() : +PHPVarDeclaration VariableDeclarator() : { - String expr; - StringBuffer buff = new StringBuffer(); + String varName; + String varValue = null; + int pos; } { - expr = VariableDeclaratorId() - {buff.append(expr);} - [ expr = VariableInitializer() - {buff.append("=").append(expr);} + varName = VariableDeclaratorId() + {pos = jj_input_stream.tokenBegin;} + [ + + try { + varValue = VariableInitializer() + } catch (ParseException e) { + errorMessage = "Literal expression expected in variable initializer"; + errorLevel = ERROR; + throw e; + } ] - {return buff.toString();} + { + if (varValue == null) { + return new PHPVarDeclaration(currentSegment,varName,pos); + } + return new PHPVarDeclaration(currentSegment,varName,pos,varValue); + } } String VariableDeclaratorId() : @@ -605,12 +628,18 @@ String VariableDeclaratorId() : StringBuffer buff = new StringBuffer(); } { - expr = Variable() - {buff.append(expr);} - ( LOOKAHEAD(2) expr = VariableSuffix() - {buff.append(expr);} - )* - {return buff.toString();} + try { + expr = Variable() + {buff.append(expr);} + ( LOOKAHEAD(2) expr = VariableSuffix() + {buff.append(expr);} + )* + {return buff.toString();} + } catch (ParseException e) { + errorMessage = "'$' expected for variable identifier"; + errorLevel = ERROR; + throw e; + } } String Variable(): @@ -646,9 +675,18 @@ Token token; return token.image; } return token + "{" + expr + "}"; - }| + } +| expr = VariableName() {return "$" + expr;} +| + token = [expr = VariableName()] + { + if (expr == null) { + return token.image; + } + return token.image + expr; + } } String VariableInitializer() : @@ -656,7 +694,7 @@ String VariableInitializer() : String expr; } { - expr = Expression() + expr = Literal() {return expr;} } @@ -701,7 +739,7 @@ void MethodDeclaration() : currentSegment.add(functionDeclaration); currentSegment = functionDeclaration; } - ( Block() | ) + Block() { currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); } @@ -715,10 +753,12 @@ PHPFunctionDeclaration MethodDeclarator() : int pos = jj_input_stream.bufpos; } { - [ {methodDeclaration.append("&");}] - identifier = formalParameters = FormalParameters() + [ {methodDeclaration.append("&");} ] + identifier = + {methodDeclaration.append(identifier);} + formalParameters = FormalParameters() { - methodDeclaration.append(identifier).append(formalParameters); + methodDeclaration.append(formalParameters); return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos); } } @@ -726,13 +766,30 @@ PHPFunctionDeclaration MethodDeclarator() : String FormalParameters() : { String expr; - StringBuffer buff = new StringBuffer("("); + final StringBuffer buff = new StringBuffer("("); } { - [ expr = FormalParameter() {buff.append(expr);} - ( expr = FormalParameter() - {buff.append(",").append(expr);} - )* ] + try { + + } catch (ParseException e) { + errorMessage = "Formal parameter expected after function identifier"; + errorLevel = ERROR; + jj_consume_token(token.kind); + } + [ expr = FormalParameter() + {buff.append(expr);} + ( + expr = FormalParameter() + {buff.append(",").append(expr);} + )* + ] + try { + + } catch (ParseException e) { + errorMessage = "')' expected"; + errorLevel = ERROR; + throw e; + } { buff.append(")"); return buff.toString(); @@ -741,13 +798,13 @@ String FormalParameters() : String FormalParameter() : { - String expr; + PHPVarDeclaration variableDeclaration; StringBuffer buff = new StringBuffer(); } { - [ {buff.append("&");}] expr = VariableDeclarator() + [ {buff.append("&");}] variableDeclaration = VariableDeclarator() { - buff.append(expr); + buff.append(variableDeclaration.toString()); return buff.toString(); } } @@ -1076,10 +1133,9 @@ String AdditiveExpression() : String MultiplicativeExpression() : { - String expr; + String expr, expr2; Token operator; - String expr2; - StringBuffer buff = new StringBuffer();} + final StringBuffer buff = new StringBuffer();} { expr = UnaryExpression() {buff.append(expr);} @@ -1096,7 +1152,7 @@ String MultiplicativeExpression() : String UnaryExpression() : { String expr; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = UnaryExpression() @@ -1115,7 +1171,7 @@ String UnaryExpression() : {return expr;} | expr = UnaryExpressionNotPlusMinus() - {return buff.toString();} + {return expr;} } String PreIncrementExpression() : @@ -1187,7 +1243,7 @@ String PrimaryExpression() : { Token identifier; String expr; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { LOOKAHEAD(2) @@ -1199,12 +1255,8 @@ String PrimaryExpression() : )* {return buff.toString();} | - expr = PrimaryPrefix() - {buff.append(expr);} - ( - expr = PrimarySuffix() - {buff.append(expr);} - )* + expr = PrimaryPrefix() {buff.append(expr);} + ( expr = PrimarySuffix() {buff.append(expr);} )* {return buff.toString();} | expr = ArrayInitializer() @@ -1225,7 +1277,7 @@ String PrimaryPrefix() : if (token == null) { return "new " + expr; } - return "new " + expr; + return "new &" + expr; } | expr = VariableDeclaratorId() @@ -1407,7 +1459,7 @@ void Statement() : | EchoStatement() | - IncludeStatement() + [] IncludeStatement() | StaticStatement() | @@ -1415,15 +1467,35 @@ void Statement() : } void IncludeStatement() : -{} { - Expression() ( | "?>") + Token token; + String expr; + int pos; +} +{ + token = + {pos = token.beginLine;} + expr = Expression() + {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr));} + ( | "?>") | - Expression() ( | "?>") + token = + {pos = token.beginLine;} + expr = Expression() + {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr));} + ( | "?>") | - Expression() ( | "?>") + token = + {pos = token.beginLine;} + expr = Expression() + {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr));} + ( | "?>") | - Expression() ( | "?>") + token = + {pos = token.beginLine;} + expr = Expression() + {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr));} + ( | "?>") } String PrintExpression() : @@ -1473,7 +1545,15 @@ void LabeledStatement() : void Block() : {} { - ( BlockStatement() )* + try { + + } catch (ParseException e) { + errorMessage = "'{' expected"; + errorLevel = ERROR; + throw e; + } + ( BlockStatement() )* + } void BlockStatement() : diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java index ee76b81..bdf9f88 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java @@ -9,6 +9,7 @@ import org.eclipse.ui.texteditor.MarkerUtilities; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; +import net.sourceforge.phpdt.internal.compiler.parser.Parser; import java.text.MessageFormat; import java.util.Hashtable; @@ -21,6 +22,9 @@ public abstract class PHPParserSuperclass { // strings for external parser call private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$ private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$ + public static final int ERROR = 2; + public static final int WARNING = 1; + public static final int INFO = 0; /** * Call the php parse command ( php -l -f <filename> ) @@ -121,4 +125,32 @@ public abstract class PHPParserSuperclass { public abstract void setFileToParse(IFile fileToParse); public abstract void parse(String s) throws CoreException; + + public static void setMarker( + IFile file, + String message, + int charStart, + int charEnd, + int errorLevel) + throws CoreException { + if (file != null) { + Hashtable attributes = new Hashtable(); + MarkerUtilities.setMessage(attributes, message); + switch (errorLevel) { + case Parser.ERROR : + attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); + break; + case Parser.WARNING : + attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); + break; + case Parser.INFO : + attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); + break; + } + MarkerUtilities.setCharStart(attributes, charStart); + MarkerUtilities.setCharEnd(attributes, charEnd); + // setLineNumber(attributes, lineNumber); + MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); + } + } } diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 18f0cf2..ad97563 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -14,6 +14,8 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; import net.sourceforge.phpdt.internal.compiler.parser.PHPSegmentWithChildren; import net.sourceforge.phpdt.internal.compiler.parser.PHPFunctionDeclaration; import net.sourceforge.phpdt.internal.compiler.parser.PHPClassDeclaration; +import net.sourceforge.phpdt.internal.compiler.parser.PHPVarDeclaration; +import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration; public class PHPParserTokenManager implements PHPParserConstants { @@ -1689,7 +1691,7 @@ static final long[] jjtoSpecial = { static final long[] jjtoMore = { 0x8e00L, 0x0L, 0x0L, }; -static private SimpleCharStream input_stream; +static protected SimpleCharStream input_stream; static private final int[] jjrounds = new int[56]; static private final int[] jjstateSet = new int[112]; static StringBuffer image; @@ -1734,7 +1736,7 @@ static public void SwitchTo(int lexState) curLexState = lexState; } -static private final Token jjFillToken() +static protected Token jjFillToken() { Token t = Token.newToken(jjmatchedKind); t.kind = jjmatchedKind; @@ -1754,7 +1756,7 @@ static int jjround; static int jjmatchedPos; static int jjmatchedKind; -public static final Token getNextToken() +public static Token getNextToken() { int kind; Token specialToken = null; @@ -1896,7 +1898,7 @@ public static final Token getNextToken() } } -static final void SkipLexicalActions(Token matchedToken) +static void SkipLexicalActions(Token matchedToken) { switch(jjmatchedKind) { @@ -1904,7 +1906,7 @@ static final void SkipLexicalActions(Token matchedToken) break; } } -static final void MoreLexicalActions() +static void MoreLexicalActions() { jjimageLen += (lengthOfMatch = jjmatchedPos + 1); switch(jjmatchedKind) diff --git a/net.sourceforge.phpeclipse/src/test/ParseException.java b/net.sourceforge.phpeclipse/src/test/ParseException.java index ee14c39..d8a2f6a 100644 --- a/net.sourceforge.phpeclipse/src/test/ParseException.java +++ b/net.sourceforge.phpeclipse/src/test/ParseException.java @@ -1,4 +1,4 @@ -/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 2.1 */ +/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */ package test; /** diff --git a/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java b/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java index 0049aa7..4a1c194 100644 --- a/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java +++ b/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java @@ -1,4 +1,4 @@ -/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 2.1 */ +/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 3.0 */ package test; /** @@ -6,29 +6,29 @@ package test; * contain only ASCII characters (without unicode processing). */ -public final class SimpleCharStream +public class SimpleCharStream { public static final boolean staticFlag = true; static int bufsize; static int available; static int tokenBegin; static public int bufpos = -1; - static private int bufline[]; - static private int bufcolumn[]; + static protected int bufline[]; + static protected int bufcolumn[]; - static private int column = 0; - static private int line = 1; + static protected int column = 0; + static protected int line = 1; - static private boolean prevCharIsCR = false; - static private boolean prevCharIsLF = false; + static protected boolean prevCharIsCR = false; + static protected boolean prevCharIsLF = false; - static private java.io.Reader inputStream; + static protected java.io.Reader inputStream; - static private char[] buffer; - static private int maxNextCharInd = 0; - static private int inBuf = 0; + static protected char[] buffer; + static protected int maxNextCharInd = 0; + static protected int inBuf = 0; - static private final void ExpandBuff(boolean wrapAround) + static protected void ExpandBuff(boolean wrapAround) { char[] newbuffer = new char[bufsize + 2048]; int newbufline[] = new int[bufsize + 2048]; @@ -78,7 +78,7 @@ public final class SimpleCharStream tokenBegin = 0; } - static private final void FillBuff() throws java.io.IOException + static protected void FillBuff() throws java.io.IOException { if (maxNextCharInd == available) { @@ -123,7 +123,7 @@ public final class SimpleCharStream } } - static public final char BeginToken() throws java.io.IOException + static public char BeginToken() throws java.io.IOException { tokenBegin = -1; char c = readChar(); @@ -132,7 +132,7 @@ public final class SimpleCharStream return c; } - static private final void UpdateLineColumn(char c) + static protected void UpdateLineColumn(char c) { column++; @@ -172,7 +172,7 @@ public final class SimpleCharStream bufcolumn[bufpos] = column; } - static public final char readChar() throws java.io.IOException + static public char readChar() throws java.io.IOException { if (inBuf > 0) { @@ -198,7 +198,7 @@ public final class SimpleCharStream * @see #getEndColumn */ - static public final int getColumn() { + static public int getColumn() { return bufcolumn[bufpos]; } @@ -207,27 +207,27 @@ public final class SimpleCharStream * @see #getEndLine */ - static public final int getLine() { + static public int getLine() { return bufline[bufpos]; } - static public final int getEndColumn() { + static public int getEndColumn() { return bufcolumn[bufpos]; } - static public final int getEndLine() { + static public int getEndLine() { return bufline[bufpos]; } - static public final int getBeginColumn() { + static public int getBeginColumn() { return bufcolumn[tokenBegin]; } - static public final int getBeginLine() { + static public int getBeginLine() { return bufline[tokenBegin]; } - static public final void backup(int amount) { + static public void backup(int amount) { inBuf += amount; if ((bufpos -= amount) < 0) @@ -322,7 +322,7 @@ public final class SimpleCharStream { ReInit(dstream, startline, startcolumn, 4096); } - static public final String GetImage() + static public String GetImage() { if (bufpos >= tokenBegin) return new String(buffer, tokenBegin, bufpos - tokenBegin + 1); @@ -331,7 +331,7 @@ public final class SimpleCharStream new String(buffer, 0, bufpos + 1); } - static public final char[] GetSuffix(int len) + static public char[] GetSuffix(int len) { char[] ret = new char[len]; diff --git a/net.sourceforge.phpeclipse/src/test/Token.java b/net.sourceforge.phpeclipse/src/test/Token.java index c579554..5f90280 100644 --- a/net.sourceforge.phpeclipse/src/test/Token.java +++ b/net.sourceforge.phpeclipse/src/test/Token.java @@ -1,4 +1,4 @@ -/* Generated By:JavaCC: Do not edit this line. Token.java Version 2.1 */ +/* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */ package test; /** @@ -53,7 +53,7 @@ public class Token { /** * Returns the image. */ - public final String toString() + public String toString() { return image; } diff --git a/net.sourceforge.phpeclipse/src/test/TokenMgrError.java b/net.sourceforge.phpeclipse/src/test/TokenMgrError.java index a02f7c1..64cc02b 100644 --- a/net.sourceforge.phpeclipse/src/test/TokenMgrError.java +++ b/net.sourceforge.phpeclipse/src/test/TokenMgrError.java @@ -1,4 +1,4 @@ -/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 2.1 */ +/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */ package test; public class TokenMgrError extends Error @@ -94,7 +94,7 @@ public class TokenMgrError extends Error * curchar : the offending character * Note: You can customize the lexical error message by modifying this method. */ - private static final String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { + protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { return("Lexical error at line " + errorLine + ", column " + errorColumn + ". Encountered: " + -- 1.7.1