From 3295ff6b4a0e11dc14200972ee4810220406432e Mon Sep 17 00:00:00 2001 From: kpouer Date: Mon, 7 Apr 2003 09:03:20 +0000 Subject: [PATCH] A lot of changes --- net.sourceforge.phpeclipse/src/test/PHPParser.java | 2935 ++++++++++++-------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 497 ++-- .../src/test/PHPParserConstants.java | 192 +- .../src/test/PHPParserTestCase2.java | 23 +- .../src/test/PHPParserTokenManager.java | 794 +++--- net.sourceforge.phpeclipse/src/test/PHPVar.java | 96 + 6 files changed, 2632 insertions(+), 1905 deletions(-) create mode 100644 net.sourceforge.phpeclipse/src/test/PHPVar.java diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 931b4b3..43f38f3 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -8,22 +8,19 @@ import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; +import java.util.ArrayList; +import java.util.Enumeration; import java.io.StringReader; import java.io.*; import java.text.MessageFormat; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -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; +import net.sourceforge.phpdt.internal.compiler.parser.*; /** * A new php parser. - * This php parser is inspired by the Java 1.2 grammar example + * This php parser is inspired by the Java 1.2 grammar example * given with JavaCC. You can get JavaCC at http://www.webgain.com * You can test the parser with the PHPParserTestCase2.java * @author Matthieu Casanova @@ -40,6 +37,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$ PHPOutlineInfo outlineInfo; + private static PHPFunctionDeclaration currentFunction; + /** The error level of the current ParseException. */ private static int errorLevel = ERROR; /** The message of the current ParseException. If it's null it's because the parse exception wasn't handled */ @@ -80,8 +79,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon phpFile(); } catch (FileNotFoundException e) { e.printStackTrace(); //To change body of catch statement use Options | File Templates. - } catch (ParseException e) { - e.printStackTrace(); //To change body of catch statement use Options | File Templates. } } @@ -278,6 +275,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -286,7 +284,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -324,27 +321,25 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } jj_consume_token(0); } catch (TokenMgrError e) { + PHPeclipsePlugin.log(e); + errorStart = SimpleCharStream.getPosition(); + errorEnd = errorStart + 1; errorMessage = e.getMessage(); errorLevel = ERROR; {if (true) throw generateParseException();} } } +/** + * A php block is a + * or + * or + */ static final public void PhpBlock() throws ParseException { final int start = jj_input_stream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPECHOSTART: - jj_consume_token(PHPECHOSTART); - Expression(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - default: - jj_la1[1] = jj_gen; - ; - } - jj_consume_token(PHPEND); + phpEchoBlock(); break; case PHPSTARTSHORT: case PHPSTARTLONG: @@ -354,6 +349,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -362,7 +358,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -411,13 +406,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } break; default: - jj_la1[2] = jj_gen; + jj_la1[1] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[3] = jj_gen; + jj_la1[2] = jj_gen; ; } Php(); @@ -432,12 +427,26 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } break; default: - jj_la1[4] = jj_gen; + jj_la1[3] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } + static final public void phpEchoBlock() throws ParseException { + jj_consume_token(PHPECHOSTART); + Expression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + default: + jj_la1[4] = jj_gen; + ; + } + jj_consume_token(PHPEND); + } + static final public void Php() throws ParseException { label_2: while (true) { @@ -447,6 +456,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -455,7 +465,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -504,8 +513,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -570,6 +579,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } +/** + * A class can contain only methods and fields. + */ static final public void ClassBodyDeclaration() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FUNCTION: @@ -585,6 +597,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } +/** + * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;. + */ static final public void FieldDeclaration() throws ParseException { PHPVarDeclaration variableDeclaration; jj_consume_token(VAR); @@ -611,7 +626,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon try { jj_consume_token(SEMICOLON); } catch (ParseException e) { - errorMessage = "';' expected after variable declaration"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -620,8 +635,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } static final public PHPVarDeclaration VariableDeclarator() throws ParseException { - final String varName; - final String varValue; + final String varName, varValue; final int pos = jj_input_stream.getPosition(); varName = VariableDeclaratorId(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -629,7 +643,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_consume_token(ASSIGN); try { varValue = VariableInitializer(); - {if (true) return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} + {if (true) return new PHPVarDeclaration(currentSegment,varName.substring(1),pos,varValue);} } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; @@ -690,6 +704,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ; } if (expr == null) { + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); + if (var != null) { + var.getVariable().setUsed(true); + } + } {if (true) return token.image;} } {if (true) return token + "{" + expr + "}";} @@ -730,6 +750,12 @@ final Token token; ; } if (expr == null) { + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image); + if (var != null) { + var.getVariable().setUsed(true); + } + } {if (true) return token.image;} } {if (true) return token + "{" + expr + "}";} @@ -737,11 +763,23 @@ final Token token; case DOLLAR: jj_consume_token(DOLLAR); expr = VariableName(); - {if (true) return "$" + expr;} + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(expr); + if (var != null) { + var.getVariable().setUsed(true); + } + } + {if (true) return "$" + expr;} break; case DOLLAR_ID: token = jj_consume_token(DOLLAR_ID); - {if (true) return token.image + expr;} + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); + if (var != null) { + var.getVariable().setUsed(true); + } + } + {if (true) return token.image + expr;} break; default: jj_la1[14] = jj_gen; @@ -837,8 +875,8 @@ final StringBuffer buff = new StringBuffer("("); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: - case PRINT: case LIST: + case PRINT: case NEW: case NULL: case TRUE: @@ -875,15 +913,29 @@ final StringBuffer buff = new StringBuffer("("); jj_la1[19] = jj_gen; ; } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + jj_consume_token(COMMA); + buff.append(","); + break; + default: + jj_la1[20] = jj_gen; + ; + } jj_consume_token(RPAREN); buff.append(")"); {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } +/** + * A Method Declaration. + * function MetodDeclarator() Block() + */ static final public void MethodDeclaration() throws ParseException { final PHPFunctionDeclaration functionDeclaration; - jj_consume_token(FUNCTION); + Token functionToken; + functionToken = jj_consume_token(FUNCTION); try { functionDeclaration = MethodDeclarator(); } catch (ParseException e) { @@ -900,20 +952,39 @@ final StringBuffer buff = new StringBuffer("("); currentSegment.add(functionDeclaration); currentSegment = functionDeclaration; } + currentFunction = functionDeclaration; Block(); + Hashtable parameters = currentFunction.getParameters(); + Enumeration vars = parameters.elements(); + while (vars.hasMoreElements()) { + PHPVarDeclaration o = (PHPVarDeclaration) vars.nextElement(); + if (!o.getVariable().isUsed()) { + try { + setMarker(fileToParse, + "Parameter "+o.getVariable().getName()+" is never used in function", + functionToken.beginLine, + WARNING, + "Line " + token.beginLine); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } + } + currentFunction = null; if (currentSegment != null) { currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); } } /** - * A MethodDeclarator contains [&] IDENTIFIER(parameters ...). + * A MethodDeclarator. + * [&] IDENTIFIER(parameters ...). * @return a function description for the outline */ static final public PHPFunctionDeclaration MethodDeclarator() throws ParseException { final Token identifier; final StringBuffer methodDeclaration = new StringBuffer(); - final String formalParameters; + final Hashtable formalParameters; final int pos = jj_input_stream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: @@ -921,24 +992,29 @@ final StringBuffer buff = new StringBuffer("("); methodDeclaration.append("&"); break; default: - jj_la1[20] = jj_gen; + jj_la1[21] = jj_gen; ; } identifier = jj_consume_token(IDENTIFIER); - methodDeclaration.append(identifier); formalParameters = FormalParameters(); - methodDeclaration.append(formalParameters); - {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos);} + methodDeclaration.append(identifier); + {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters);} throw new Error("Missing return statement in function"); } - static final public String FormalParameters() throws ParseException { +/** + * FormalParameters follows method identifier. + * (FormalParameter()) + */ + static final public Hashtable FormalParameters() throws ParseException { String expr; final StringBuffer buff = new StringBuffer("("); + PHPVarDeclaration var; + final Hashtable parameters = new Hashtable(); try { jj_consume_token(LPAREN); } catch (ParseException e) { - errorMessage = "Formal parameter expected after function identifier"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -948,8 +1024,8 @@ final StringBuffer buff = new StringBuffer("("); case DOLLAR: case BIT_AND: case DOLLAR_ID: - expr = FormalParameter(); - buff.append(expr); + var = FormalParameter(); + parameters.put(var.getVariable().getName(),var); label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -957,16 +1033,16 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[21] = jj_gen; + jj_la1[22] = jj_gen; break label_7; } jj_consume_token(COMMA); - expr = FormalParameter(); - buff.append(",").append(expr); + var = FormalParameter(); + parameters.put(var.getVariable().getName(),var); } break; default: - jj_la1[22] = jj_gen; + jj_la1[23] = jj_gen; ; } try { @@ -978,26 +1054,30 @@ final StringBuffer buff = new StringBuffer("("); errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} } - buff.append(")"); - {if (true) return buff.toString();} + {if (true) return parameters;} throw new Error("Missing return statement in function"); } - static final public String FormalParameter() throws ParseException { +/** + * A formal parameter. + * $varname[=value] (,$varname[=value]) + */ + static final public PHPVarDeclaration FormalParameter() throws ParseException { final PHPVarDeclaration variableDeclaration; - final StringBuffer buff = new StringBuffer(); + Token token = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: - jj_consume_token(BIT_AND); - buff.append("&"); + token = jj_consume_token(BIT_AND); break; default: - jj_la1[23] = jj_gen; + jj_la1[24] = jj_gen; ; } variableDeclaration = VariableDeclarator(); - buff.append(variableDeclaration.toString()); - {if (true) return buff.toString();} + if (token != null) { + variableDeclaration.getVariable().setPrefix("@"); + } + {if (true) return variableDeclaration;} throw new Error("Missing return statement in function"); } @@ -1040,7 +1120,7 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return "object";} break; default: - jj_la1[24] = jj_gen; + jj_la1[25] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1099,6 +1179,9 @@ final StringBuffer buff = new StringBuffer("("); expr2 = Expression(); {if (true) return expr + assignOperator + expr2;} } catch (ParseException e) { + if (errorMessage != null) { + {if (true) throw e;} + } errorMessage = "expression expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; @@ -1107,13 +1190,13 @@ final StringBuffer buff = new StringBuffer("("); } break; default: - jj_la1[25] = jj_gen; + jj_la1[26] = jj_gen; ; } {if (true) return expr;} break; default: - jj_la1[26] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1175,7 +1258,7 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return "~=";} break; default: - jj_la1[27] = jj_gen; + jj_la1[28] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1195,7 +1278,7 @@ final StringBuffer buff = new StringBuffer("("); expr3 = ConditionalExpression(); break; default: - jj_la1[28] = jj_gen; + jj_la1[29] = jj_gen; ; } if (expr3 == null) { @@ -1220,7 +1303,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[29] = jj_gen; + jj_la1[30] = jj_gen; break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1231,7 +1314,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(_ORL); break; default: - jj_la1[30] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1257,7 +1340,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[31] = jj_gen; + jj_la1[32] = jj_gen; break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1268,7 +1351,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(_ANDL); break; default: - jj_la1[32] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1292,7 +1375,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[33] = jj_gen; + jj_la1[34] = jj_gen; break label_10; } jj_consume_token(DOT); @@ -1315,7 +1398,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[34] = jj_gen; + jj_la1[35] = jj_gen; break label_11; } jj_consume_token(BIT_OR); @@ -1338,7 +1421,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[35] = jj_gen; + jj_la1[36] = jj_gen; break label_12; } jj_consume_token(XOR); @@ -1362,7 +1445,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[36] = jj_gen; + jj_la1[37] = jj_gen; break label_13; } jj_consume_token(BIT_AND); @@ -1390,7 +1473,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[37] = jj_gen; + jj_la1[38] = jj_gen; break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1410,7 +1493,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(TRIPLEEQUAL); break; default: - jj_la1[38] = jj_gen; + jj_la1[39] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1446,7 +1529,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[39] = jj_gen; + jj_la1[40] = jj_gen; break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1463,7 +1546,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(GE); break; default: - jj_la1[40] = jj_gen; + jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1489,7 +1572,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[41] = jj_gen; + jj_la1[42] = jj_gen; break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1503,7 +1586,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(RUNSIGNEDSHIFT); break; default: - jj_la1[42] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1529,7 +1612,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[43] = jj_gen; + jj_la1[44] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1540,7 +1623,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(MINUS); break; default: - jj_la1[44] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1575,7 +1658,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1589,13 +1672,13 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(REM); break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } expr = UnaryExpression(); - buff.append(operator.image); - buff.append(expr); + buff.append(operator.image); + buff.append(expr); } {if (true) return buff.toString();} throw new Error("Missing return statement in function"); @@ -1642,7 +1725,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; break label_19; } jj_consume_token(AT); @@ -1652,7 +1735,7 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return buff.append(expr).toString();} break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1673,7 +1756,7 @@ final StringBuffer buff = new StringBuffer("("); token = jj_consume_token(MINUS); break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1681,11 +1764,8 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return token.image + expr;} break; case INCR: - expr = PreIncrementExpression(); - {if (true) return expr;} - break; case DECR: - expr = PreDecrementExpression(); + expr = PreIncDecExpression(); {if (true) return expr;} break; case ARRAY: @@ -1705,26 +1785,30 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return expr;} break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public String PreIncrementExpression() throws ParseException { + static final public String PreIncDecExpression() throws ParseException { final String expr; - jj_consume_token(INCR); - expr = PrimaryExpression(); - {if (true) return "++"+expr;} - throw new Error("Missing return statement in function"); - } - - static final public String PreDecrementExpression() throws ParseException { -final String expr; - jj_consume_token(DECR); +final Token token; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INCR: + token = jj_consume_token(INCR); + break; + case DECR: + token = jj_consume_token(DECR); + break; + default: + jj_la1[52] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } expr = PrimaryExpression(); - {if (true) return "--"+expr;} + {if (true) return token.image + expr;} throw new Error("Missing return statement in function"); } @@ -1737,7 +1821,7 @@ final String expr; {if (true) return "!" + expr;} break; default: - jj_la1[51] = jj_gen; + jj_la1[53] = jj_gen; if (jj_2_3(2147483647)) { expr = CastExpression(); {if (true) return expr;} @@ -1775,7 +1859,7 @@ final String expr; {if (true) return "("+expr+")";} break; default: - jj_la1[52] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1787,7 +1871,27 @@ final String expr; static final public String CastExpression() throws ParseException { final String type, expr; jj_consume_token(LPAREN); - type = Type(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + type = Type(); + break; + case ARRAY: + jj_consume_token(ARRAY); + type = "array"; + break; + default: + jj_la1[55] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } jj_consume_token(RPAREN); expr = UnaryExpression(); {if (true) return "(" + type + ")" + expr;} @@ -1809,13 +1913,13 @@ final String type, expr; operator = jj_consume_token(DECR); break; default: - jj_la1[53] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[54] = jj_gen; + jj_la1[57] = jj_gen; ; } if (operator == null) { @@ -1843,7 +1947,7 @@ final String type, expr; ; break; default: - jj_la1[55] = jj_gen; + jj_la1[58] = jj_gen; break label_20; } expr = PrimarySuffix(); @@ -1867,7 +1971,7 @@ final String type, expr; ; break; default: - jj_la1[56] = jj_gen; + jj_la1[59] = jj_gen; break label_21; } expr = PrimarySuffix(); @@ -1880,7 +1984,7 @@ final String type, expr; {if (true) return "array" + expr;} break; default: - jj_la1[57] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1915,7 +2019,7 @@ final String type, expr; {if (true) return expr;} break; default: - jj_la1[58] = jj_gen; + jj_la1[61] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1938,7 +2042,7 @@ final String type, expr; buff.append(expr); break; default: - jj_la1[59] = jj_gen; + jj_la1[62] = jj_gen; ; } {if (true) return buff.toString();} @@ -1959,7 +2063,7 @@ final String type, expr; {if (true) return expr;} break; default: - jj_la1[60] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1979,7 +2083,7 @@ final String type, expr; {if (true) return expr;} break; default: - jj_la1[61] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2006,12 +2110,21 @@ final String type, expr; jj_consume_token(LBRACKET); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: - case PRINT: case LIST: + case PRINT: case NEW: case NULL: case TRUE: case FALSE: + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -2026,10 +2139,49 @@ final String type, expr; case MINUS: case BIT_AND: case DOLLAR_ID: - expr = Expression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + expr = Expression(); + break; + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + expr = Type(); + break; + default: + jj_la1[65] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } break; default: - jj_la1[62] = jj_gen; + jj_la1[66] = jj_gen; ; } try { @@ -2047,7 +2199,7 @@ final String type, expr; {if (true) return "[" + expr + "]";} break; default: - jj_la1[63] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2076,11 +2228,11 @@ final String type, expr; {if (true) return expr;} break; case NULL: - expr = NullLiteral(); - {if (true) return expr;} + jj_consume_token(NULL); + {if (true) return "null";} break; default: - jj_la1[64] = jj_gen; + jj_la1[68] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2098,26 +2250,20 @@ final String type, expr; {if (true) return "false";} break; default: - jj_la1[65] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public String NullLiteral() throws ParseException { - jj_consume_token(NULL); - {if (true) return "null";} - throw new Error("Missing return statement in function"); - } - static final public String Arguments() throws ParseException { String expr = null; jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: - case PRINT: case LIST: + case PRINT: case NEW: case NULL: case TRUE: @@ -2139,7 +2285,7 @@ String expr = null; expr = ArgumentList(); break; default: - jj_la1[66] = jj_gen; + jj_la1[70] = jj_gen; ; } try { @@ -2170,7 +2316,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[67] = jj_gen; + jj_la1[71] = jj_gen; break label_22; } jj_consume_token(COMMA); @@ -2196,25 +2342,15 @@ final StringBuffer buff = new StringBuffer(); if (jj_2_5(2)) { Expression(); try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[68] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + jj_consume_token(SEMICOLON); } catch (ParseException e) { - errorMessage = "';' expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - {if (true) throw e;} + if (e.currentToken.next.kind != 4) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } } } else if (jj_2_6(2)) { LabeledStatement(); @@ -2237,7 +2373,7 @@ final StringBuffer buff = new StringBuffer(); try { jj_consume_token(SEMICOLON); } catch (ParseException e) { - errorMessage = "';' expected after expression"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -2281,7 +2417,7 @@ final StringBuffer buff = new StringBuffer(); jj_consume_token(AT); break; default: - jj_la1[69] = jj_gen; + jj_la1[72] = jj_gen; ; } IncludeStatement(); @@ -2293,7 +2429,7 @@ final StringBuffer buff = new StringBuffer(); GlobalStatement(); break; default: - jj_la1[70] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2307,6 +2443,7 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -2315,7 +2452,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -2349,132 +2485,77 @@ final StringBuffer buff = new StringBuffer(); BreakStatement(); break; default: - jj_la1[71] = jj_gen; + jj_la1[74] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + + static final public void htmlBlock() throws ParseException { + jj_consume_token(PHPEND); + label_23: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPECHOSTART: + ; + break; + default: + jj_la1[75] = jj_gen; + break label_23; + } + phpEchoBlock(); + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTLONG: + jj_consume_token(PHPSTARTLONG); + break; + case PHPSTARTSHORT: + jj_consume_token(PHPSTARTSHORT); + break; + default: + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } +/** + * An include statement. It's "include" an expression; + */ static final public void IncludeStatement() throws ParseException { final String expr; + final Token token; final int pos = jj_input_stream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case REQUIRE: - jj_consume_token(REQUIRE); - expr = Expression(); - if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); - } - try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[72] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } catch (ParseException e) { - errorMessage = "';' expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - {if (true) throw e;} - } + token = jj_consume_token(REQUIRE); break; case REQUIRE_ONCE: - jj_consume_token(REQUIRE_ONCE); - expr = Expression(); - if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr)); - } - try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[73] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } catch (ParseException e) { - errorMessage = "';' expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - {if (true) throw e;} - } + token = jj_consume_token(REQUIRE_ONCE); break; case INCLUDE: - jj_consume_token(INCLUDE); - expr = Expression(); - if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); - } - try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[74] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } catch (ParseException e) { - errorMessage = "';' expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - {if (true) throw e;} - } + token = jj_consume_token(INCLUDE); break; case INCLUDE_ONCE: - jj_consume_token(INCLUDE_ONCE); - expr = Expression(); + token = jj_consume_token(INCLUDE_ONCE); + break; + default: + jj_la1[77] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr = Expression(); if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr)); + currentSegment.add(new PHPReqIncDeclaration(currentSegment, token.image,pos,expr)); } - try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[75] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } catch (ParseException e) { - errorMessage = "';' expected"; + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} - } - break; - default: - jj_la1[76] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); } } @@ -2508,11 +2589,19 @@ final StringBuffer buff = new StringBuffer(); buff.append(expr); break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; ; } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: + label_24: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + ; + break; + default: + jj_la1[79] = jj_gen; + break label_24; + } try { jj_consume_token(COMMA); } catch (ParseException e) { @@ -2524,10 +2613,6 @@ final StringBuffer buff = new StringBuffer(); } expr = VariableDeclaratorId(); buff.append(",").append(expr); - break; - default: - jj_la1[78] = jj_gen; - ; } buff.append(")"); try { @@ -2546,56 +2631,54 @@ final StringBuffer buff = new StringBuffer(); buff.append("(").append(expr); break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; ; } {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } +/** + * An echo statement is like this : echo anyexpression (, otherexpression)* + */ static final public void EchoStatement() throws ParseException { jj_consume_token(ECHO); Expression(); - label_23: + label_25: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[80] = jj_gen; - break label_23; + jj_la1[81] = jj_gen; + break label_25; } jj_consume_token(COMMA); Expression(); } try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[81] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + jj_consume_token(SEMICOLON); } catch (ParseException e) { - errorMessage = "';' expected after 'echo' statement"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - {if (true) throw e;} + if (e.currentToken.next.kind != 4) { + errorMessage = "';' expected after 'echo' statement"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } } } static final public void GlobalStatement() throws ParseException { + final int pos = jj_input_stream.getPosition(); + String expr; jj_consume_token(GLOBAL); - VariableDeclaratorId(); - label_24: + expr = VariableDeclaratorId(); + if (currentSegment != null) { + currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr)); + } + label_26: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -2603,27 +2686,18 @@ final StringBuffer buff = new StringBuffer(); break; default: jj_la1[82] = jj_gen; - break label_24; + break label_26; } jj_consume_token(COMMA); - VariableDeclaratorId(); + expr = VariableDeclaratorId(); + if (currentSegment != null) { + currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr)); + } } try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[83] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + jj_consume_token(SEMICOLON); } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -2634,35 +2708,23 @@ final StringBuffer buff = new StringBuffer(); static final public void StaticStatement() throws ParseException { jj_consume_token(STATIC); VariableDeclarator(); - label_25: + label_27: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[84] = jj_gen; - break label_25; + jj_la1[83] = jj_gen; + break label_27; } jj_consume_token(COMMA); VariableDeclarator(); } try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[85] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + jj_consume_token(SEMICOLON); } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -2686,14 +2748,16 @@ final StringBuffer buff = new StringBuffer(); errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} } - label_26: + label_28: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPEND: case CLASS: case FUNCTION: case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -2702,7 +2766,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -2733,10 +2796,61 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[86] = jj_gen; - break label_26; + jj_la1[84] = jj_gen; + break label_28; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + BlockStatement(); + break; + case PHPEND: + htmlBlock(); + break; + default: + jj_la1[85] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } - BlockStatement(); } try { jj_consume_token(RBRACE); @@ -2754,6 +2868,7 @@ final StringBuffer buff = new StringBuffer(); case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -2762,7 +2877,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -2799,7 +2913,7 @@ final StringBuffer buff = new StringBuffer(); MethodDeclaration(); break; default: - jj_la1[87] = jj_gen; + jj_la1[86] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2812,6 +2926,7 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -2820,7 +2935,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -2857,7 +2971,7 @@ final StringBuffer buff = new StringBuffer(); MethodDeclaration(); break; default: - jj_la1[88] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2865,15 +2979,15 @@ final StringBuffer buff = new StringBuffer(); static final public void LocalVariableDeclaration() throws ParseException { LocalVariableDeclarator(); - label_27: + label_29: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[89] = jj_gen; - break label_27; + jj_la1[88] = jj_gen; + break label_29; } jj_consume_token(COMMA); LocalVariableDeclarator(); @@ -2888,7 +3002,7 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[90] = jj_gen; + jj_la1[89] = jj_gen; ; } } @@ -2900,10 +3014,8 @@ final StringBuffer buff = new StringBuffer(); static final public void StatementExpression() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCR: - PreIncrementExpression(); - break; case DECR: - PreDecrementExpression(); + PreIncDecExpression(); break; case ARRAY: case NEW: @@ -2951,26 +3063,25 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[91] = jj_gen; + jj_la1[90] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[92] = jj_gen; + jj_la1[91] = jj_gen; ; } break; default: - jj_la1[93] = jj_gen; + jj_la1[92] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } static final public void SwitchStatement() throws ParseException { - Token breakToken = null; - int line; + final int pos = jj_input_stream.getPosition(); jj_consume_token(SWITCH); try { jj_consume_token(LPAREN); @@ -2991,16 +3102,64 @@ final StringBuffer buff = new StringBuffer(); errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACE: + switchStatementBrace(); + break; + case COLON: + switchStatementColon(pos, pos + 6); + break; + default: + jj_la1[93] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + + static final public void switchStatementBrace() throws ParseException { + jj_consume_token(LBRACE); + label_30: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CASE: + case _DEFAULT: + ; + break; + default: + jj_la1[94] = jj_gen; + break label_30; + } + switchLabel0(); + } try { - jj_consume_token(LBRACE); + jj_consume_token(RBRACE); } catch (ParseException e) { - errorMessage = "'{' expected"; + errorMessage = "'}' expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} } - label_28: + } + +/** + * A Switch statement with : ... endswitch; + * @param start the begin offset of the switch + * @param end the end offset of the switch + */ + static final public void switchStatementColon(final int start, final int end) throws ParseException { + jj_consume_token(COLON); + try { + setMarker(fileToParse, + "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;", + start, + end, + INFO, + "Line " + token.beginLine); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + label_31: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CASE: @@ -3008,90 +3167,156 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[94] = jj_gen; - break label_28; + jj_la1[95] = jj_gen; + break label_31; } - line = SwitchLabel(); - label_29: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASS: - case FUNCTION: - case IF: - case ARRAY: - case PRINT: - case ECHO: - case INCLUDE: - case REQUIRE: - case INCLUDE_ONCE: - case REQUIRE_ONCE: - case GLOBAL: - case STATIC: - case LIST: - case CONTINUE: - case DO: - case FOR: - case NEW: - case NULL: - case RETURN: - case SWITCH: - case TRUE: - case FALSE: - case WHILE: - case FOREACH: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case LBRACE: - case SEMICOLON: - case AT: - case DOLLAR: - case BANG: - case INCR: - case DECR: - case PLUS: - case MINUS: - case BIT_AND: - case DOLLAR_ID: - ; - break; - default: - jj_la1[95] = jj_gen; - break label_29; - } - BlockStatementNoBreak(); - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BREAK: - breakToken = BreakStatement(); - break; - default: - jj_la1[96] = jj_gen; - ; - } - try { - if (breakToken == null) { - setMarker(fileToParse, - "You should use put a 'break' at the end of your statement", - line, - INFO, - "Line " + line); - } - } catch (CoreException e) { - PHPeclipsePlugin.log(e); - } + switchLabel0(); } try { - jj_consume_token(RBRACE); + jj_consume_token(ENDSWITCH); } catch (ParseException e) { - errorMessage = "'}' expected"; + errorMessage = "'endswitch' expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} } + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { + errorMessage = "';' expected after 'endswitch' keyword"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + } + + static final public void switchLabel0() throws ParseException { + Token breakToken = null; + final int line; + line = SwitchLabel(); + label_32: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPEND: + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + ; + break; + default: + jj_la1[96] = jj_gen; + break label_32; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + BlockStatementNoBreak(); + break; + case PHPEND: + htmlBlock(); + break; + default: + jj_la1[97] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BREAK: + breakToken = BreakStatement(); + break; + default: + jj_la1[98] = jj_gen; + ; + } + try { + if (breakToken == null) { + setMarker(fileToParse, + "You should use put a 'break' at the end of your statement", + line, + INFO, + "Line " + line); + } + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } } static final public Token BreakStatement() throws ParseException { @@ -3099,8 +3324,8 @@ final StringBuffer buff = new StringBuffer(); token = jj_consume_token(BREAK); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: - case PRINT: case LIST: + case PRINT: case NEW: case NULL: case TRUE: @@ -3122,7 +3347,7 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[97] = jj_gen; + jj_la1[99] = jj_gen; ; } try { @@ -3178,7 +3403,7 @@ final StringBuffer buff = new StringBuffer(); {if (true) return token.beginLine;} break; default: - jj_la1[98] = jj_gen; + jj_la1[100] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3219,12 +3444,14 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_30: + label_33: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPEND: case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -3233,7 +3460,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -3264,20 +3490,69 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[99] = jj_gen; - break label_30; + jj_la1[101] = jj_gen; + break label_33; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + Statement(); + break; + case PHPEND: + htmlBlock(); + break; + default: + jj_la1[102] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } - Statement(); } - label_31: + label_34: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ELSEIF: ; break; default: - jj_la1[100] = jj_gen; - break label_31; + jj_la1[103] = jj_gen; + break label_34; } ElseIfStatementColon(); } @@ -3286,7 +3561,7 @@ final StringBuffer buff = new StringBuffer(); ElseStatementColon(); break; default: - jj_la1[101] = jj_gen; + jj_la1[104] = jj_gen; ; } try { @@ -3318,9 +3593,11 @@ final StringBuffer buff = new StringBuffer(); {if (true) throw e;} } break; + case PHPEND: case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -3329,7 +3606,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -3357,31 +3633,91 @@ final StringBuffer buff = new StringBuffer(); case MINUS: case BIT_AND: case DOLLAR_ID: - Statement(); - label_32: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + Statement(); + break; + case PHPEND: + htmlBlock(); + break; + default: + jj_la1[105] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + label_35: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ELSEIF: ; break; default: - jj_la1[102] = jj_gen; - break label_32; + jj_la1[106] = jj_gen; + break label_35; } ElseIfStatement(); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ELSE: jj_consume_token(ELSE); - Statement(); + try { + Statement(); + } catch (ParseException e) { + if (errorMessage != null) { + {if (true) throw e;} + } + errorMessage = "unexpected token '"+e.currentToken.next.image+"', a statement was expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } break; default: - jj_la1[103] = jj_gen; + jj_la1[107] = jj_gen; ; } break; default: - jj_la1[104] = jj_gen; + jj_la1[108] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3391,12 +3727,14 @@ final StringBuffer buff = new StringBuffer(); jj_consume_token(ELSEIF); Condition("elseif"); jj_consume_token(COLON); - label_33: + label_36: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPEND: case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -3405,7 +3743,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -3436,22 +3773,73 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[105] = jj_gen; - break label_33; + jj_la1[109] = jj_gen; + break label_36; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + Statement(); + break; + case PHPEND: + htmlBlock(); + break; + default: + jj_la1[110] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } - Statement(); } } static final public void ElseStatementColon() throws ParseException { jj_consume_token(ELSE); jj_consume_token(COLON); - label_34: + label_37: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPEND: case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -3460,7 +3848,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -3491,10 +3878,59 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[106] = jj_gen; - break label_34; + jj_la1[111] = jj_gen; + break label_37; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + Statement(); + break; + case PHPEND: + htmlBlock(); + break; + default: + jj_la1[112] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } - Statement(); } } @@ -3516,12 +3952,13 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_35: + label_38: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -3530,7 +3967,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -3561,8 +3997,8 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[107] = jj_gen; - break label_35; + jj_la1[113] = jj_gen; + break label_38; } Statement(); } @@ -3586,19 +4022,7 @@ final StringBuffer buff = new StringBuffer(); {if (true) throw e;} } try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[108] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + jj_consume_token(SEMICOLON); } catch (ParseException e) { errorMessage = "';' expected after 'endwhile' keyword"; errorLevel = ERROR; @@ -3610,6 +4034,7 @@ final StringBuffer buff = new StringBuffer(); case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -3618,7 +4043,6 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -3649,7 +4073,7 @@ final StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[109] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3661,21 +4085,9 @@ final StringBuffer buff = new StringBuffer(); jj_consume_token(WHILE); Condition("while"); try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case PHPEND: - jj_consume_token(PHPEND); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); - break; - default: - jj_la1[110] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + jj_consume_token(SEMICOLON); } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -3703,14 +4115,18 @@ final StringBuffer buff = new StringBuffer(); errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASSACCESS: - case LBRACKET: + label_39: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CLASSACCESS: + case LBRACKET: + ; + break; + default: + jj_la1[115] = jj_gen; + break label_39; + } VariableSuffix(); - break; - default: - jj_la1[111] = jj_gen; - ; } try { jj_consume_token(AS); @@ -3736,7 +4152,7 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[112] = jj_gen; + jj_la1[116] = jj_gen; ; } try { @@ -3784,14 +4200,14 @@ final int pos = jj_input_stream.getPosition(); ForInit(); break; default: - jj_la1[113] = jj_gen; + jj_la1[117] = jj_gen; ; } jj_consume_token(SEMICOLON); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: - case PRINT: case LIST: + case PRINT: case NEW: case NULL: case TRUE: @@ -3813,7 +4229,7 @@ final int pos = jj_input_stream.getPosition(); Expression(); break; default: - jj_la1[114] = jj_gen; + jj_la1[118] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3828,7 +4244,7 @@ final int pos = jj_input_stream.getPosition(); StatementExpressionList(); break; default: - jj_la1[115] = jj_gen; + jj_la1[119] = jj_gen; ; } jj_consume_token(RPAREN); @@ -3836,6 +4252,7 @@ final int pos = jj_input_stream.getPosition(); case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -3844,7 +4261,6 @@ final int pos = jj_input_stream.getPosition(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -3876,12 +4292,13 @@ final int pos = jj_input_stream.getPosition(); break; case COLON: jj_consume_token(COLON); - label_36: + label_40: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -3890,7 +4307,6 @@ final int pos = jj_input_stream.getPosition(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case LIST: case CONTINUE: case DO: case FOR: @@ -3921,8 +4337,8 @@ final int pos = jj_input_stream.getPosition(); ; break; default: - jj_la1[116] = jj_gen; - break label_36; + jj_la1[120] = jj_gen; + break label_40; } Statement(); } @@ -3956,7 +4372,7 @@ final int pos = jj_input_stream.getPosition(); } break; default: - jj_la1[117] = jj_gen; + jj_la1[121] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3977,7 +4393,7 @@ final int pos = jj_input_stream.getPosition(); StatementExpressionList(); break; default: - jj_la1[118] = jj_gen; + jj_la1[122] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3986,15 +4402,15 @@ final int pos = jj_input_stream.getPosition(); static final public void StatementExpressionList() throws ParseException { StatementExpression(); - label_37: + label_41: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[119] = jj_gen; - break label_37; + jj_la1[123] = jj_gen; + break label_41; } jj_consume_token(COMMA); StatementExpression(); @@ -4004,11 +4420,31 @@ final int pos = jj_input_stream.getPosition(); static final public void ContinueStatement() throws ParseException { jj_consume_token(CONTINUE); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: case IDENTIFIER: - jj_consume_token(IDENTIFIER); + case LPAREN: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + Expression(); break; default: - jj_la1[120] = jj_gen; + jj_la1[124] = jj_gen; ; } try { @@ -4026,8 +4462,8 @@ final int pos = jj_input_stream.getPosition(); jj_consume_token(RETURN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: - case PRINT: case LIST: + case PRINT: case NEW: case NULL: case TRUE: @@ -4049,7 +4485,7 @@ final int pos = jj_input_stream.getPosition(); Expression(); break; default: - jj_la1[121] = jj_gen; + jj_la1[125] = jj_gen; ; } try { @@ -4112,134 +4548,63 @@ final int pos = jj_input_stream.getPosition(); return retval; } - static final private boolean jj_3R_75() { - if (jj_scan_token(HOOK)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_66()) return true; + static final private boolean jj_3R_112() { + 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_97() { - if (jj_scan_token(SC_OR)) return true; + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_79() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_97()) { - jj_scanpos = xsp; - if (jj_3R_98()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_78()) return true; + static final private boolean jj_3R_178() { + if (jj_3R_51()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_74() { - if (jj_3R_78()) return true; + static final private boolean jj_3R_167() { + if (jj_3R_165()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_79()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_177() { - if (jj_3R_68()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_176() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_185()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_179() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_175() { - 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_170() { - Token xsp; xsp = jj_scanpos; - if (jj_3R_175()) { - jj_scanpos = xsp; - if (jj_3R_176()) { - jj_scanpos = xsp; - if (jj_3R_177()) 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_180()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_106() { - if (jj_scan_token(ASSIGN)) return true; + static final private boolean jj_3R_71() { + if (jj_3R_82()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_66() { - if (jj_3R_74()) return true; + static final private boolean jj_3R_54() { + if (jj_3R_70()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_75()) jj_scanpos = xsp; + if (jj_3R_71()) jj_scanpos = xsp; else 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_45() { if (jj_scan_token(ARRAY)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_184()) 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(TILDEEQUAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_178() { - if (jj_scan_token(INCR)) return true; + static final private boolean jj_3R_53() { + if (jj_3R_69()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_164() { - if (jj_3R_171()) return true; + static final private boolean jj_3R_166() { + if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_172() { Token xsp; xsp = jj_scanpos; if (jj_3R_178()) { @@ -4247,361 +4612,178 @@ final int pos = jj_input_stream.getPosition(); if (jj_3R_179()) 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_182() { - if (jj_3R_183()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_91() { - 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_90() { - if (jj_scan_token(ORASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_163() { - if (jj_3R_170()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_182()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_89() { - if (jj_scan_token(XORASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_88() { - if (jj_scan_token(ANDASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_105() { - if (jj_scan_token(COMMA)) 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_186() { - if (jj_3R_183()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_87() { - 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_86() { - 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_104() { - if (jj_3R_68()) 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(MINUSASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3_4() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(STATICCLASSACCESS)) return true; + if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_185()) return true; + if (jj_3R_140()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_186()) { jj_scanpos = xsp; break; } - 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_46() { Token xsp; xsp = jj_scanpos; - if (jj_3_4()) { + if (jj_3R_52()) { jj_scanpos = xsp; - if (jj_3R_163()) { + if (jj_3R_53()) { jj_scanpos = xsp; - if (jj_3R_164()) return true; + if (jj_3R_54()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_84() { - if (jj_scan_token(PLUSASSIGN)) return true; + static final private boolean jj_3R_52() { + if (jj_3R_68()) 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(REMASSIGN)) return true; + static final private boolean jj_3R_44() { + if (jj_3R_51()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_82() { - if (jj_scan_token(SLASHASSIGN)) return true; + static final private boolean jj_3R_111() { + 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_81() { - if (jj_scan_token(STARASSIGN)) return true; + if (jj_3R_72()) 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(ASSIGN)) return true; + static final private boolean jj_3R_67() { + if (jj_scan_token(OBJECT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_76() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_80()) { - jj_scanpos = xsp; - if (jj_3R_81()) { - jj_scanpos = xsp; - if (jj_3R_82()) { - jj_scanpos = xsp; - if (jj_3R_83()) { - jj_scanpos = xsp; - if (jj_3R_84()) { - jj_scanpos = xsp; - if (jj_3R_85()) { - jj_scanpos = xsp; - if (jj_3R_86()) { - jj_scanpos = xsp; - if (jj_3R_87()) { - jj_scanpos = xsp; - if (jj_3R_88()) { - jj_scanpos = xsp; - if (jj_3R_89()) { - jj_scanpos = xsp; - if (jj_3R_90()) { - jj_scanpos = xsp; - if (jj_3R_91()) { - jj_scanpos = xsp; - if (jj_3R_92()) return true; + static final private boolean jj_3R_110() { + if (jj_3R_72()) 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; - } 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_65() { - if (jj_scan_token(LIST)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - 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_104()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - xsp = jj_scanpos; - if (jj_3R_105()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + static final private boolean jj_3R_66() { + if (jj_scan_token(INTEGER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - xsp = jj_scanpos; - 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_161() { - if (jj_3R_159()) return true; + static final private boolean jj_3_3() { + 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_172()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_64() { - if (jj_scan_token(PRINT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_67() { - if (jj_3R_76()) return true; + if (jj_3R_44()) { + jj_scanpos = xsp; + if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + } 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_160() { + static final private boolean jj_3R_164() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_40()) return true; + if (jj_3R_46()) 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_134()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_59() { - if (jj_3R_66()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_67()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_58() { - if (jj_3R_65()) return true; + static final private boolean jj_3R_65() { + if (jj_scan_token(INT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_41() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_57()) { - jj_scanpos = xsp; - if (jj_3R_58()) { - jj_scanpos = xsp; - if (jj_3R_59()) return true; + static final private boolean jj_3R_163() { + if (jj_3R_168()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_57() { - if (jj_3R_64()) return true; + static final private boolean jj_3R_64() { + if (jj_scan_token(FLOAT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_3() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_40()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + static final private boolean jj_3R_159() { + if (jj_scan_token(DECR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_158() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + static final private boolean jj_3R_162() { + if (jj_3R_167()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_56() { - if (jj_scan_token(OBJECT)) return true; + static final private boolean jj_3R_63() { + if (jj_scan_token(DOUBLE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_157() { - if (jj_3R_162()) return true; + static final private boolean jj_3R_62() { + if (jj_scan_token(REAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_55() { - if (jj_scan_token(INTEGER)) return true; + static final private boolean jj_3R_161() { + if (jj_3R_166()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_156() { - if (jj_3R_161()) return true; + static final private boolean jj_3R_69() { + if (jj_scan_token(LIST)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_54() { - if (jj_scan_token(INT)) return true; + if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_155() { - if (jj_3R_160()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_110()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + while (true) { + xsp = jj_scanpos; + if (jj_3R_111()) { jj_scanpos = xsp; break; } + 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; + xsp = jj_scanpos; + if (jj_3R_112()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_53() { - if (jj_scan_token(FLOAT)) return true; + static final private boolean jj_3R_61() { + 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_153() { + static final private boolean jj_3R_157() { Token xsp; xsp = jj_scanpos; - if (jj_3R_154()) { + if (jj_3R_160()) { jj_scanpos = xsp; - if (jj_3R_155()) { + if (jj_3R_161()) { jj_scanpos = xsp; - if (jj_3R_156()) { + if (jj_3R_162()) { jj_scanpos = xsp; - 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; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4610,66 +4792,40 @@ final int pos = jj_input_stream.getPosition(); return false; } - static final private boolean jj_3R_154() { + static final private boolean jj_3R_160() { if (jj_scan_token(BANG)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_134()) return true; + if (jj_3R_140()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_52() { - if (jj_scan_token(DOUBLE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_51() { - if (jj_scan_token(REAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_50() { - if (jj_scan_token(BOOLEAN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_152() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_159()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_49() { + static final private boolean jj_3R_60() { 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_40() { + static final private boolean jj_3R_51() { Token xsp; xsp = jj_scanpos; - if (jj_3R_48()) { + if (jj_3R_59()) { jj_scanpos = xsp; - if (jj_3R_49()) { + if (jj_3R_60()) { jj_scanpos = xsp; - if (jj_3R_50()) { + if (jj_3R_61()) { jj_scanpos = xsp; - if (jj_3R_51()) { + if (jj_3R_62()) { jj_scanpos = xsp; - if (jj_3R_52()) { + if (jj_3R_63()) { jj_scanpos = xsp; - if (jj_3R_53()) { + if (jj_3R_64()) { jj_scanpos = xsp; - if (jj_3R_54()) { + if (jj_3R_65()) { jj_scanpos = xsp; - if (jj_3R_55()) { + if (jj_3R_66()) { jj_scanpos = xsp; - if (jj_3R_56()) return true; + if (jj_3R_67()) 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; @@ -4682,344 +4838,433 @@ final int pos = jj_input_stream.getPosition(); return false; } - static final private boolean jj_3R_48() { + static final private boolean jj_3R_59() { 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_151() { + static final private boolean jj_3R_158() { if (jj_scan_token(INCR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_159()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_150() { + static final private boolean jj_3R_155() { 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_148() { - if (jj_3R_153()) return true; + static final private boolean jj_3R_156() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_158()) { + jj_scanpos = xsp; + if (jj_3R_159()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_165()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_147() { - if (jj_3R_152()) return true; + static final private boolean jj_3R_68() { + if (jj_scan_token(PRINT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_142() { + static final private boolean jj_3R_148() { if (jj_scan_token(REM)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_146() { - if (jj_3R_151()) return true; + static final private boolean jj_3R_153() { + if (jj_3R_157()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_149() { + static final private boolean jj_3R_152() { + if (jj_3R_156()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_154() { 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_143() { + static final private boolean jj_3R_149() { Token xsp; xsp = jj_scanpos; - if (jj_3R_145()) { - jj_scanpos = xsp; - if (jj_3R_146()) { + if (jj_3R_151()) { jj_scanpos = xsp; - if (jj_3R_147()) { + if (jj_3R_152()) { jj_scanpos = xsp; - if (jj_3R_148()) return true; + if (jj_3R_153()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_145() { + static final private boolean jj_3R_151() { Token xsp; xsp = jj_scanpos; - if (jj_3R_149()) { + if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_150()) 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; - if (jj_3R_134()) return true; + if (jj_3R_140()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_144() { + static final private boolean jj_3R_150() { if (jj_scan_token(AT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_139() { + static final private boolean jj_3R_145() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_144()) { jj_scanpos = xsp; break; } + if (jj_3R_150()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } - if (jj_3R_143()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_141() { + static final private boolean jj_3R_147() { if (jj_scan_token(SLASH)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_134() { + static final private boolean jj_3R_140() { Token xsp; xsp = jj_scanpos; - if (jj_3R_138()) { + if (jj_3R_144()) { jj_scanpos = xsp; - if (jj_3R_139()) return true; + if (jj_3R_145()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_138() { + static final private boolean jj_3R_144() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_143()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_133() { + static final private boolean jj_3R_139() { 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_140() { + static final private boolean jj_3R_146() { if (jj_scan_token(STAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_135() { + static final private boolean jj_3R_141() { Token xsp; xsp = jj_scanpos; - if (jj_3R_140()) { + if (jj_3R_146()) { jj_scanpos = xsp; - if (jj_3R_141()) { + if (jj_3R_147()) { jj_scanpos = xsp; - if (jj_3R_142()) return true; + if (jj_3R_148()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_134()) return true; + if (jj_3R_140()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_137() { + static final private boolean jj_3R_143() { 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_128() { + static final private boolean jj_3R_134() { 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_129() { - if (jj_3R_134()) return true; + static final private boolean jj_3R_135() { + if (jj_3R_140()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_135()) { jj_scanpos = xsp; break; } + if (jj_3R_141()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_43() { - if (jj_scan_token(PHPEND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_132() { + static final private boolean jj_3R_138() { 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_127() { + static final private boolean jj_3R_133() { 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_136() { + static final private boolean jj_3R_142() { 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_130() { + static final private boolean jj_3R_136() { Token xsp; xsp = jj_scanpos; - if (jj_3R_136()) { + if (jj_3R_142()) { jj_scanpos = xsp; - if (jj_3R_137()) return true; + if (jj_3R_143()) 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_129()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3_6() { - if (jj_3R_44()) return true; + if (jj_3R_135()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_123() { - if (jj_3R_129()) return true; + static final private boolean jj_3R_129() { + if (jj_3R_135()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_130()) { jj_scanpos = xsp; break; } + if (jj_3R_136()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_42() { - if (jj_scan_token(SEMICOLON)) return true; + static final private boolean jj_3R_132() { + if (jj_scan_token(GT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_5() { - if (jj_3R_41()) return true; + static final private boolean jj_3_6() { + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_137() { + 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_130() { Token xsp; xsp = jj_scanpos; - if (jj_3R_42()) { + if (jj_3R_137()) { jj_scanpos = xsp; - if (jj_3R_43()) return true; + 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; + if (jj_3R_129()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_126() { - if (jj_scan_token(GT)) return true; + static final private boolean jj_3R_122() { + if (jj_3R_129()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_130()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3_2() { - if (jj_scan_token(COMMA)) return true; + static final private boolean jj_3_7() { + if (jj_3R_48()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3_5() { + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_39()) return true; + 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_131() { - if (jj_scan_token(LSHIFT)) return true; + 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_124() { + static final private boolean jj_3R_123() { Token xsp; xsp = jj_scanpos; if (jj_3R_131()) { jj_scanpos = xsp; if (jj_3R_132()) { jj_scanpos = xsp; - if (jj_3R_133()) return true; + if (jj_3R_133()) { + jj_scanpos = xsp; + 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; - if (jj_3R_123()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_122()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_192() { - if (jj_3R_39()) return true; + static final private boolean jj_3R_120() { + if (jj_3R_122()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_2()) { jj_scanpos = xsp; break; } + if (jj_3R_123()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_116() { - if (jj_3R_123()) return true; + static final private boolean jj_3R_204() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_46()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_200() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3_2() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_203() { + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_124()) { jj_scanpos = xsp; break; } + if (jj_3R_204()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_184() { - if (jj_scan_token(LPAREN)) return true; + static final private boolean jj_3R_199() { + if (jj_3R_43()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - xsp = jj_scanpos; - if (jj_3R_192()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3_2()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + static final private boolean jj_3R_128() { + if (jj_scan_token(TRIPLEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_196() { - if (jj_scan_token(COMMA)) return true; + static final private boolean jj_3R_127() { + if (jj_scan_token(BANGDOUBLEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + return false; + } + + static final private boolean jj_3R_126() { + 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_125() { - if (jj_scan_token(LT)) return true; + if (jj_scan_token(DIF)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_117() { + static final private boolean jj_3R_124() { + if (jj_scan_token(EQ)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_201() { + if (jj_3R_203()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_191() { + 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_199()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + xsp = jj_scanpos; + if (jj_3R_200()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_121() { Token xsp; xsp = jj_scanpos; + if (jj_3R_124()) { + jj_scanpos = xsp; if (jj_3R_125()) { jj_scanpos = xsp; if (jj_3R_126()) { @@ -5031,316 +5276,371 @@ final int pos = jj_input_stream.getPosition(); } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_116()) return true; + } 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_195() { - if (jj_3R_41()) return true; + static final private boolean jj_3R_118() { + 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_196()) { 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_114() { - if (jj_3R_116()) return true; + static final private boolean jj_3R_202() { + if (jj_scan_token(ARRAYASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_117()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_194() { - if (jj_scan_token(ARRAYASSIGN)) return true; + static final private boolean jj_3R_198() { + if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_201()) 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_39() { - if (jj_3R_41()) return true; + static final private boolean jj_3R_43() { + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_194()) jj_scanpos = xsp; + if (jj_3R_202()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_7() { - if (jj_3R_45()) return true; + static final private boolean jj_3R_119() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_118()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_193() { - if (jj_3R_195()) return true; + static final private boolean jj_3R_188() { + 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_122() { - if (jj_scan_token(TRIPLEEQUAL)) return true; + static final private boolean jj_3R_187() { + 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_191() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + static final private boolean jj_3R_181() { Token xsp; xsp = jj_scanpos; - if (jj_3R_193()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + if (jj_3R_187()) { + jj_scanpos = xsp; + if (jj_3R_188()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_121() { - if (jj_scan_token(BANGDOUBLEEQUAL)) return true; + static final private boolean jj_3R_116() { + if (jj_3R_118()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_119()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_120() { - if (jj_scan_token(NE)) return true; + static final private boolean jj_3R_175() { + 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_69() { + static final private boolean jj_3R_73() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_119() { - if (jj_scan_token(DIF)) return true; + static final private boolean jj_3R_79() { + if (jj_3R_51()) 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(EQ)) return true; + static final private boolean jj_3R_174() { + if (jj_3R_181()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_61() { + static final private boolean jj_3R_56() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_60()) return true; + if (jj_3R_55()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_115() { + static final private boolean jj_3R_173() { + 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_117() { + if (jj_scan_token(XOR)) return true; + 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_172() { + if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_168() { Token xsp; xsp = jj_scanpos; - if (jj_3R_118()) { + if (jj_3R_171()) { jj_scanpos = xsp; - if (jj_3R_119()) { + if (jj_3R_172()) { jj_scanpos = xsp; - if (jj_3R_120()) { + if (jj_3R_173()) { jj_scanpos = xsp; - if (jj_3R_121()) { + if (jj_3R_174()) { jj_scanpos = xsp; - if (jj_3R_122()) return true; + if (jj_3R_175()) 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; - if (jj_3R_114()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_174() { - if (jj_scan_token(NULL)) return true; + static final private boolean jj_3R_171() { + 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_112() { - if (jj_3R_114()) return true; + static final private boolean jj_3R_113() { + 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_115()) { 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_109() { - if (jj_scan_token(LBRACE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; + static final private boolean jj_3R_78() { + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_181() { - if (jj_scan_token(FALSE)) return true; + static final private boolean jj_3R_58() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_78()) { + jj_scanpos = xsp; + if (jj_3R_79()) 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_180() { - if (jj_scan_token(TRUE)) return true; + static final private boolean jj_3R_55() { + if (jj_3R_72()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_73()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_173() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_180()) { - jj_scanpos = xsp; - if (jj_3R_181()) return true; + static final private boolean jj_3R_114() { + if (jj_scan_token(BIT_OR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_73() { - if (jj_scan_token(DOLLAR_ID)) return true; + static final private boolean jj_3R_106() { + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_114()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - 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; + static final private boolean jj_3R_77() { + if (jj_scan_token(DOLLAR_ID)) 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(DOLLAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_62()) return true; + static final private boolean jj_3R_48() { + if (jj_3R_55()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_56()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_169() { - if (jj_3R_174()) return true; + static final private boolean jj_3R_115() { + if (jj_scan_token(LBRACE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_46()) 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_60() { - if (jj_3R_68()) return true; + static final private boolean jj_3R_50() { + if (jj_scan_token(LBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_69()) jj_scanpos = xsp; + if (jj_3R_58()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RBRACKET)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_168() { - if (jj_3R_173()) return true; + static final private boolean jj_3R_109() { + 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_110() { - if (jj_3R_112()) return true; + static final private boolean jj_3R_76() { + if (jj_scan_token(DOLLAR)) 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; - 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_167() { - if (jj_scan_token(STRING_LITERAL)) return true; + static final private boolean jj_3R_107() { + if (jj_scan_token(DOT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_106()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_45() { - if (jj_3R_60()) return true; + static final private boolean jj_3R_101() { + if (jj_3R_106()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_61()) { jj_scanpos = xsp; break; } + if (jj_3R_107()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_99() { - if (jj_scan_token(LBRACE)) return true; + static final private boolean jj_3R_49() { + if (jj_scan_token(CLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + if (jj_3R_57()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; + return false; + } + + static final private boolean jj_3R_42() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_49()) { + jj_scanpos = xsp; + if (jj_3R_50()) 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_71() { + static final private boolean jj_3R_75() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_109()) jj_scanpos = xsp; + if (jj_3R_115()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_166() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + static final private boolean jj_3R_195() { + if (jj_3R_42()) 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_104() { + 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_74() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + if (jj_3R_46()) 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_62() { + static final private boolean jj_3R_57() { Token xsp; xsp = jj_scanpos; - if (jj_3R_70()) { + if (jj_3R_74()) { jj_scanpos = xsp; - if (jj_3R_71()) { + if (jj_3R_75()) { jj_scanpos = xsp; - if (jj_3R_72()) { + if (jj_3R_76()) { jj_scanpos = xsp; - if (jj_3R_73()) return true; + if (jj_3R_77()) 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; @@ -5348,152 +5648,211 @@ final int pos = jj_input_stream.getPosition(); return false; } - static final private boolean jj_3R_162() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_165()) { - jj_scanpos = xsp; - if (jj_3R_166()) { - jj_scanpos = xsp; - if (jj_3R_167()) { - jj_scanpos = xsp; - if (jj_3R_168()) { - jj_scanpos = xsp; - if (jj_3R_169()) return true; + static final private boolean jj_3R_108() { + if (jj_scan_token(SC_AND)) 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_165() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + static final private boolean jj_3R_194() { + if (jj_3R_198()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_111() { - if (jj_scan_token(XOR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_110()) return true; + static final private boolean jj_3R_190() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_194()) { + jj_scanpos = xsp; + if (jj_3R_195()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_94() { - if (jj_scan_token(DOLLAR)) return true; + static final private boolean jj_3R_102() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_108()) { + jj_scanpos = xsp; + if (jj_3R_109()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_62()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_101()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_63() { - if (jj_3R_41()) return true; + static final private boolean jj_3R_105() { + if (jj_scan_token(LBRACE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_46()) 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_107() { - if (jj_3R_110()) return true; + static final private boolean jj_3R_84() { + if (jj_3R_101()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_111()) { jj_scanpos = xsp; break; } + if (jj_3R_102()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_93() { - if (jj_scan_token(DOLLAR_ID)) return true; + static final private boolean jj_3R_81() { + if (jj_scan_token(HOOK)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_46()) 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_70()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_197() { + if (jj_3R_72()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_100() { + if (jj_scan_token(DOLLAR)) 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_196() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_192() { Token xsp; xsp = jj_scanpos; - if (jj_3R_99()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_196()) { + jj_scanpos = xsp; + if (jj_3R_197()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_77() { + static final private boolean jj_3R_103() { + 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_85() { Token xsp; xsp = jj_scanpos; - if (jj_3R_93()) { + if (jj_3R_103()) { jj_scanpos = xsp; - if (jj_3R_94()) return true; + if (jj_3R_104()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_84()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_47() { - if (jj_scan_token(LBRACKET)) return true; + static final private boolean jj_3R_99() { + 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_63()) jj_scanpos = xsp; + if (jj_3R_105()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_108() { - if (jj_scan_token(BIT_OR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_107()) return true; + static final private boolean jj_3R_83() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_99()) { + jj_scanpos = xsp; + if (jj_3R_100()) 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_107()) return true; + static final private boolean jj_3R_80() { + if (jj_3R_84()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_108()) { jj_scanpos = xsp; break; } + if (jj_3R_85()) { 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_38()) return true; + static final private boolean jj_3R_47() { + 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_103() { - if (jj_scan_token(_ANDL)) return true; + static final private boolean jj_3R_184() { + if (jj_3R_72()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_46() { - if (jj_scan_token(CLASSACCESS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_62()) return true; + static final private boolean jj_3_1() { + if (jj_3R_42()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_38() { + static final private boolean jj_3R_70() { + if (jj_3R_80()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_46()) { - jj_scanpos = xsp; - if (jj_3R_47()) return true; + if (jj_3R_81()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_183() { + if (jj_scan_token(NEW)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_192()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_68() { - if (jj_3R_77()) return true; + static final private boolean jj_3R_186() { + if (jj_scan_token(DECR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_182() { + 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_72() { + if (jj_3R_83()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { @@ -5504,117 +5863,233 @@ final int pos = jj_input_stream.getPosition(); return false; } - static final private boolean jj_3R_101() { - if (jj_scan_token(DOT)) return true; + static final private boolean jj_3R_176() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_182()) { + jj_scanpos = xsp; + if (jj_3R_183()) { + jj_scanpos = xsp; + if (jj_3R_184()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_100()) return true; + } 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_98() { + if (jj_scan_token(TILDEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_95() { - if (jj_3R_100()) return true; + static final private boolean jj_3R_97() { + if (jj_scan_token(DOTASSIGN)) 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_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_188() { - if (jj_3R_38()) return true; + static final private boolean jj_3R_177() { + if (jj_scan_token(ARRAY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_191()) 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(IDENTIFIER)) return true; + static final private boolean jj_3R_96() { + if (jj_scan_token(ORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; + return false; + } + + static final private boolean jj_3R_95() { + 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_187() { - if (jj_3R_191()) return true; + static final private boolean jj_3R_94() { + 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_183() { + static final private boolean jj_3R_93() { + 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_185() { + 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_180() { Token xsp; xsp = jj_scanpos; - if (jj_3R_187()) { + if (jj_3R_185()) { jj_scanpos = xsp; - if (jj_3R_188()) return true; + if (jj_3R_186()) 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_98() { - if (jj_scan_token(_ORL)) return true; + static final private boolean jj_3R_92() { + 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_190() { - if (jj_3R_68()) return true; + static final private boolean jj_3R_170() { + if (jj_3R_177()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_102() { - if (jj_scan_token(SC_AND)) return true; + static final private boolean jj_3R_189() { + if (jj_3R_190()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_96() { + static final private boolean jj_3R_91() { + 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_90() { + 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_169() { + if (jj_3R_176()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - xsp = jj_scanpos; - if (jj_3R_102()) { - jj_scanpos = xsp; - if (jj_3R_103()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_189()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + static final private boolean jj_3R_89() { + if (jj_scan_token(REMASSIGN)) 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_95()) return true; + return false; + } + + static final private boolean jj_3R_88() { + 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_189() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_193() { + if (jj_3R_190()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_185() { + static final private boolean jj_3R_87() { + 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_86() { + 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_82() { Token xsp; xsp = jj_scanpos; - if (jj_3R_189()) { + if (jj_3R_86()) { jj_scanpos = xsp; - if (jj_3R_190()) return true; + if (jj_3R_87()) { + jj_scanpos = xsp; + if (jj_3R_88()) { + jj_scanpos = xsp; + if (jj_3R_89()) { + jj_scanpos = xsp; + if (jj_3R_90()) { + jj_scanpos = xsp; + if (jj_3R_91()) { + jj_scanpos = xsp; + if (jj_3R_92()) { + jj_scanpos = xsp; + 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()) { + jj_scanpos = xsp; + if (jj_3R_98()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } 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; + } 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_78() { - if (jj_3R_95()) return true; + static final private boolean jj_3R_179() { + if (jj_scan_token(ARRAY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3_4() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(STATICCLASSACCESS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_192()) 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_193()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } + static final private boolean jj_3R_165() { + Token xsp; + xsp = jj_scanpos; + if (jj_3_4()) { + jj_scanpos = xsp; + if (jj_3R_169()) { + jj_scanpos = xsp; + if (jj_3R_170()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static private boolean jj_initialized_once = false; static public PHPParserTokenManager token_source; static SimpleCharStream jj_input_stream; @@ -5625,7 +6100,7 @@ final int pos = jj_input_stream.getPosition(); static public boolean lookingAhead = false; static private boolean jj_semLA; static private int jj_gen; - static final private int[] jj_la1 = new int[122]; + static final private int[] jj_la1 = new int[126]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -5639,19 +6114,19 @@ final int pos = jj_input_stream.getPosition(); jj_la1_4(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0xfcb0001e,0x0,0x6,0x6,0xfcb0001e,0xfcb00000,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x14000000,0x0,0x0,0x0,0x14000000,0x0,0x10,0x0,0xe4800000,0xfc800000,0x10,0x10,0x10,0x10,0xc0000000,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x10,0xfcb00000,0xfcb00000,0xf4b00000,0x0,0x0,0x0,0x0,0x4000000,0x0,0xf4b00000,0x8000000,0x14000000,0x0,0xfc800000,0x1000000,0x2000000,0x1000000,0x2000000,0xfc800000,0xfc800000,0xfc800000,0xfc800000,0x10,0xfc800000,0x10,0x0,0x0,0x4000000,0x14000000,0x4000000,0xfc800000,0xfc800000,0x4000000,0x0,0x0,0x14000000,}; + jj_la1_0 = new int[] {0xfcb0001e,0x6,0x6,0xfcb0001e,0x0,0xfcb00000,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x34000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x34000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x34000000,0x34000000,0x0,0x0,0x0,0x34000000,0x0,0x0,0xc4800000,0xfc800000,0x8,0x6,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0xfcb00010,0xfcb00010,0xfcb00000,0xf4b00000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0xf4b00010,0xf4b00010,0x8000000,0x34000000,0x0,0xfc800010,0xfc800010,0x1000000,0x2000000,0xfc800010,0x1000000,0x2000000,0xfc800010,0xfc800010,0xfc800010,0xfc800010,0xfc800010,0xfc800000,0xfc800000,0x0,0x0,0x4000000,0x34000000,0x4000000,0xfc800000,0xfc800000,0x4000000,0x0,0x34000000,0x34000000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x11d7548f,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x40,0xc30080,0x0,0x0,0x0,0x0,0xc0000000,0x0,0xc30080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc30000,0x0,0xc30000,0x0,0xc30000,0x0,0x0,0x10,0x10,0x10000,0x10000,0x10000,0x0,0x10,0xc30080,0x10,0xc20000,0xc00000,0xc30080,0x0,0x0,0x0,0x1115540f,0x11d7548f,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x0,0x0,0x0,0x10000,0x900,0x11d7548f,0x0,0xc30080,0x900,0x11d7548f,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x11d7548f,0x0,0x10,0x40,0x10000,0xc30080,0x10000,0x11d7548f,0x11d7548f,0x10000,0x0,0x0,0xc30080,}; + jj_la1_1 = new int[] {0x21d7541f,0x0,0x0,0x21d7541f,0x0,0x21d7541f,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x80,0xc30000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0xc30000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc30000,0x0,0xc30000,0x0,0x0,0xc30000,0x80000000,0x0,0x0,0x20,0x20,0x10000,0x10000,0x10000,0x0,0x20,0x80c30000,0x80c30000,0x20,0xc20000,0xc00000,0xc30000,0x0,0x0,0x2115541f,0x21d7541f,0x0,0x0,0x7,0x0,0x0,0x0,0x0,0x0,0x0,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x0,0x0,0x0,0x0,0x10000,0x0,0x900,0x900,0x21d7541f,0x21d7541f,0x0,0xc30000,0x900,0x21d7541f,0x21d7541f,0x0,0x0,0x21d7541f,0x0,0x0,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x21d7541f,0x20,0x80,0x10000,0xc30000,0x10000,0x21d7541f,0x21d7541f,0x10000,0x0,0xc30000,0xc30000,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x2288a200,0x20000000,0x0,0x0,0x2288a200,0x2288a200,0x0,0x0,0x0,0x40000000,0x0,0x2000000,0x0,0x2000000,0x2080000,0x2200,0x2200,0x8a200,0x0,0x88a200,0x0,0x40000000,0x0,0x0,0x7f,0x0,0x88a200,0x0,0x0,0x80,0x80,0x100,0x100,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x88a200,0x0,0x88a200,0x0,0x88a200,0x0,0x0,0x8800000,0x8800000,0x80000,0x80000,0x80000,0x80000,0x8800000,0x88a200,0x8000000,0xa200,0x0,0x88a200,0x40000000,0x20000000,0x0,0x22080000,0x2288a200,0x20000000,0x20000000,0x20000000,0x20000000,0x0,0x0,0x40000000,0x0,0x40000000,0x20000000,0x40000000,0x20000000,0x40000000,0x20000000,0x2288a200,0x2288a200,0x2288a200,0x40000000,0x0,0x0,0x0,0x80000,0x0,0x2288a200,0x0,0x88a200,0x0,0x2288a200,0x0,0x0,0x0,0x0,0x2288a200,0x2288a200,0x2288a200,0x2288a200,0x20000000,0x2288a200,0x20000000,0x8000000,0x0,0x80000,0x88a200,0x80000,0x2288a200,0x2288a200,0x80000,0x40000000,0x80000,0x88a200,}; + jj_la1_2 = new int[] {0x45114400,0x0,0x0,0x45114400,0x40000000,0x45114400,0x0,0x0,0x0,0x80000000,0x0,0x4000000,0x0,0x4000000,0x4100000,0x4400,0x4400,0x114400,0x0,0x1114400,0x80000000,0x0,0x80000000,0x0,0x0,0xff,0x0,0x1114400,0x0,0x0,0x100,0x100,0x200,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1114400,0x0,0x1114400,0x0,0x0,0x1114400,0xff,0x0,0x0,0x11000000,0x11000000,0x100000,0x100000,0x100000,0x100000,0x11000000,0x11144ff,0x11144ff,0x10000000,0x14400,0x0,0x1114400,0x80000000,0x0,0x44100000,0x45114400,0x0,0x0,0x0,0x0,0x80000000,0x0,0x80000000,0x80000000,0x80000000,0x45114400,0x45114400,0x45114400,0x45114400,0x80000000,0x0,0x0,0x0,0x100000,0x4000000,0x0,0x0,0x45114400,0x45114400,0x0,0x1114400,0x0,0x45114400,0x45114400,0x0,0x0,0x45114400,0x0,0x0,0x45114400,0x45114400,0x45114400,0x45114400,0x45114400,0x45114400,0x45114400,0x10000000,0x0,0x100000,0x1114400,0x100000,0x45114400,0x45114400,0x100000,0x80000000,0x1114400,0x1114400,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x78700000,0x0,0x0,0x0,0x78700000,0x78700000,0x0,0x0,0x0,0x0,0x200,0x0,0x200000,0x0,0x200000,0x0,0x0,0x60000000,0x0,0x78700000,0x0,0x0,0x200000,0x0,0x0,0xffe00,0x78700000,0xffe00,0x800000,0x2000000,0x2000000,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x1e4,0x1e4,0x1b,0x1b,0x0,0x0,0x60000000,0x60000000,0x80000000,0x80000000,0x100000,0x78700000,0x60000000,0x78600000,0x400000,0x200000,0x18000000,0x18000000,0x0,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x78700000,0x0,0x0,0x0,0x78700000,0x0,0x0,0x100000,0x18300000,0x78700000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x78700000,0x78700000,0x78700000,0x0,0x200,0x180ffe00,0x180ffe00,0x18200000,0x0,0x78700000,0x0,0x78700000,0x0,0x78700000,0x0,0x0,0x0,0x0,0x79700000,0x78700000,0x78700000,0x78700000,0x0,0x79700000,0x0,0x0,0x0,0x18200000,0x78700000,0x18200000,0x78700000,0x79700000,0x18200000,0x0,0x0,0x78700000,}; + jj_la1_3 = new int[] {0xe0e00000,0x0,0x0,0xe0e00000,0x0,0xe0e00000,0x0,0x0,0x0,0x0,0x400,0x0,0x400000,0x0,0x400000,0x0,0x0,0x80000000,0x0,0xe0e00000,0x0,0x0,0x0,0x400000,0x0,0x0,0x1ffc00,0xe0e00000,0x1ffc00,0x2000000,0x8000000,0x8000000,0x10000000,0x10000000,0x1,0x0,0x0,0x0,0x3c8,0x3c8,0x36,0x36,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x200000,0xe0e00000,0x80000000,0xe0c00000,0x60000000,0x800000,0x400000,0x0,0x60000000,0x60000000,0x0,0x0,0x400000,0x400000,0x400000,0x400000,0x0,0xe0e00000,0xe0e00000,0x0,0x0,0x0,0xe0e00000,0x0,0x200000,0x60600000,0xe0e00000,0x0,0x0,0x0,0x400000,0x0,0x400,0x0,0x0,0x0,0xe0e00000,0xe0e00000,0xe0e00000,0xe0e00000,0x0,0x400,0x601ffc00,0x601ffc00,0x60400000,0x4000000,0x0,0x0,0xe0e00000,0xe0e00000,0x0,0xe0e00000,0x0,0xe0e00000,0xe0e00000,0x0,0x0,0xe0e00000,0x0,0x0,0xe4e00000,0xe0e00000,0xe0e00000,0xe0e00000,0xe0e00000,0xe0e00000,0xe4e00000,0x0,0x0,0x60400000,0xe0e00000,0x60400000,0xe0e00000,0xe4e00000,0x60400000,0x0,0xe0e00000,0xe0e00000,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x402,0x0,0x0,0x0,0x402,0x402,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x402,0x2,0x0,0x402,0x2,0x0,0x300,0x402,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x8,0x2,0x0,0x0,0x0,0x0,0xe0,0xe0,0x0,0x0,0x11,0x11,0x0,0x402,0x0,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x400,0x0,0x402,0x0,0x0,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x0,0x0,0x300,0x300,0x400,0x0,0x402,0x0,0x402,0x0,0x402,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x402,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x400,0x402,0x402,0x400,0x0,0x0,0x402,}; + jj_la1_4 = new int[] {0x1009,0x0,0x0,0x1009,0x0,0x1009,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x1,0x0,0x1009,0x0,0x8,0x0,0x1008,0x8,0x0,0xc00,0x1009,0xc00,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x20,0x8,0x0,0x0,0x0,0x0,0x380,0x380,0x1,0x1,0x46,0x46,0x0,0x1009,0x1,0x1001,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x1000,0x1000,0x1000,0x1000,0x0,0x1009,0x1009,0x0,0x0,0x0,0x1009,0x0,0x0,0x1000,0x1009,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x1009,0x1009,0x1009,0x1009,0x0,0x0,0xc00,0xc00,0x1000,0x0,0x0,0x0,0x1009,0x1009,0x0,0x1009,0x0,0x1009,0x1009,0x0,0x0,0x1009,0x0,0x0,0x1009,0x1009,0x1009,0x1009,0x1009,0x1009,0x1009,0x0,0x0,0x1000,0x1009,0x1000,0x1009,0x1009,0x1000,0x0,0x1009,0x1009,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[7]; static private boolean jj_rescan = false; @@ -5670,7 +6145,7 @@ final int pos = jj_input_stream.getPosition(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 122; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5680,7 +6155,7 @@ final int pos = jj_input_stream.getPosition(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 122; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5697,7 +6172,7 @@ final int pos = jj_input_stream.getPosition(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 122; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5707,7 +6182,7 @@ final int pos = jj_input_stream.getPosition(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 122; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5723,7 +6198,7 @@ final int pos = jj_input_stream.getPosition(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 122; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5732,7 +6207,7 @@ final int pos = jj_input_stream.getPosition(); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 122; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5839,15 +6314,15 @@ final int pos = jj_input_stream.getPosition(); static public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[139]; - for (int i = 0; i < 139; i++) { + boolean[] la1tokens = new boolean[141]; + for (int i = 0; i < 141; i++) { la1tokens[i] = false; } if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 122; i++) { + for (int i = 0; i < 126; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<"> : DEFAULT } +/* Skip any character if we are not in php mode */ SKIP : { < ~[] > @@ -302,7 +300,6 @@ PARSER_END(PHPParser) /* WHITE SPACE */ - SKIP : { " " @@ -313,7 +310,6 @@ PARSER_END(PHPParser) } /* COMMENTS */ - SPECIAL_TOKEN : { "//" : IN_SINGLE_LINE_COMMENT @@ -364,6 +360,7 @@ MORE : | | | +| } /* LANGUAGE CONSTRUCT */ @@ -382,10 +379,6 @@ MORE : | "> } - TOKEN : -{ - -} /* RESERVED WORDS AND LITERALS */ TOKEN : @@ -408,6 +401,7 @@ MORE : | | | +| | | | @@ -415,7 +409,6 @@ MORE : } /* TYPES */ - TOKEN : { @@ -436,7 +429,6 @@ MORE : } /* LITERALS */ - TOKEN : { < INTEGER_LITERAL: @@ -464,9 +456,10 @@ MORE : | < STRING_1: "\"" ( - ~["\""] + ~["\""] | ~["{"] | "\\\"" + | "{" ~["\""] "}" )* "\"" > @@ -562,6 +555,7 @@ MORE : | | +| | | | @@ -602,18 +596,26 @@ void phpFile() : (PhpBlock())* } catch (TokenMgrError e) { + PHPeclipsePlugin.log(e); + errorStart = SimpleCharStream.getPosition(); + errorEnd = errorStart + 1; errorMessage = e.getMessage(); errorLevel = ERROR; throw generateParseException(); } } +/** + * A php block is a + * or + * or + */ void PhpBlock() : { final int start = jj_input_stream.getPosition(); } { - Expression() [ ] + phpEchoBlock() | [ | @@ -640,6 +642,12 @@ void PhpBlock() : } } +void phpEchoBlock() : +{} +{ + Expression() [ ] +} + void Php() : {} { @@ -660,8 +668,8 @@ void ClassDeclaration() : } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; throw e; } [ @@ -715,6 +723,9 @@ void ClassBody() : } } +/** + * A class can contain only methods and fields. + */ void ClassBodyDeclaration() : {} { @@ -723,6 +734,9 @@ void ClassBodyDeclaration() : FieldDeclaration() } +/** + * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;. + */ void FieldDeclaration() : { PHPVarDeclaration variableDeclaration; @@ -745,7 +759,7 @@ void FieldDeclaration() : try { } catch (ParseException e) { - errorMessage = "';' expected after variable declaration"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -755,8 +769,7 @@ void FieldDeclaration() : PHPVarDeclaration VariableDeclarator() : { - final String varName; - final String varValue; + final String varName, varValue; final int pos = jj_input_stream.getPosition(); } { @@ -765,7 +778,7 @@ PHPVarDeclaration VariableDeclarator() : try { varValue = VariableInitializer() - {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} + {return new PHPVarDeclaration(currentSegment,varName.substring(1),pos,varValue);} } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; @@ -808,6 +821,12 @@ String Variable(): token = [ expr = Expression() ] { if (expr == null) { + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); + if (var != null) { + var.getVariable().setUsed(true); + } + } return token.image; } return token + "{" + expr + "}"; @@ -829,16 +848,38 @@ final Token token; token = [ expr = Expression() ] { if (expr == null) { + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image); + if (var != null) { + var.getVariable().setUsed(true); + } + } return token.image; } return token + "{" + expr + "}"; } | expr = VariableName() - {return "$" + expr;} + { + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(expr); + if (var != null) { + var.getVariable().setUsed(true); + } + } + return "$" + expr; + } | token = - {return token.image + expr;} + { + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); + if (var != null) { + var.getVariable().setUsed(true); + } + } + return token.image + expr; + } /*| pas besoin ? token = [expr = VariableName()] { @@ -894,7 +935,9 @@ final StringBuffer buff = new StringBuffer("("); {buff.append(expr);} ( LOOKAHEAD(2) expr = ArrayVariable() {buff.append(",").append(expr);} - )* ] + )* + ] + [ {buff.append(",");}] { buff.append(")"); @@ -902,12 +945,17 @@ final StringBuffer buff = new StringBuffer("("); } } +/** + * A Method Declaration. + * function MetodDeclarator() Block() + */ void MethodDeclaration() : { final PHPFunctionDeclaration functionDeclaration; + Token functionToken; } { - + functionToken = try { functionDeclaration = MethodDeclarator() } catch (ParseException e) { @@ -925,9 +973,27 @@ void MethodDeclaration() : currentSegment.add(functionDeclaration); currentSegment = functionDeclaration; } + currentFunction = functionDeclaration; } Block() { + Hashtable parameters = currentFunction.getParameters(); + Enumeration vars = parameters.elements(); + while (vars.hasMoreElements()) { + PHPVarDeclaration o = (PHPVarDeclaration) vars.nextElement(); + if (!o.getVariable().isUsed()) { + try { + setMarker(fileToParse, + "Parameter "+o.getVariable().getName()+" is never used in function", + functionToken.beginLine, + WARNING, + "Line " + token.beginLine); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } + } + currentFunction = null; if (currentSegment != null) { currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); } @@ -935,48 +1001,54 @@ void MethodDeclaration() : } /** - * A MethodDeclarator contains [&] IDENTIFIER(parameters ...). + * A MethodDeclarator. + * [&] IDENTIFIER(parameters ...). * @return a function description for the outline */ PHPFunctionDeclaration MethodDeclarator() : { final Token identifier; final StringBuffer methodDeclaration = new StringBuffer(); - final String formalParameters; + final Hashtable formalParameters; final int pos = jj_input_stream.getPosition(); } { [ {methodDeclaration.append("&");} ] identifier = - {methodDeclaration.append(identifier);} - formalParameters = FormalParameters() + formalParameters = FormalParameters() { - methodDeclaration.append(formalParameters); - return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos); + methodDeclaration.append(identifier); + return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters); } } -String FormalParameters() : +/** + * FormalParameters follows method identifier. + * (FormalParameter()) + */ +Hashtable FormalParameters() : { String expr; final StringBuffer buff = new StringBuffer("("); + PHPVarDeclaration var; + final Hashtable parameters = new Hashtable(); } { try { } catch (ParseException e) { - errorMessage = "Formal parameter expected after function identifier"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; throw e; } - [ expr = FormalParameter() - {buff.append(expr);} - ( - expr = FormalParameter() - {buff.append(",").append(expr);} - )* + [ var = FormalParameter() + {parameters.put(var.getVariable().getName(),var);} + ( + var = FormalParameter() + {parameters.put(var.getVariable().getName(),var);} + )* ] try { @@ -987,22 +1059,25 @@ String FormalParameters() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - { - buff.append(")"); - return buff.toString(); - } + {return parameters;} } -String FormalParameter() : +/** + * A formal parameter. + * $varname[=value] (,$varname[=value]) + */ +PHPVarDeclaration FormalParameter() : { final PHPVarDeclaration variableDeclaration; - final StringBuffer buff = new StringBuffer(); + Token token = null; } { - [ {buff.append("&");}] variableDeclaration = VariableDeclarator() + [token = ] variableDeclaration = VariableDeclarator() { - buff.append(variableDeclaration.toString()); - return buff.toString(); + if (token != null) { + variableDeclaration.getVariable().setPrefix("@"); + } + return variableDeclaration; } } @@ -1057,6 +1132,9 @@ String Expression() : expr2 = Expression() {return expr + assignOperator + expr2;} } catch (ParseException e) { + if (errorMessage != null) { + throw e; + } errorMessage = "expression expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; @@ -1330,11 +1408,11 @@ String MultiplicativeExpression() : } {buff.append(expr);} ( - ( operator = | operator = | operator = ) expr = UnaryExpression() - { - buff.append(operator.image); - buff.append(expr); - } + ( operator = | operator = | operator = ) expr = UnaryExpression() + { + buff.append(operator.image); + buff.append(expr); + } )* {return buff.toString();} } @@ -1372,10 +1450,7 @@ String UnaryExpressionNoPrefix() : return token.image + expr; } | - expr = PreIncrementExpression() - {return expr;} -| - expr = PreDecrementExpression() + expr = PreIncDecExpression() {return expr;} | expr = UnaryExpressionNotPlusMinus() @@ -1383,22 +1458,14 @@ String UnaryExpressionNoPrefix() : } -String PreIncrementExpression() : -{ -final String expr; -} -{ - expr = PrimaryExpression() - {return "++"+expr;} -} - -String PreDecrementExpression() : +String PreIncDecExpression() : { final String expr; +final Token token; } { - expr = PrimaryExpression() - {return "--"+expr;} + (token = | token = ) expr = PrimaryExpression() + {return token.image + expr;} } String UnaryExpressionNotPlusMinus() : @@ -1409,7 +1476,7 @@ String UnaryExpressionNotPlusMinus() : expr = UnaryExpression() {return "!" + expr;} | - LOOKAHEAD( Type() ) + LOOKAHEAD( (Type() | ) ) expr = CastExpression() {return expr;} | @@ -1437,7 +1504,7 @@ String CastExpression() : final String type, expr; } { - type = Type() expr = UnaryExpression() + (type = Type() | {type = "array";}) expr = UnaryExpression() {return "(" + type + ")" + expr;} } @@ -1563,8 +1630,8 @@ String VariableSuffix() : throw e; } {return "->" + expr;} -| - [ expr = Expression() ] +| + [ expr = Expression() | expr = Type() ] //Not good try { } catch (ParseException e) { @@ -1600,8 +1667,8 @@ String Literal() : expr = BooleanLiteral() {return expr;} | - expr = NullLiteral() - {return expr;} + + {return "null";} } String BooleanLiteral() : @@ -1614,13 +1681,6 @@ String BooleanLiteral() : {return "false";} } -String NullLiteral() : -{} -{ - - {return "null";} -} - String Arguments() : { String expr = null; @@ -1678,13 +1738,15 @@ void StatementNoBreak() : LOOKAHEAD(2) Expression() try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) + } catch (ParseException e) { - errorMessage = "';' expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + if (e.currentToken.next.kind != 4) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + throw e; + } } | LOOKAHEAD(2) @@ -1698,7 +1760,7 @@ void StatementNoBreak() : try { } catch (ParseException e) { - errorMessage = "';' expected after expression"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -1741,74 +1803,36 @@ void Statement() : BreakStatement() } +void htmlBlock() : +{} +{ + (phpEchoBlock())* ( | ) +} + +/** + * An include statement. It's "include" an expression; + */ void IncludeStatement() : { final String expr; + final Token token; final int pos = jj_input_stream.getPosition(); } { - - expr = Expression() - { - if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); - } - } - try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) - } catch (ParseException e) { - errorMessage = "';' expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; - } -| - + ( token = + | token = + | token = + | token = ) expr = Expression() { if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr)); + currentSegment.add(new PHPReqIncDeclaration(currentSegment, token.image,pos,expr)); } } try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) - } catch (ParseException e) { - errorMessage = "';' expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; - } -| - - expr = Expression() - { - if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); - } - } - try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) - } catch (ParseException e) { - errorMessage = "';' expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; - } -| - - expr = Expression() - { - if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr)); - } - } - try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) + } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -1849,7 +1873,7 @@ String ListExpression() : expr = VariableDeclaratorId() {buff.append(expr);} ] - [ + ( try { } catch (ParseException e) { @@ -1861,7 +1885,7 @@ String ListExpression() : } expr = VariableDeclaratorId() {buff.append(",").append(expr);} - ] + )* {buff.append(")");} try { @@ -1876,29 +1900,47 @@ String ListExpression() : {return buff.toString();} } +/** + * An echo statement is like this : echo anyexpression (, otherexpression)* + */ void EchoStatement() : {} { Expression() ( Expression())* try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) + } catch (ParseException e) { - errorMessage = "';' expected after 'echo' statement"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + if (e.currentToken.next.kind != 4) { + errorMessage = "';' expected after 'echo' statement"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + throw e; + } } } void GlobalStatement() : -{} { - VariableDeclaratorId() ( VariableDeclaratorId())* + final int pos = jj_input_stream.getPosition(); + String expr; +} +{ + + expr = VariableDeclaratorId() + {if (currentSegment != null) { + currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr)); + }} + ( + expr = VariableDeclaratorId() + {if (currentSegment != null) { + currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr)); + }} + )* try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) + } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -1911,9 +1953,9 @@ void StaticStatement() : { VariableDeclarator() ( VariableDeclarator())* try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) + } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -1939,7 +1981,7 @@ void Block() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - ( BlockStatement() )* + ( BlockStatement() | htmlBlock())* try { } catch (ParseException e) { @@ -1995,9 +2037,7 @@ void EmptyStatement() : void StatementExpression() : {} { - PreIncrementExpression() -| - PreDecrementExpression() + PreIncDecExpression() | PrimaryExpression() [ @@ -2011,8 +2051,7 @@ void StatementExpression() : void SwitchStatement() : { - Token breakToken = null; - int line; + final int pos = jj_input_stream.getPosition(); } { @@ -2035,37 +2074,57 @@ void SwitchStatement() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - try { + (switchStatementBrace() | switchStatementColon(pos, pos + 6)) +} + +void switchStatementBrace() : +{} +{ + ( switchLabel0() )* + try { + } catch (ParseException e) { - errorMessage = "'{' expected"; + errorMessage = "'}' expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; throw e; } - ( - line = SwitchLabel() - ( BlockStatementNoBreak() )* - [ breakToken = BreakStatement() ] - { - try { - if (breakToken == null) { - setMarker(fileToParse, - "You should use put a 'break' at the end of your statement", - line, - INFO, - "Line " + line); - } - } catch (CoreException e) { - PHPeclipsePlugin.log(e); - } - } - )* +} +/** + * A Switch statement with : ... endswitch; + * @param start the begin offset of the switch + * @param end the end offset of the switch + */ +void switchStatementColon(final int start, final int end) : +{} +{ + + {try { + setMarker(fileToParse, + "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;", + start, + end, + INFO, + "Line " + token.beginLine); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + }} + (switchLabel0())* try { - + } catch (ParseException e) { - errorMessage = "'}' expected"; + errorMessage = "'endswitch' expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + throw e; + } + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'endswitch' keyword"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -2073,6 +2132,30 @@ void SwitchStatement() : } } +void switchLabel0() : +{ + Token breakToken = null; + final int line; +} +{ + line = SwitchLabel() + ( BlockStatementNoBreak() | htmlBlock() )* + [ breakToken = BreakStatement() ] + { + try { + if (breakToken == null) { + setMarker(fileToParse, + "You should use put a 'break' at the end of your statement", + line, + INFO, + "Line " + line); + } + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } +} + Token BreakStatement() : { final Token token; @@ -2167,7 +2250,7 @@ void Condition(final String keyword) : void IfStatement0(final int start,final int end) : {} { - (Statement())* (ElseIfStatementColon())* [ElseStatementColon()] + (Statement() | htmlBlock())* (ElseIfStatementColon())* [ElseStatementColon()] {try { setMarker(fileToParse, @@ -2198,19 +2281,35 @@ void IfStatement0(final int start,final int end) : throw e; } | - Statement() ( LOOKAHEAD(1) ElseIfStatement() )* [ LOOKAHEAD(1) Statement() ] + (Statement() | htmlBlock()) + ( LOOKAHEAD(1) ElseIfStatement() )* + [ LOOKAHEAD(1) + + try { + Statement() + } catch (ParseException e) { + if (errorMessage != null) { + throw e; + } + errorMessage = "unexpected token '"+e.currentToken.next.image+"', a statement was expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + throw e; + } + ] } void ElseIfStatementColon() : {} { - Condition("elseif") (Statement())* + Condition("elseif") (Statement() | htmlBlock())* } void ElseStatementColon() : {} { - (Statement())* + (Statement() | htmlBlock())* } void ElseIfStatement() : @@ -2252,7 +2351,7 @@ void WhileStatement0(final int start, final int end) : throw e; } try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) + } catch (ParseException e) { errorMessage = "';' expected after 'endwhile' keyword"; errorLevel = ERROR; @@ -2269,9 +2368,9 @@ void DoStatement() : { Statement() Condition("while") try { - ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) + } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -2301,7 +2400,7 @@ void ForeachStatement() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - [ VariableSuffix() ] + ( VariableSuffix() )* try { } catch (ParseException e) { @@ -2414,7 +2513,7 @@ void StatementExpressionList() : void ContinueStatement() : {} { - [ ] + [ Expression() ] try { } catch (ParseException e) { diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java index d1008b0..99de374 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java @@ -20,18 +20,18 @@ public interface PHPParserConstants { int ELSE = 25; int ARRAY = 26; int BREAK = 27; - int PRINT = 28; - int ECHO = 29; - int INCLUDE = 30; - int REQUIRE = 31; - int INCLUDE_ONCE = 32; - int REQUIRE_ONCE = 33; - int GLOBAL = 34; - int STATIC = 35; - int CLASSACCESS = 36; - int STATICCLASSACCESS = 37; - int ARRAYASSIGN = 38; - int LIST = 39; + int LIST = 28; + int PRINT = 29; + int ECHO = 30; + int INCLUDE = 31; + int REQUIRE = 32; + int INCLUDE_ONCE = 33; + int REQUIRE_ONCE = 34; + int GLOBAL = 35; + int STATIC = 36; + int CLASSACCESS = 37; + int STATICCLASSACCESS = 38; + int ARRAYASSIGN = 39; int CASE = 40; int CONST = 41; int CONTINUE = 42; @@ -50,87 +50,89 @@ public interface PHPParserConstants { int FALSE = 55; int WHILE = 56; int ENDWHILE = 57; - int ENDIF = 58; - int ENDFOR = 59; - int FOREACH = 60; - int AS = 61; - int STRING = 62; - int OBJECT = 63; - int BOOL = 64; - int BOOLEAN = 65; - int REAL = 66; - int DOUBLE = 67; - int FLOAT = 68; - int INT = 69; - int INTEGER = 70; - int _ORL = 71; - int _ANDL = 72; - int INTEGER_LITERAL = 73; - int DECIMAL_LITERAL = 74; - int HEX_LITERAL = 75; - int OCTAL_LITERAL = 76; - int FLOATING_POINT_LITERAL = 77; - int EXPONENT = 78; - int STRING_LITERAL = 79; - int STRING_1 = 80; - int STRING_2 = 81; - int STRING_3 = 82; - int IDENTIFIER = 83; - int LETTER = 84; - int DIGIT = 85; - int SPECIAL = 86; - int LPAREN = 87; - int RPAREN = 88; - int LBRACE = 89; - int RBRACE = 90; - int LBRACKET = 91; - int RBRACKET = 92; - int SEMICOLON = 93; - int COMMA = 94; - int DOT = 95; - int GT = 96; - int LT = 97; - int EQ = 98; - int LE = 99; - int GE = 100; - int NE = 101; - int DIF = 102; - int BANGDOUBLEEQUAL = 103; - int TRIPLEEQUAL = 104; - int ASSIGN = 105; - int PLUSASSIGN = 106; - int MINUSASSIGN = 107; - int STARASSIGN = 108; - int SLASHASSIGN = 109; - int ANDASSIGN = 110; - int ORASSIGN = 111; - int XORASSIGN = 112; - int DOTASSIGN = 113; - int REMASSIGN = 114; - int TILDEEQUAL = 115; - int AT = 116; - int DOLLAR = 117; - int BANG = 118; - int HOOK = 119; - int COLON = 120; - int SC_OR = 121; - int SC_AND = 122; - int INCR = 123; - int DECR = 124; - int PLUS = 125; - int MINUS = 126; - int STAR = 127; - int SLASH = 128; - int BIT_AND = 129; - int BIT_OR = 130; - int XOR = 131; - int REM = 132; - int LSHIFT = 133; - int RSIGNEDSHIFT = 134; - int RUNSIGNEDSHIFT = 135; - int LSHIFTASSIGN = 136; - int RSIGNEDSHIFTASSIGN = 137; - int DOLLAR_ID = 138; + int ENDSWITCH = 58; + int ENDIF = 59; + int ENDFOR = 60; + int FOREACH = 61; + int AS = 62; + int STRING = 63; + int OBJECT = 64; + int BOOL = 65; + int BOOLEAN = 66; + int REAL = 67; + int DOUBLE = 68; + int FLOAT = 69; + int INT = 70; + int INTEGER = 71; + int _ORL = 72; + int _ANDL = 73; + int INTEGER_LITERAL = 74; + int DECIMAL_LITERAL = 75; + int HEX_LITERAL = 76; + int OCTAL_LITERAL = 77; + int FLOATING_POINT_LITERAL = 78; + int EXPONENT = 79; + int STRING_LITERAL = 80; + int STRING_1 = 81; + int STRING_2 = 82; + int STRING_3 = 83; + int IDENTIFIER = 84; + int LETTER = 85; + int DIGIT = 86; + int SPECIAL = 87; + int LPAREN = 88; + int RPAREN = 89; + int LBRACE = 90; + int RBRACE = 91; + int LBRACKET = 92; + int RBRACKET = 93; + int SEMICOLON = 94; + int COMMA = 95; + int DOT = 96; + int GT = 97; + int LT = 98; + int EQ = 99; + int LE = 100; + int GE = 101; + int NE = 102; + int DIF = 103; + int BANGDOUBLEEQUAL = 104; + int TRIPLEEQUAL = 105; + int ASSIGN = 106; + int PLUSASSIGN = 107; + int MINUSASSIGN = 108; + int STARASSIGN = 109; + int SLASHASSIGN = 110; + int ANDASSIGN = 111; + int ORASSIGN = 112; + int XORASSIGN = 113; + int DOTASSIGN = 114; + int REMASSIGN = 115; + int TILDEEQUAL = 116; + int AT = 117; + int DOLLAR = 118; + int BANG = 119; + int TILDE = 120; + int HOOK = 121; + int COLON = 122; + int SC_OR = 123; + int SC_AND = 124; + int INCR = 125; + int DECR = 126; + int PLUS = 127; + int MINUS = 128; + int STAR = 129; + int SLASH = 130; + int BIT_AND = 131; + int BIT_OR = 132; + int XOR = 133; + int REM = 134; + int LSHIFT = 135; + int RSIGNEDSHIFT = 136; + int RUNSIGNEDSHIFT = 137; + int LSHIFTASSIGN = 138; + int RSIGNEDSHIFTASSIGN = 139; + int DOLLAR_ID = 140; int DEFAULT = 0; int PHPPARSING = 1; @@ -167,6 +169,7 @@ public interface PHPParserConstants { "\"else\"", "\"array\"", "\"break\"", + "\"list\"", "\"print\"", "\"echo\"", "\"include\"", @@ -178,7 +181,6 @@ public interface PHPParserConstants { "\"->\"", "\"::\"", "\"=>\"", - "\"list\"", "\"case\"", "\"const\"", "\"continue\"", @@ -197,6 +199,7 @@ public interface PHPParserConstants { "\"false\"", "\"while\"", "\"endwhile\"", + "\"endswitch\"", "\"endif\"", "\"endfor\"", "\"foreach\"", @@ -258,6 +261,7 @@ public interface PHPParserConstants { "\"@\"", "\"$\"", "\"!\"", + "\"~\"", "\"?\"", "\":\"", "\"||\"", diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java b/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java index b566bf6..143f9a9 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java @@ -1,11 +1,12 @@ package test; + /********************************************************************** -Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de -All rights reserved. This program and the accompanying materials -are made available under the terms of the Common Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/cpl-v10.html -**********************************************************************/ + Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de + All rights reserved. This program and the accompanying materials + are made available under the terms of the Common Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/cpl-v10.html + **********************************************************************/ import org.eclipse.core.runtime.CoreException; @@ -31,6 +32,8 @@ public class PHPParserTestCase2 extends TestCase { */ public void testPHPParser() { //checkHTML(new File("class.adm_gestuser.php")); + checkHTML(""); checkHTML("" + "\n dfgdfgfdfg" + "\n" + @@ -108,7 +111,7 @@ public class PHPParserTestCase2 extends TestCase { checkPHP("$AllowableHTML = array(\"b\"=>1,\n \"i\"=>1);"); checkPHP("if ($term{0}!=$firstChar) {}"); checkPHP( - "echo \"
\"._NOADMINYET.\"


\"\n" + "echo \"
\"._NOADMINYET.\"


\"\n" + ".\"
\"\n" + ".\"\"._NICKNAME.\":\"\n" + ";"); @@ -116,7 +119,7 @@ public class PHPParserTestCase2 extends TestCase { checkPHP("if ($arrAtchCookie[1]==0 && $IdAtchPostId!=null){ } "); checkPHP("$arrAtchCookie[1] -= filesize(realpath($AtchTempDir).\"/\".$xattachlist)/ 1024; "); checkPHP( - "if (!isset($message)){ \n" + "if (!isset($message)){ \n" + "$message = $myrow[post_text];\n" + "$message = eregi_replace(\"\\[addsig]\", \"\\n-----------------\\n\" . $myrow[user_sig], $message); \n" + "$message = str_replace(\"
\", \"\\n\", $message); \n" @@ -137,6 +140,7 @@ public class PHPParserTestCase2 extends TestCase { } } + private void checkHTML(String strEval) { try { System.out.println("strEval = " + strEval); @@ -149,7 +153,7 @@ public class PHPParserTestCase2 extends TestCase { } - private void checkHTML(File strEval) { + private void checkHTML(File strEval) { try { System.out.println("strEval = " + strEval.toString()); parser.htmlParserTester(strEval); @@ -160,6 +164,7 @@ public class PHPParserTestCase2 extends TestCase { } } + /** * The JUnit setup method */ diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index e6ffa41..18ddad9 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -6,17 +6,14 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; +import java.util.ArrayList; +import java.util.Enumeration; import java.io.StringReader; import java.io.*; import java.text.MessageFormat; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -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; +import net.sourceforge.phpdt.internal.compiler.parser.*; public class PHPParserTokenManager implements PHPParserConstants { @@ -302,87 +299,87 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x4800L) != 0L || (active1 & 0x200000000000L) != 0L || (active2 & 0x1L) != 0L) + if ((active0 & 0x4800L) != 0L || (active1 & 0x400000000000L) != 0L || (active2 & 0x4L) != 0L) return 2; - if ((active1 & 0x20000000000000L) != 0L) + if ((active1 & 0x40000000000000L) != 0L) return 16; - if ((active1 & 0x2000080000000L) != 0L) + if ((active1 & 0x4000100000000L) != 0L) return 8; - if ((active0 & 0xffffff8ffff00000L) != 0L || (active1 & 0x1ffL) != 0L) + if ((active0 & 0xffffff1ffff00000L) != 0L || (active1 & 0x3ffL) != 0L) { - jjmatchedKind = 83; + jjmatchedKind = 84; return 14; } return -1; case 1: - if ((active0 & 0xdfffef8fff700000L) != 0L || (active1 & 0x177L) != 0L) + if ((active0 & 0xbfffef1fff700000L) != 0L || (active1 & 0x2efL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 1; } return 14; } if ((active0 & 0x4000L) != 0L) return 0; - if ((active0 & 0x2000100000800000L) != 0L || (active1 & 0x88L) != 0L) + if ((active0 & 0x4000100000800000L) != 0L || (active1 & 0x110L) != 0L) return 14; return -1; case 2: - if ((active0 & 0x1001400000400000L) != 0L || (active1 & 0x160L) != 0L) + if ((active0 & 0x2001400000400000L) != 0L || (active1 & 0x2c0L) != 0L) return 14; - if ((active0 & 0xcffeaf8fff300000L) != 0L || (active1 & 0x1fL) != 0L) + if ((active0 & 0x9ffeaf1fff300000L) != 0L || (active1 & 0x3fL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0x62818023000000L) != 0L || (active1 & 0x7L) != 0L) + if ((active0 & 0x62810053000000L) != 0L || (active1 & 0xeL) != 0L) return 14; - if ((active0 & 0xdf9c2e0fdc300000L) != 0L || (active1 & 0x58L) != 0L) + if ((active0 & 0xbf9c2e1fac300000L) != 0L || (active1 & 0xb1L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0xda142c0fc1200000L) != 0L || (active1 & 0x4aL) != 0L) + if ((active0 & 0xb6142c1f81200000L) != 0L || (active1 & 0x95L) != 0L) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 4; return 14; } - if ((active0 & 0x58802001c100000L) != 0L || (active1 & 0x10L) != 0L) + if ((active0 & 0x98802002c100000L) != 0L || (active1 & 0x20L) != 0L) return 14; return -1; case 5: - if ((active0 & 0xc814000c01000000L) != 0L || (active1 & 0x8L) != 0L) + if ((active0 & 0x9014001801000000L) != 0L || (active1 & 0x11L) != 0L) return 14; - if ((active0 & 0x12002c03c0200000L) != 0L || (active1 & 0x42L) != 0L) + if ((active0 & 0x26002c0780200000L) != 0L || (active1 & 0x84L) != 0L) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x10002803c0000000L) != 0L || (active1 & 0x42L) != 0L) + if ((active0 & 0x2000280780000000L) != 0L || (active1 & 0x84L) != 0L) return 14; - if ((active0 & 0x200040000200000L) != 0L) + if ((active0 & 0x600040000200000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 6; } return 14; @@ -391,33 +388,35 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac case 7: if ((active0 & 0x200040000200000L) != 0L) return 14; - if ((active0 & 0x300000000L) != 0L) + if ((active0 & 0x400000600000000L) != 0L) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 7; return 14; } return -1; case 8: - if ((active0 & 0x300000000L) != 0L) + if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 8; return 14; } + if ((active0 & 0x400000000000000L) != 0L) + return 14; return -1; case 9: - if ((active0 & 0x300000000L) != 0L) + if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 9; return 14; } return -1; case 10: - if ((active0 & 0x300000000L) != 0L) + if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 83; + jjmatchedKind = 84; jjmatchedPos = 10; return 14; } @@ -443,107 +442,107 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 118; - return jjMoveStringLiteralDfa1_1(0x0L, 0xa000000000L, 0x0L); + jjmatchedKind = 119; + return jjMoveStringLiteralDfa1_1(0x0L, 0x14000000000L, 0x0L); case 35: return jjStopAtPos(0, 12); case 36: - return jjStartNfaWithStates_1(0, 117, 16); + return jjStartNfaWithStates_1(0, 118, 16); case 37: - jjmatchedKind = 132; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L); + jjmatchedKind = 134; + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000L, 0x0L); case 38: - jjmatchedKind = 129; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400400000000000L, 0x0L); + jjmatchedKind = 131; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1000800000000000L, 0x0L); case 40: - return jjStopAtPos(0, 87); - case 41: return jjStopAtPos(0, 88); + case 41: + return jjStopAtPos(0, 89); case 42: - jjmatchedKind = 127; - return jjMoveStringLiteralDfa1_1(0x0L, 0x100000000000L, 0x0L); + jjmatchedKind = 129; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000L, 0x0L); case 43: - jjmatchedKind = 125; - return jjMoveStringLiteralDfa1_1(0x0L, 0x800040000000000L, 0x0L); + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000080000000000L, 0x0L); case 44: - return jjStopAtPos(0, 94); + return jjStopAtPos(0, 95); case 45: - jjmatchedKind = 126; - return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x1000080000000000L, 0x0L); + jjmatchedKind = 128; + return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x4000100000000000L, 0x0L); case 46: - jjmatchedKind = 95; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); + jjmatchedKind = 96; + return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L); case 47: - jjmatchedKind = 128; - return jjMoveStringLiteralDfa1_1(0x4800L, 0x200000000000L, 0x0L); + jjmatchedKind = 130; + return jjMoveStringLiteralDfa1_1(0x4800L, 0x400000000000L, 0x0L); case 58: - jjmatchedKind = 120; - return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x0L, 0x0L); + jjmatchedKind = 122; + return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 93); + return jjStopAtPos(0, 94); case 60: - jjmatchedKind = 97; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4800000000L, 0x120L); + jjmatchedKind = 98; + return jjMoveStringLiteralDfa1_1(0x0L, 0x9000000000L, 0x480L); case 61: - jjmatchedKind = 105; - return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x10400000000L, 0x0L); + jjmatchedKind = 106; + return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x20800000000L, 0x0L); case 62: - jjmatchedKind = 96; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000L, 0x2c0L); + jjmatchedKind = 97; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000L, 0xb00L); case 63: - jjmatchedKind = 119; + jjmatchedKind = 121; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 116); + return jjStopAtPos(0, 117); case 91: - return jjStopAtPos(0, 91); - case 93: return jjStopAtPos(0, 92); + case 93: + return jjStopAtPos(0, 93); case 94: - jjmatchedKind = 131; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L); + jjmatchedKind = 133; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x2000000004000000L, 0x100L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4000000004000000L, 0x200L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x8000000L, 0x3L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000000L, 0x6L, 0x0L); case 67: case 99: return jjMoveStringLiteralDfa1_1(0x70000100000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x8L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x10L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0xe00200023000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1e00200043000000L, 0x0L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x1080400000200000L, 0x10L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x2080400000200000L, 0x20L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x800400000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800800000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x140800000L, 0x60L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x280800000L, 0xc0L, 0x0L); case 76: case 108: - return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L); case 78: case 110: return jjMoveStringLiteralDfa1_1(0x3000000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x8000000000000000L, 0x80L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x101L, 0x0L); case 80: case 112: - return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x4000280000000L, 0x4L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4000500000000L, 0x8L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x4018000800000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8018001000000000L, 0x0L, 0x0L); case 84: case 116: return jjMoveStringLiteralDfa1_1(0x60000000000000L, 0x0L, 0x0L); @@ -554,14 +553,15 @@ static private final int jjMoveStringLiteralDfa0_1() case 119: return jjMoveStringLiteralDfa1_1(0x100000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 89); + return jjStopAtPos(0, 90); case 124: - jjmatchedKind = 130; - return jjMoveStringLiteralDfa1_1(0x0L, 0x200800000000000L, 0x0L); + jjmatchedKind = 132; + return jjMoveStringLiteralDfa1_1(0x0L, 0x801000000000000L, 0x0L); case 125: - return jjStopAtPos(0, 90); + return jjStopAtPos(0, 91); case 126: - return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000L, 0x0L); + jjmatchedKind = 120; + return jjMoveStringLiteralDfa1_1(0x0L, 0x10000000000000L, 0x0L); default : return jjMoveNfa_1(3, 0); } @@ -576,53 +576,51 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x400000000000000L) != 0L) - return jjStopAtPos(1, 122); + if ((active1 & 0x1000000000000000L) != 0L) + return jjStopAtPos(1, 124); break; case 42: if ((active0 & 0x4000L) != 0L) return jjStartNfaWithStates_1(1, 14, 0); break; case 43: - if ((active1 & 0x800000000000000L) != 0L) - return jjStopAtPos(1, 123); + if ((active1 & 0x2000000000000000L) != 0L) + return jjStopAtPos(1, 125); break; case 45: - if ((active1 & 0x1000000000000000L) != 0L) - return jjStopAtPos(1, 124); + if ((active1 & 0x4000000000000000L) != 0L) + return jjStopAtPos(1, 126); break; case 47: if ((active0 & 0x800L) != 0L) return jjStopAtPos(1, 11); break; case 58: - if ((active0 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 37); + if ((active0 & 0x4000000000L) != 0L) + return jjStopAtPos(1, 38); break; case 60: - if ((active2 & 0x20L) != 0L) + if ((active2 & 0x80L) != 0L) { - jjmatchedKind = 133; + jjmatchedKind = 135; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x100L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x400L); case 61: - if ((active1 & 0x400000000L) != 0L) + if ((active1 & 0x800000000L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 1; } - else if ((active1 & 0x800000000L) != 0L) - return jjStopAtPos(1, 99); else if ((active1 & 0x1000000000L) != 0L) return jjStopAtPos(1, 100); else if ((active1 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 101); + else if ((active1 & 0x4000000000L) != 0L) { - jjmatchedKind = 101; + jjmatchedKind = 102; jjmatchedPos = 1; } - else if ((active1 & 0x40000000000L) != 0L) - return jjStopAtPos(1, 106); else if ((active1 & 0x80000000000L) != 0L) return jjStopAtPos(1, 107); else if ((active1 & 0x100000000000L) != 0L) @@ -641,34 +639,36 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 114); else if ((active1 & 0x8000000000000L) != 0L) return jjStopAtPos(1, 115); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x18000000000L, active2, 0L); + else if ((active1 & 0x10000000000000L) != 0L) + return jjStopAtPos(1, 116); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x30000000000L, active2, 0L); case 62: if ((active0 & 0x10L) != 0L) return jjStopAtPos(1, 4); - else if ((active0 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 36); - else if ((active0 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 38); - else if ((active1 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 102); - else if ((active2 & 0x40L) != 0L) + else if ((active0 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 37); + else if ((active0 & 0x8000000000L) != 0L) + return jjStopAtPos(1, 39); + else if ((active1 & 0x8000000000L) != 0L) + return jjStopAtPos(1, 103); + else if ((active2 & 0x100L) != 0L) { - jjmatchedKind = 134; + jjmatchedKind = 136; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x280L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0xa00L); case 65: case 97: return jjMoveStringLiteralDfa2_1(active0, 0x80010000400000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0x8000000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x5080280000000L, active1, 0x4L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x5080500000000L, active1, 0x8L, active2, 0L); case 70: case 102: if ((active0 & 0x800000L) != 0L) @@ -679,13 +679,13 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjMoveStringLiteralDfa2_1(active0, 0x120000000000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_1(active0, 0x8000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x403100000L, active1, 0x10L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x803100000L, active1, 0x20L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0xe00000140000000L, active1, 0x160L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1e00000280000000L, active1, 0x2c0L, active2, 0L); case 79: case 111: if ((active0 & 0x100000000000L) != 0L) @@ -693,20 +693,20 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l jjmatchedKind = 44; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0x1000c60000000000L, active1, 0xbL, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000c60000000000L, active1, 0x16L, active2, 0L); case 82: case 114: - if ((active1 & 0x80L) != 0L) - return jjStartNfaWithStates_1(1, 71, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x4000001c000000L, active1, 0L, active2, 0L); + if ((active1 & 0x100L) != 0L) + return jjStartNfaWithStates_1(1, 72, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x4000002c000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 61, 14); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(1, 62, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x4000000800000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x8000001000000000L, active1, 0L, active2, 0L); case 85: case 117: return jjMoveStringLiteralDfa2_1(active0, 0xa000000200000L, active1, 0L, active2, 0L); @@ -717,8 +717,8 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l case 120: return jjMoveStringLiteralDfa2_1(active0, 0x200000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x200000000000000L) != 0L) - return jjStopAtPos(1, 121); + if ((active1 & 0x800000000000000L) != 0L) + return jjStopAtPos(1, 123); break; default : break; @@ -737,30 +737,30 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x8000000000L) != 0L) - return jjStopAtPos(2, 103); - else if ((active1 & 0x10000000000L) != 0L) + if ((active1 & 0x10000000000L) != 0L) return jjStopAtPos(2, 104); - else if ((active2 & 0x100L) != 0L) - return jjStopAtPos(2, 136); - else if ((active2 & 0x200L) != 0L) - return jjStopAtPos(2, 137); + else if ((active1 & 0x20000000000L) != 0L) + return jjStopAtPos(2, 105); + else if ((active2 & 0x400L) != 0L) + return jjStopAtPos(2, 138); + else if ((active2 & 0x800L) != 0L) + return jjStopAtPos(2, 139); break; case 62: - if ((active2 & 0x80L) != 0L) - return jjStopAtPos(2, 135); + if ((active2 & 0x200L) != 0L) + return jjStopAtPos(2, 137); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x800100000L, active1, 0x4L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1000100000L, active1, 0x8L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_1(active0, 0x140000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x100L) != 0L) - return jjStartNfaWithStates_1(2, 72, 14); - return jjMoveStringLiteralDfa3_1(active0, 0xe00000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x200L) != 0L) + return jjStartNfaWithStates_1(2, 73, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x1e00000000000000L, active1, 0L, active2, 0L); case 69: case 101: return jjMoveStringLiteralDfa3_1(active0, 0x8000000L, active1, 0L, active2, 0L); @@ -769,13 +769,13 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L, active1, 0L, active2, 0L); case 72: case 104: - return jjMoveStringLiteralDfa3_1(active0, 0x20000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x130000010000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x130000020000000L, active1, 0L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1L, active2, 0L); case 76: case 108: return jjMoveStringLiteralDfa3_1(active0, 0x82000000000000L, active1, 0L, active2, 0L); @@ -784,13 +784,13 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long return jjMoveStringLiteralDfa3_1(active0, 0x60000200000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0x13L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0x26L, active2, 0L); case 80: case 112: return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000L, active1, 0L, active2, 0L); case 81: case 113: - return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L); case 82: case 114: if ((active0 & 0x400000L) != 0L) @@ -800,21 +800,21 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long jjmatchedKind = 46; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x5000000004000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xa000000004000000L, active1, 0L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x18003000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x10013000000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x20L) != 0L) + if ((active1 & 0x40L) != 0L) { - jjmatchedKind = 69; + jjmatchedKind = 70; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x40L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x80L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x8L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x10L, active2, 0L); case 87: case 119: if ((active0 & 0x1000000000000L) != 0L) @@ -838,10 +838,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x8000c000000L, active1, 0x10L); + return jjMoveStringLiteralDfa4_1(active0, 0x8000c000000L, active1, 0x20L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x400000000L, active1, 0x8L); + return jjMoveStringLiteralDfa4_1(active0, 0x800000000L, active1, 0x10L); case 67: case 99: return jjMoveStringLiteralDfa4_1(active0, 0x200000L, active1, 0L); @@ -856,32 +856,32 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long return jjStartNfaWithStates_1(3, 40, 14); else if ((active0 & 0x40000000000000L) != 0L) return jjStartNfaWithStates_1(3, 54, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x9008200001000000L, active1, 0x40L); + return jjMoveStringLiteralDfa4_1(active0, 0x2008200001000000L, active1, 0x81L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x4400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x8800000000000000L, active1, 0L); case 76: case 108: if ((active0 & 0x2000000000000L) != 0L) return jjStartNfaWithStates_1(3, 49, 14); - else if ((active1 & 0x1L) != 0L) + else if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 64; + jjmatchedKind = 65; jjmatchedPos = 3; } - else if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(3, 66, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x100000140000000L, active1, 0x2L); + else if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_1(3, 67, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x100000280000000L, active1, 0x4L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x10000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x20000000L, active1, 0L); case 79: case 111: - if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_1(3, 29, 14); + if ((active0 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(3, 30, 14); else if ((active0 & 0x800000000000L) != 0L) return jjStartNfaWithStates_1(3, 47, 14); break; @@ -889,15 +889,15 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long case 115: if ((active0 & 0x20000000000000L) != 0L) return jjStartNfaWithStates_1(3, 53, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x80020000100000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x480020000100000L, active1, 0L); case 84: case 116: - if ((active0 & 0x8000000000L) != 0L) - return jjStartNfaWithStates_1(3, 39, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x10040800000000L, active1, 0L); + if ((active0 & 0x10000000L) != 0L) + return jjStartNfaWithStates_1(3, 28, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x10041000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x4000280000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x4000500000000L, active1, 0L); case 87: case 119: return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L); @@ -919,31 +919,31 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x1000000400000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x2000000800000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x8010000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0x1L); case 69: case 101: if ((active0 & 0x80000000000000L) != 0L) return jjStartNfaWithStates_1(4, 55, 14); else if ((active0 & 0x100000000000000L) != 0L) return jjStartNfaWithStates_1(4, 56, 14); - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); case 70: case 102: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 58, 14); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 59, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x40L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x80L); case 72: case 104: return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x40a81000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x41501000000L, active1, 0L); case 75: case 107: if ((active0 & 0x8000000L) != 0L) @@ -951,13 +951,13 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x4000200000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x8000200000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L); case 82: case 114: if ((active0 & 0x8000000000000L) != 0L) @@ -970,16 +970,19 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long break; case 84: case 116: - if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_1(4, 28, 14); + if ((active0 & 0x20000000L) != 0L) + return jjStartNfaWithStates_1(4, 29, 14); else if ((active0 & 0x20000000000L) != 0L) return jjStartNfaWithStates_1(4, 41, 14); - else if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_1(4, 68, 14); + else if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(4, 69, 14); return jjMoveStringLiteralDfa5_1(active0, 0x200000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x80140000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x80280000000L, active1, 0L); + case 87: + case 119: + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); case 89: case 121: if ((active0 & 0x4000000L) != 0L) @@ -1003,20 +1006,20 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x4L); case 67: case 99: - if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_1(5, 35, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x1000000000000000L, active1, 0L); + if ((active0 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(5, 36, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x200140000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x200280000000L, active1, 0L); case 69: case 101: - if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_1(5, 67, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x40L); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(5, 68, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x80L); case 70: case 102: if ((active0 & 0x1000000L) != 0L) @@ -1024,8 +1027,8 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long break; case 71: case 103: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 62, 14); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 63, 14); break; case 72: case 104: @@ -1034,11 +1037,11 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x200000000200000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x600000000200000L, active1, 0L); case 76: case 108: - if ((active0 & 0x400000000L) != 0L) - return jjStartNfaWithStates_1(5, 34, 14); + if ((active0 & 0x800000000L) != 0L) + return jjStartNfaWithStates_1(5, 35, 14); return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L); case 78: case 110: @@ -1047,13 +1050,13 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 59, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x280000000L, active1, 0L); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 60, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x500000000L, active1, 0L); case 84: case 116: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 63, 14); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(5, 64, 14); break; default : break; @@ -1073,37 +1076,37 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long { case 69: case 101: - if ((active0 & 0x40000000L) != 0L) + if ((active0 & 0x80000000L) != 0L) { - jjmatchedKind = 30; + jjmatchedKind = 31; jjmatchedPos = 6; } - else if ((active0 & 0x80000000L) != 0L) + else if ((active0 & 0x100000000L) != 0L) { - jjmatchedKind = 31; + jjmatchedKind = 32; jjmatchedPos = 6; } - return jjMoveStringLiteralDfa7_1(active0, 0x300000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x600000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 60, 14); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 61, 14); break; case 76: case 108: return jjMoveStringLiteralDfa7_1(active0, 0x200000000000000L, active1, 0L); case 78: case 110: - if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_1(6, 65, 14); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_1(6, 66, 14); break; case 79: case 111: return jjMoveStringLiteralDfa7_1(active0, 0x200000L, active1, 0L); case 82: case 114: - if ((active1 & 0x40L) != 0L) - return jjStartNfaWithStates_1(6, 70, 14); + if ((active1 & 0x80L) != 0L) + return jjStartNfaWithStates_1(6, 71, 14); break; case 83: case 115: @@ -1114,7 +1117,7 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long case 116: if ((active0 & 0x80000000000L) != 0L) return jjStartNfaWithStates_1(6, 43, 14); - break; + return jjMoveStringLiteralDfa7_1(active0, 0x400000000000000L, active1, 0L); case 85: case 117: return jjMoveStringLiteralDfa7_1(active0, 0x40000000000L, active1, 0L); @@ -1135,7 +1138,10 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long switch(curChar) { case 95: - return jjMoveStringLiteralDfa8_1(active0, 0x300000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x600000000L); + case 67: + case 99: + return jjMoveStringLiteralDfa8_1(active0, 0x400000000000000L); case 69: case 101: if ((active0 & 0x40000000000L) != 0L) @@ -1164,9 +1170,14 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) } switch(curChar) { + case 72: + case 104: + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(8, 58, 14); + break; case 79: case 111: - return jjMoveStringLiteralDfa9_1(active0, 0x300000000L); + return jjMoveStringLiteralDfa9_1(active0, 0x600000000L); default : break; } @@ -1185,7 +1196,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) { case 78: case 110: - return jjMoveStringLiteralDfa10_1(active0, 0x300000000L); + return jjMoveStringLiteralDfa10_1(active0, 0x600000000L); default : break; } @@ -1204,7 +1215,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) { case 67: case 99: - return jjMoveStringLiteralDfa11_1(active0, 0x300000000L); + return jjMoveStringLiteralDfa11_1(active0, 0x600000000L); default : break; } @@ -1223,10 +1234,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0) { case 69: case 101: - if ((active0 & 0x100000000L) != 0L) - return jjStartNfaWithStates_1(11, 32, 14); - else if ((active0 & 0x200000000L) != 0L) + if ((active0 & 0x200000000L) != 0L) return jjStartNfaWithStates_1(11, 33, 14); + else if ((active0 & 0x400000000L) != 0L) + return jjStartNfaWithStates_1(11, 34, 14); break; default : break; @@ -1240,7 +1251,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 64; + jjnewStateCnt = 70; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1261,7 +1272,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) else if (curChar == 39) jjCheckNAddStates(7, 12); else if (curChar == 34) - jjCheckNAddStates(13, 18); + jjCheckNAddStates(13, 20); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1270,15 +1281,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 73) - kind = 73; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 73) - kind = 73; - jjCheckNAddStates(19, 21); + if (kind > 74) + kind = 74; + jjCheckNAddStates(21, 23); } break; case 0: @@ -1296,15 +1307,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1314,9 +1325,9 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 77) - kind = 77; - jjCheckNAddStates(22, 24); + if (kind > 78) + kind = 78; + jjCheckNAddStates(24, 26); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1325,15 +1336,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 77) - kind = 77; + if (kind > 78) + kind = 78; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1343,8 +1354,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 138) - kind = 138; + if (kind > 140) + kind = 140; jjstateSet[jjnewStateCnt++] = 17; break; case 18: @@ -1358,16 +1369,16 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 77) - kind = 77; - jjCheckNAddStates(25, 27); + if (kind > 78) + kind = 78; + jjCheckNAddStates(27, 29); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 77) - kind = 77; - jjCheckNAddStates(25, 27); + if (kind > 78) + kind = 78; + jjCheckNAddStates(27, 29); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1376,8 +1387,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 77) - kind = 77; + if (kind > 78) + kind = 78; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1391,13 +1402,13 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 77) - kind = 77; + if (kind > 78) + kind = 78; jjCheckNAddTwoStates(28, 12); break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(28, 30); + jjCheckNAddStates(30, 32); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1410,85 +1421,91 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 73) - kind = 73; - jjCheckNAddStates(19, 21); + if (kind > 74) + kind = 74; + jjCheckNAddStates(21, 23); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(36, 6); break; case 37: if (curChar == 34) - jjCheckNAddStates(13, 18); + jjCheckNAddStates(13, 20); break; case 38: - if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(31, 33); + jjCheckNAddStates(33, 36); break; case 39: if (curChar == 34) - jjCheckNAddStates(31, 33); - break; - case 41: - if (curChar == 34 && kind > 79) - kind = 79; + jjCheckNAddStates(33, 36); break; case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(34, 36); - break; - case 43: - if (curChar == 34) - jjCheckNAddStates(34, 36); + jjstateSet[jjnewStateCnt++] = 43; break; - case 45: + case 44: if (curChar == 34 && kind > 80) kind = 80; break; + case 45: + jjCheckNAddStates(37, 40); + break; case 46: + if (curChar == 34) + jjCheckNAddStates(37, 40); + break; + case 49: + if ((0xfffffffbffffffffL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 50; + break; + case 51: + if (curChar == 34 && kind > 81) + kind = 81; + break; + case 52: if (curChar == 39) jjCheckNAddStates(7, 12); break; - case 47: + case 53: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(37, 39); + jjCheckNAddStates(41, 43); break; - case 48: + case 54: if (curChar == 39) - jjCheckNAddStates(37, 39); + jjCheckNAddStates(41, 43); break; - case 50: - if (curChar == 39 && kind > 79) - kind = 79; + case 56: + if (curChar == 39 && kind > 80) + kind = 80; break; - case 51: + case 57: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(40, 42); + jjCheckNAddStates(44, 46); break; - case 52: + case 58: if (curChar == 39) - jjCheckNAddStates(40, 42); + jjCheckNAddStates(44, 46); break; - case 54: - if (curChar == 39 && kind > 81) - kind = 81; + case 60: + if (curChar == 39 && kind > 82) + kind = 82; break; - case 56: - jjAddStates(43, 45); + case 62: + jjAddStates(47, 49); break; - case 60: - jjAddStates(46, 48); + case 66: + jjAddStates(50, 52); break; default : break; } @@ -1504,56 +1521,56 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(49, 54); + jjCheckNAddStates(53, 58); break; case 1: if (kind > 13) kind = 13; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 73) - kind = 73; + if ((0x100000001000L & l) != 0L && kind > 74) + kind = 74; break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(55, 56); + jjAddStates(59, 60); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 77) - kind = 77; + if ((0x5000000050L & l) != 0L && kind > 78) + kind = 78; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAdd(14); break; case 16: case 17: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 138) - kind = 138; + if (kind > 140) + kind = 140; jjCheckNAdd(17); break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(57, 58); + jjAddStates(61, 62); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(59, 60); + jjAddStates(63, 64); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(61, 62); + jjAddStates(65, 66); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1562,73 +1579,95 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 73) - kind = 73; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(31, 33); + jjCheckNAddStates(33, 36); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; + case 41: + if (curChar == 123) + jjstateSet[jjnewStateCnt++] = 42; + break; case 42: - jjAddStates(34, 36); + jjstateSet[jjnewStateCnt++] = 43; break; - case 44: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 43; + case 43: + if (curChar == 125) + jjCheckNAddStates(33, 36); + break; + case 45: + jjCheckNAddStates(37, 40); break; case 47: - jjAddStates(37, 39); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 46; + break; + case 48: + if (curChar == 123) + jjstateSet[jjnewStateCnt++] = 49; break; case 49: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 48; + jjstateSet[jjnewStateCnt++] = 50; break; - case 51: - jjAddStates(40, 42); + case 50: + if (curChar == 125) + jjCheckNAddStates(37, 40); break; case 53: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 52; + jjAddStates(41, 43); break; case 55: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 54; + break; + case 57: + jjAddStates(44, 46); + break; + case 59: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 58; + break; + case 61: if (curChar == 96) - jjCheckNAddStates(49, 54); + jjCheckNAddStates(53, 58); break; - case 56: + case 62: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(43, 45); + jjCheckNAddStates(47, 49); break; - case 57: + case 63: if (curChar == 96) - jjCheckNAddStates(43, 45); + jjCheckNAddStates(47, 49); break; - case 58: + case 64: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 57; + jjstateSet[jjnewStateCnt++] = 63; break; - case 59: - if (curChar == 96 && kind > 79) - kind = 79; + case 65: + if (curChar == 96 && kind > 80) + kind = 80; break; - case 60: + case 66: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(46, 48); + jjCheckNAddStates(50, 52); break; - case 61: + case 67: if (curChar == 96) - jjCheckNAddStates(46, 48); + jjCheckNAddStates(50, 52); break; - case 62: + case 68: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 61; + jjstateSet[jjnewStateCnt++] = 67; break; - case 63: - if (curChar == 96 && kind > 82) - kind = 82; + case 69: + if (curChar == 96 && kind > 83) + kind = 83; break; default : break; } @@ -1646,8 +1685,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 83) - kind = 83; + if (kind > 84) + kind = 84; jjCheckNAdd(14); break; case 1: @@ -1658,33 +1697,41 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 138) - kind = 138; + if (kind > 140) + kind = 140; jjCheckNAdd(17); break; case 38: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(31, 33); + jjAddStates(33, 36); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(34, 36); + jjstateSet[jjnewStateCnt++] = 43; break; - case 47: + case 45: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 39); + jjAddStates(37, 40); break; - case 51: + case 49: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(40, 42); + jjstateSet[jjnewStateCnt++] = 50; break; - case 56: + case 53: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(43, 45); + jjAddStates(41, 43); break; - case 60: + case 57: + if ((jjbitVec0[i2] & l2) != 0L) + jjAddStates(44, 46); + break; + case 62: + if ((jjbitVec0[i2] & l2) != 0L) + jjAddStates(47, 49); + break; + case 66: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(46, 48); + jjAddStates(50, 52); break; default : break; } @@ -1697,7 +1744,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 70 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -1731,15 +1778,16 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) return 2; } static final int[] jjnextStates = { - 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, 40, 41, - 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, - 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, 60, 62, - 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, 32, + 19, 20, 25, 26, 29, 30, 12, 53, 55, 56, 57, 59, 60, 38, 40, 41, + 44, 45, 47, 48, 51, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, + 12, 38, 40, 41, 44, 45, 47, 48, 51, 53, 55, 56, 57, 59, 60, 62, + 64, 65, 66, 68, 69, 62, 64, 65, 66, 68, 69, 10, 11, 23, 24, 27, + 28, 31, 32, }; public static final String[] jjstrLiteralImages = { "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, null, null, null, null, "\55\76", +null, null, null, null, null, null, null, null, null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, @@ -1747,9 +1795,9 @@ null, null, null, null, null, null, null, null, null, "\50", "\51", "\173", "\17 "\133", "\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", "\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\100", "\44", -"\41", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", -"\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", "\74\74\75", -"\76\76\75", null, }; +"\41", "\176", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", +"\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", +"\74\74\75", "\76\76\75", null, }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", @@ -1763,10 +1811,10 @@ public static final int[] jjnewLexState = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffffffffff0001fL, 0xffffffffff8fa3ffL, 0x7ffL, + 0xfffffffffff0001fL, 0xffffffffff1f47ffL, 0x1fffL, }; static final long[] jjtoSkip = { 0x7ffe0L, 0x0L, 0x0L, @@ -1778,8 +1826,8 @@ static final long[] jjtoMore = { 0x80000L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; -static private final int[] jjrounds = new int[64]; -static private final int[] jjstateSet = new int[128]; +static private final int[] jjrounds = new int[70]; +static private final int[] jjstateSet = new int[140]; static StringBuffer image; static int jjimageLen; static int lengthOfMatch; @@ -1806,7 +1854,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 64; i-- > 0;) + for (i = 70; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState) diff --git a/net.sourceforge.phpeclipse/src/test/PHPVar.java b/net.sourceforge.phpeclipse/src/test/PHPVar.java new file mode 100644 index 0000000..aa2123c --- /dev/null +++ b/net.sourceforge.phpeclipse/src/test/PHPVar.java @@ -0,0 +1,96 @@ +package test; + +import net.sourceforge.phpeclipse.PHPeclipsePlugin; + +/** + * A Variable usage. It could be a first use, an in code use of an already declared var. + * In fact I'm not sure for the moment I will keep this + * @author Matthieu Casanova + */ +public class PHPVar { + + /** The name of the variable. It couldn't be changed. */ + private final String name; + + /** The value. It could change. */ + private String value; + + private String prefix; + + /** + * Does the variable have a value or not. + * If we don't know if it was initialized it should be set on true. + * (when we have a global keyword for example) + */ + private boolean initialized; + + /** This variable indicate if it is used or not in the code. */ + private boolean used; + + /** + * We initialize the name and the value of the variable. + * @param name the name of the variable + * @param value the value of the variable + */ + public PHPVar(String name, String value) { + this.name = name; + this.value = value; + initialized = value != null; + } + + /** + * We initialize the name of the variable. The value will be null + * @param name the name of the variable + */ + public PHPVar(String name) { + this.name = name; + } + + /** + * Initialize the variable name and set the initialization status. + * @param name the name of the variable + * @param initialized the initialization status (it should be true or it's unuseful) + */ + public PHPVar(String name, boolean initialized) { + this(name); + this.initialized = initialized; + } + + /** + * Give a prefix to the variable. + * @param prefix a prefix + */ + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public void setUsed(boolean used) { + PHPeclipsePlugin.log(1,name + " is used"); + this.used = used; + } + + public String getName() { + return name; + } + + public boolean isUsed() { + return used; + } + + /** + * Return a human readable variable (: + * @return a string representation of the object. + */ + public String toString() { + if (value == null) { + if (prefix != null) { + return prefix + "$" + name; + } + return "$" + name; + } + if (prefix != null) { + return prefix + "$" + name + "=" + value; + } + return "$" + name + "=" + value; + } +} -- 1.7.1