From: kpouer Date: Tue, 11 Mar 2003 16:36:41 +0000 (+0000) Subject: A lot of bug fixed X-Git-Url: http://secure.phpeclipse.com A lot of bug fixed --- diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 4a04ce3..da360a9 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -43,18 +43,18 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon public PHPParser() { } - public final void setFileToParse(IFile fileToParse) { + public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; } - public PHPParser(IFile fileToParse) { + public PHPParser(final IFile fileToParse) { this(new StringReader("")); this.fileToParse = fileToParse; } - public static final void phpParserTester(String strEval) throws CoreException, ParseException { + public static final void phpParserTester(final String strEval) throws CoreException, ParseException { PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); - StringReader stream = new StringReader(strEval); + final StringReader stream = new StringReader(strEval); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } @@ -62,8 +62,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon phpTest(); } - public static final void htmlParserTester(String strEval) throws CoreException, ParseException { - StringReader stream = new StringReader(strEval); + public static final void htmlParserTester(final String strEval) throws CoreException, ParseException { + final StringReader stream = new StringReader(strEval); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } @@ -71,10 +71,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon phpFile(); } - public final PHPOutlineInfo parseInfo(Object parent, String s) { + public final PHPOutlineInfo parseInfo(final Object parent, final String s) { outlineInfo = new PHPOutlineInfo(parent); currentSegment = outlineInfo.getDeclarations(); - StringReader stream = new StringReader(s); + final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } @@ -103,8 +103,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** * Create marker for the parse error + * @param e the ParseException */ - private static void setMarker(ParseException e) { + private static void setMarker(final ParseException e) { try { setMarker(fileToParse, errorMessage, @@ -120,12 +121,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** * Create markers according to the external parser output */ - private static void createMarkers(String output, IFile file) throws CoreException { + private static void createMarkers(final String output, final IFile file) throws CoreException { // delete all markers file.deleteMarkers(IMarker.PROBLEM, false, 0); int indx = 0; - int brIndx = 0; + int brIndx; boolean flag = true; while ((brIndx = output.indexOf("
", indx)) != -1) { // newer php error output (tested with 4.2.3) @@ -142,7 +143,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - private static void scanLine(String output, IFile file, int indx, int brIndx) throws CoreException { + private static void scanLine(final String output, + final IFile file, + final int indx, + final int brIndx) throws CoreException { String current; StringBuffer lineNumberBuffer = new StringBuffer(10); char ch; @@ -180,8 +184,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - public final void parse(String s) throws CoreException { - StringReader stream = new StringReader(s); + public final void parse(final String s) throws CoreException { + final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } @@ -197,15 +201,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * Call the php parse command ( php -l -f <filename> ) * and create markers according to the external parser output */ - public static void phpExternalParse(IFile file) { - IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); - String filename = file.getLocation().toString(); + public static void phpExternalParse(final IFile file) { + final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); + final String filename = file.getLocation().toString(); - String[] arguments = { filename }; - MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); - String command = form.format(arguments); + final String[] arguments = { filename }; + final MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); + final String command = form.format(arguments); - String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: "); + final String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: "); try { // parse the buffer to find the errors and warnings @@ -219,13 +223,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon phpFile(); } -/***************************************** - * THE JAVA LANGUAGE GRAMMAR STARTS HERE * - *****************************************/ - -/* - * Program structuring syntax follows. - */ static final public void phpTest() throws ParseException { Php(); jj_consume_token(0); @@ -236,22 +233,57 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon label_1: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PHPSTART: + case PHPSTARTSHORT: + case PHPSTARTLONG: + case PHPECHOSTART: + case PHPEND: + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case BREAK: + 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[0] = jj_gen; break label_1; } - jj_consume_token(PHPSTART); - Php(); - try { - jj_consume_token(PHPEND); - } catch (ParseException e) { - errorMessage = "'?>' expected"; - errorLevel = ERROR; - {if (true) throw e;} - } + PhpBlock(); } jj_consume_token(0); } catch (TokenMgrError e) { @@ -261,6 +293,111 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } + static final public void PhpBlock() throws ParseException { + final int start = jj_input_stream.bufpos; + 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); + break; + case PHPSTARTSHORT: + case PHPSTARTLONG: + case PHPEND: + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case BREAK: + 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: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTSHORT: + case PHPSTARTLONG: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTLONG: + jj_consume_token(PHPSTARTLONG); + break; + case PHPSTARTSHORT: + jj_consume_token(PHPSTARTSHORT); + try { + setMarker(fileToParse, + "You should use '' expected"; + errorLevel = ERROR; + {if (true) throw e;} + } + break; + default: + jj_la1[4] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + static final public void Php() throws ParseException { label_2: while (true) { @@ -269,6 +406,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case FUNCTION: case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -277,16 +415,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -308,7 +445,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ; break; default: - jj_la1[1] = jj_gen; + jj_la1[5] = jj_gen; break label_2; } BlockStatement(); @@ -316,8 +453,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } static final public void ClassDeclaration() throws ParseException { - PHPClassDeclaration classDeclaration; - Token className; + final PHPClassDeclaration classDeclaration; + final Token className; final int pos = jj_input_stream.bufpos; jj_consume_token(CLASS); className = jj_consume_token(IDENTIFIER); @@ -327,7 +464,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_consume_token(IDENTIFIER); break; default: - jj_la1[2] = jj_gen; + jj_la1[6] = jj_gen; ; } if (currentSegment != null) { @@ -357,7 +494,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ; break; default: - jj_la1[3] = jj_gen; + jj_la1[7] = jj_gen; break label_3; } ClassBodyDeclaration(); @@ -380,7 +517,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon FieldDeclaration(); break; default: - jj_la1[4] = jj_gen; + jj_la1[8] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -400,7 +537,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ; break; default: - jj_la1[5] = jj_gen; + jj_la1[9] = jj_gen; break label_4; } jj_consume_token(COMMA); @@ -419,7 +556,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } static final public PHPVarDeclaration VariableDeclarator() throws ParseException { - String varName; + final String varName; String varValue = null; final int pos = jj_input_stream.bufpos; varName = VariableDeclaratorId(); @@ -428,6 +565,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);} } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; @@ -435,13 +573,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } break; default: - jj_la1[6] = jj_gen; + jj_la1[10] = jj_gen; ; } - if (varValue == null) { - {if (true) return new PHPVarDeclaration(currentSegment,varName,pos);} - } - {if (true) return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} + {if (true) return new PHPVarDeclaration(currentSegment,varName,pos);} throw new Error("Missing return statement in function"); } @@ -472,7 +607,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public String Variable() throws ParseException { String expr = null; - Token token; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR_ID: token = jj_consume_token(DOLLAR_ID); @@ -483,7 +618,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_consume_token(RBRACE); break; default: - jj_la1[7] = jj_gen; + jj_la1[11] = jj_gen; ; } if (expr == null) { @@ -497,7 +632,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon {if (true) return "$" + expr;} break; default: - jj_la1[8] = jj_gen; + jj_la1[12] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -506,7 +641,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public String VariableName() throws ParseException { String expr = null; -Token token; +final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: jj_consume_token(LBRACE); @@ -523,7 +658,7 @@ Token token; jj_consume_token(RBRACE); break; default: - jj_la1[9] = jj_gen; + jj_la1[13] = jj_gen; ; } if (expr == null) { @@ -546,7 +681,7 @@ Token token; expr = VariableName(); break; default: - jj_la1[10] = jj_gen; + jj_la1[14] = jj_gen; ; } if (expr == null) { @@ -555,7 +690,7 @@ Token token; {if (true) return token.image + expr;} break; default: - jj_la1[11] = jj_gen; + jj_la1[15] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -563,12 +698,12 @@ Token token; } static final public String VariableInitializer() throws ParseException { - String expr; - Token token; + final String expr; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case FALSE: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -585,7 +720,7 @@ Token token; token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[12] = jj_gen; + jj_la1[16] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -601,7 +736,7 @@ Token token; token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[13] = jj_gen; + jj_la1[17] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -616,7 +751,7 @@ Token token; {if (true) return token.image;} break; default: - jj_la1[14] = jj_gen; + jj_la1[18] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -635,7 +770,7 @@ final StringBuffer buff = new StringBuffer(); buff.append("=>").append(expr); break; default: - jj_la1[15] = jj_gen; + jj_la1[19] = jj_gen; ; } {if (true) return buff.toString();} @@ -643,16 +778,16 @@ final StringBuffer buff = new StringBuffer(); } static final public String ArrayInitializer() throws ParseException { -String expr = null; +String expr; final StringBuffer buff = new StringBuffer("("); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -682,7 +817,7 @@ final StringBuffer buff = new StringBuffer("("); } break; default: - jj_la1[16] = jj_gen; + jj_la1[20] = jj_gen; ; } jj_consume_token(RPAREN); @@ -692,7 +827,7 @@ final StringBuffer buff = new StringBuffer("("); } static final public void MethodDeclaration() throws ParseException { - PHPFunctionDeclaration functionDeclaration; + final PHPFunctionDeclaration functionDeclaration; jj_consume_token(FUNCTION); functionDeclaration = MethodDeclarator(); if (currentSegment != null) { @@ -706,9 +841,9 @@ final StringBuffer buff = new StringBuffer("("); } static final public PHPFunctionDeclaration MethodDeclarator() throws ParseException { - Token identifier; - StringBuffer methodDeclaration = new StringBuffer(); - String formalParameters; + final Token identifier; + final StringBuffer methodDeclaration = new StringBuffer(); + final String formalParameters; final int pos = jj_input_stream.bufpos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: @@ -716,7 +851,7 @@ final StringBuffer buff = new StringBuffer("("); methodDeclaration.append("&"); break; default: - jj_la1[17] = jj_gen; + jj_la1[21] = jj_gen; ; } identifier = jj_consume_token(IDENTIFIER); @@ -750,7 +885,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[18] = jj_gen; + jj_la1[22] = jj_gen; break label_7; } jj_consume_token(COMMA); @@ -759,7 +894,7 @@ final StringBuffer buff = new StringBuffer("("); } break; default: - jj_la1[19] = jj_gen; + jj_la1[23] = jj_gen; ; } try { @@ -775,7 +910,7 @@ final StringBuffer buff = new StringBuffer("("); } static final public String FormalParameter() throws ParseException { - PHPVarDeclaration variableDeclaration; + final PHPVarDeclaration variableDeclaration; final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: @@ -783,7 +918,7 @@ final StringBuffer buff = new StringBuffer("("); buff.append("&"); break; default: - jj_la1[20] = jj_gen; + jj_la1[24] = jj_gen; ; } variableDeclaration = VariableDeclarator(); @@ -831,7 +966,7 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return "object";} break; default: - jj_la1[21] = jj_gen; + jj_la1[25] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -839,19 +974,19 @@ final StringBuffer buff = new StringBuffer("("); } static final public String Expression() throws ParseException { - String expr; - String assignOperator = null; - String expr2 = null; + final String expr; + final String assignOperator; + final String expr2; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PRINT: expr = PrintExpression(); {if (true) return expr;} break; case ARRAY: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -878,12 +1013,13 @@ final StringBuffer buff = new StringBuffer("("); case XORASSIGN: case DOTASSIGN: case REMASSIGN: + case TILDEEQUAL: case LSHIFTASSIGN: case RSIGNEDSHIFTASSIGN: - case TILDEEQUAL: assignOperator = AssignmentOperator(); try { expr2 = Expression(); + {if (true) return expr + assignOperator + expr2;} } catch (ParseException e) { errorMessage = "expression expected"; errorLevel = ERROR; @@ -891,17 +1027,13 @@ final StringBuffer buff = new StringBuffer("("); } break; default: - jj_la1[22] = jj_gen; + jj_la1[26] = jj_gen; ; } - if (expr2 == null) { - {if (true) return expr;} - } else { - {if (true) return expr + assignOperator + expr2;} - } + {if (true) return expr;} break; default: - jj_la1[23] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -963,7 +1095,7 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return "~=";} break; default: - jj_la1[24] = jj_gen; + jj_la1[28] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -971,7 +1103,7 @@ final StringBuffer buff = new StringBuffer("("); } static final public String ConditionalExpression() throws ParseException { - String expr; + final String expr; String expr2 = null; String expr3 = null; expr = ConditionalOrExpression(); @@ -983,7 +1115,7 @@ final StringBuffer buff = new StringBuffer("("); expr3 = ConditionalExpression(); break; default: - jj_la1[25] = jj_gen; + jj_la1[29] = jj_gen; ; } if (expr3 == null) { @@ -997,10 +1129,9 @@ final StringBuffer buff = new StringBuffer("("); static final public String ConditionalOrExpression() throws ParseException { String expr; Token operator; - String expr2 = null; final StringBuffer buff = new StringBuffer(); expr = ConditionalAndExpression(); - buff.append(expr); + buff.append(expr); label_8: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1009,7 +1140,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[26] = jj_gen; + jj_la1[30] = jj_gen; break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1020,13 +1151,13 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(_ORL); break; default: - jj_la1[27] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr2 = ConditionalAndExpression(); + expr = ConditionalAndExpression(); buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } {if (true) return buff.toString();} throw new Error("Missing return statement in function"); @@ -1035,10 +1166,9 @@ final StringBuffer buff = new StringBuffer("("); static final public String ConditionalAndExpression() throws ParseException { String expr; Token operator; - String expr2 = null; final StringBuffer buff = new StringBuffer(); expr = ConcatExpression(); - buff.append(expr); + buff.append(expr); label_9: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1047,7 +1177,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[28] = jj_gen; + jj_la1[32] = jj_gen; break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1058,24 +1188,23 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(_ANDL); break; default: - jj_la1[29] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr2 = ConcatExpression(); + expr = ConcatExpression(); buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } - {if (true) return buff.toString();} + {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } static final public String ConcatExpression() throws ParseException { String expr; - String expr2 = null; final StringBuffer buff = new StringBuffer(); expr = InclusiveOrExpression(); - buff.append(expr); + buff.append(expr); label_10: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1083,24 +1212,22 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[30] = jj_gen; + jj_la1[34] = jj_gen; break label_10; } jj_consume_token(DOT); - expr2 = InclusiveOrExpression(); - buff.append("."); - buff.append(expr2); + expr = InclusiveOrExpression(); + buff.append(".").append(expr); } - {if (true) return buff.toString();} + {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } static final public String InclusiveOrExpression() throws ParseException { String expr; - String expr2 = null; final StringBuffer buff = new StringBuffer(); expr = ExclusiveOrExpression(); - buff.append(expr); + buff.append(expr); label_11: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1108,21 +1235,19 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[31] = jj_gen; + jj_la1[35] = jj_gen; break label_11; } jj_consume_token(BIT_OR); - expr2 = ExclusiveOrExpression(); - buff.append("|"); - buff.append(expr2); + expr = ExclusiveOrExpression(); + buff.append("|").append(expr); } - {if (true) return buff.toString();} + {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } static final public String ExclusiveOrExpression() throws ParseException { String expr; - String expr2 = null; final StringBuffer buff = new StringBuffer(); expr = AndExpression(); buff.append(expr); @@ -1133,21 +1258,20 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[32] = jj_gen; + jj_la1[36] = jj_gen; break label_12; } jj_consume_token(XOR); - expr2 = AndExpression(); + expr = AndExpression(); buff.append("^"); - buff.append(expr2); + buff.append(expr); } {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } static final public String AndExpression() throws ParseException { - final String expr; - String expr2 = null; + String expr; final StringBuffer buff = new StringBuffer(); expr = EqualityExpression(); buff.append(expr); @@ -1158,22 +1282,20 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[33] = jj_gen; + jj_la1[37] = jj_gen; break label_13; } jj_consume_token(BIT_AND); - expr2 = EqualityExpression(); - buff.append("&"); - buff.append(expr2); + expr = EqualityExpression(); + buff.append("&").append(expr); } - {if (true) return buff.toString();} + {if (true) return buff.toString();} throw new Error("Missing return statement in function"); } static final public String EqualityExpression() throws ParseException { String expr; Token operator; - String expr2; final StringBuffer buff = new StringBuffer(); expr = RelationalExpression(); buff.append(expr); @@ -1188,7 +1310,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[34] = jj_gen; + jj_la1[38] = jj_gen; break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1208,13 +1330,13 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(TRIPLEEQUAL); break; default: - jj_la1[35] = jj_gen; + jj_la1[39] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr2 = RelationalExpression(); + expr = RelationalExpression(); buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } {if (true) return buff.toString();} throw new Error("Missing return statement in function"); @@ -1223,7 +1345,6 @@ final StringBuffer buff = new StringBuffer("("); static final public String RelationalExpression() throws ParseException { String expr; Token operator; - String expr2; final StringBuffer buff = new StringBuffer(); expr = ShiftExpression(); buff.append(expr); @@ -1237,7 +1358,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[36] = jj_gen; + jj_la1[40] = jj_gen; break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1254,13 +1375,12 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(GE); break; default: - jj_la1[37] = jj_gen; + jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr2 = ShiftExpression(); - buff.append(operator.image); - buff.append(expr2); + expr = ShiftExpression(); + buff.append(operator.image).append(expr); } {if (true) return buff.toString();} throw new Error("Missing return statement in function"); @@ -1281,7 +1401,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[38] = jj_gen; + jj_la1[42] = jj_gen; break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1295,7 +1415,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(RUNSIGNEDSHIFT); break; default: - jj_la1[39] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1321,7 +1441,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[40] = jj_gen; + jj_la1[44] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1332,7 +1452,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(MINUS); break; default: - jj_la1[41] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1359,7 +1479,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[42] = jj_gen; + jj_la1[46] = jj_gen; break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1373,7 +1493,7 @@ final StringBuffer buff = new StringBuffer("("); operator = jj_consume_token(REM); break; default: - jj_la1[43] = jj_gen; + jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1389,8 +1509,8 @@ final StringBuffer buff = new StringBuffer("("); * An unary expression starting with @, & or nothing */ static final public String UnaryExpression() throws ParseException { - String expr; - Token token; + final String expr; + final Token token; final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: @@ -1402,10 +1522,10 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return token.image + expr;} break; case ARRAY: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1426,7 +1546,7 @@ final StringBuffer buff = new StringBuffer("("); ; break; default: - jj_la1[44] = jj_gen; + jj_la1[48] = jj_gen; break label_19; } jj_consume_token(AT); @@ -1436,7 +1556,7 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return buff.append(expr).toString();} break; default: - jj_la1[45] = jj_gen; + jj_la1[49] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1444,8 +1564,8 @@ final StringBuffer buff = new StringBuffer("("); } static final public String UnaryExpressionNoPrefix() throws ParseException { - String expr; - Token token; + final String expr; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: case MINUS: @@ -1457,7 +1577,7 @@ final StringBuffer buff = new StringBuffer("("); token = jj_consume_token(MINUS); break; default: - jj_la1[46] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1473,10 +1593,10 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return expr;} break; case ARRAY: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1489,7 +1609,7 @@ final StringBuffer buff = new StringBuffer("("); {if (true) return expr;} break; default: - jj_la1[47] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1497,7 +1617,7 @@ final StringBuffer buff = new StringBuffer("("); } static final public String PreIncrementExpression() throws ParseException { -String expr; +final String expr; jj_consume_token(INCR); expr = PrimaryExpression(); {if (true) return "++"+expr;} @@ -1505,7 +1625,7 @@ String expr; } static final public String PreDecrementExpression() throws ParseException { -String expr; +final String expr; jj_consume_token(DECR); expr = PrimaryExpression(); {if (true) return "--"+expr;} @@ -1513,7 +1633,7 @@ String expr; } static final public String UnaryExpressionNotPlusMinus() throws ParseException { - String expr; + final String expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BANG: jj_consume_token(BANG); @@ -1521,7 +1641,7 @@ String expr; {if (true) return "!" + expr;} break; default: - jj_la1[48] = jj_gen; + jj_la1[52] = jj_gen; if (jj_2_3(2147483647)) { expr = CastExpression(); {if (true) return expr;} @@ -1535,9 +1655,9 @@ String expr; expr = PostfixExpression(); {if (true) return expr;} break; - case FALSE: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1551,7 +1671,7 @@ String expr; {if (true) return "("+expr+")";} break; default: - jj_la1[49] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1571,7 +1691,7 @@ final String type, expr; } static final public String PostfixExpression() throws ParseException { - String expr; + final String expr; Token operator = null; expr = PrimaryExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1585,13 +1705,13 @@ final String type, expr; operator = jj_consume_token(DECR); break; default: - jj_la1[50] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[51] = jj_gen; + jj_la1[55] = jj_gen; ; } if (operator == null) { @@ -1602,7 +1722,7 @@ final String type, expr; } static final public String PrimaryExpression() throws ParseException { - Token identifier; + final Token identifier; String expr; final StringBuffer buff = new StringBuffer(); if (jj_2_4(2)) { @@ -1619,7 +1739,7 @@ final String type, expr; ; break; default: - jj_la1[52] = jj_gen; + jj_la1[56] = jj_gen; break label_20; } expr = PrimarySuffix(); @@ -1643,7 +1763,7 @@ final String type, expr; ; break; default: - jj_la1[53] = jj_gen; + jj_la1[57] = jj_gen; break label_21; } expr = PrimarySuffix(); @@ -1656,7 +1776,7 @@ final String type, expr; {if (true) return "array" + expr;} break; default: - jj_la1[54] = jj_gen; + jj_la1[58] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1673,8 +1793,8 @@ final String type, expr; } static final public String PrimaryPrefix() throws ParseException { - String expr; - Token token = null; + final String expr; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: token = jj_consume_token(IDENTIFIER); @@ -1691,7 +1811,7 @@ final String type, expr; {if (true) return expr;} break; default: - jj_la1[55] = jj_gen; + jj_la1[59] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1699,8 +1819,8 @@ final String type, expr; } static final public String ClassIdentifier() throws ParseException { - String expr; - Token token; + final String expr; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: token = jj_consume_token(IDENTIFIER); @@ -1712,7 +1832,7 @@ final String type, expr; {if (true) return expr;} break; default: - jj_la1[56] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1720,7 +1840,7 @@ final String type, expr; } static final public String PrimarySuffix() throws ParseException { - String expr; + final String expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: expr = Arguments(); @@ -1732,7 +1852,7 @@ final String type, expr; {if (true) return expr;} break; default: - jj_la1[57] = jj_gen; + jj_la1[61] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1752,10 +1872,10 @@ final String type, expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1773,7 +1893,7 @@ final String type, expr; expr = Expression(); break; default: - jj_la1[58] = jj_gen; + jj_la1[62] = jj_gen; ; } try { @@ -1789,7 +1909,7 @@ final String type, expr; {if (true) return "[" + expr + "]";} break; default: - jj_la1[59] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1797,8 +1917,8 @@ final String type, expr; } static final public String Literal() throws ParseException { - String expr; - Token token; + final String expr; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INTEGER_LITERAL: token = jj_consume_token(INTEGER_LITERAL); @@ -1812,8 +1932,8 @@ final String type, expr; token = jj_consume_token(STRING_LITERAL); {if (true) return token.image;} break; - case FALSE: case TRUE: + case FALSE: expr = BooleanLiteral(); {if (true) return expr;} break; @@ -1822,7 +1942,7 @@ final String type, expr; {if (true) return expr;} break; default: - jj_la1[60] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1840,7 +1960,7 @@ final String type, expr; {if (true) return "false";} break; default: - jj_la1[61] = jj_gen; + jj_la1[65] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1859,10 +1979,10 @@ String expr = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1880,7 +2000,7 @@ String expr = null; expr = ArgumentList(); break; default: - jj_la1[62] = jj_gen; + jj_la1[66] = jj_gen; ; } try { @@ -1909,7 +2029,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[63] = jj_gen; + jj_la1[67] = jj_gen; break label_22; } jj_consume_token(COMMA); @@ -1920,7 +2040,7 @@ final StringBuffer buff = new StringBuffer(); errorLevel = ERROR; {if (true) throw e;} } - buff.append(",").append("expr"); + buff.append(",").append(expr); } {if (true) return buff.toString();} throw new Error("Missing return statement in function"); @@ -1937,11 +2057,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case PHPEND: + jj_consume_token(PHPEND); break; default: - jj_la1[64] = jj_gen; + jj_la1[68] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2016,7 +2136,7 @@ final StringBuffer buff = new StringBuffer(); jj_consume_token(AT); break; default: - jj_la1[65] = jj_gen; + jj_la1[69] = jj_gen; ; } IncludeStatement(); @@ -2028,7 +2148,7 @@ final StringBuffer buff = new StringBuffer(); GlobalStatement(); break; default: - jj_la1[66] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2036,7 +2156,7 @@ final StringBuffer buff = new StringBuffer(); } static final public void IncludeStatement() throws ParseException { - String expr; + final String expr; final int pos = jj_input_stream.bufpos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case REQUIRE: @@ -2050,11 +2170,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[67] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2075,11 +2195,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[68] = jj_gen; + jj_la1[72] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2100,11 +2220,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[69] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2125,11 +2245,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[70] = jj_gen; + jj_la1[74] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2140,7 +2260,7 @@ final StringBuffer buff = new StringBuffer(); } break; default: - jj_la1[71] = jj_gen; + jj_la1[75] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2148,7 +2268,7 @@ final StringBuffer buff = new StringBuffer(); static final public String PrintExpression() throws ParseException { final StringBuffer buff = new StringBuffer("print "); - String expr; + final String expr; jj_consume_token(PRINT); expr = Expression(); buff.append(expr); @@ -2166,7 +2286,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[72] = jj_gen; + jj_la1[76] = jj_gen; break label_23; } jj_consume_token(COMMA); @@ -2177,11 +2297,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[73] = jj_gen; + jj_la1[77] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2202,7 +2322,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[74] = jj_gen; + jj_la1[78] = jj_gen; break label_24; } jj_consume_token(COMMA); @@ -2213,11 +2333,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[75] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2238,7 +2358,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[76] = jj_gen; + jj_la1[80] = jj_gen; break label_25; } jj_consume_token(COMMA); @@ -2249,11 +2369,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[77] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2285,6 +2405,7 @@ final StringBuffer buff = new StringBuffer(); case FUNCTION: case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2293,16 +2414,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -2324,7 +2444,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[78] = jj_gen; + jj_la1[82] = jj_gen; break label_26; } BlockStatement(); @@ -2336,6 +2456,7 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2344,16 +2465,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -2381,14 +2501,14 @@ final StringBuffer buff = new StringBuffer(); MethodDeclaration(); break; default: - jj_la1[79] = jj_gen; + jj_la1[83] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } static final public void LocalVariableDeclaration() throws ParseException { - VariableDeclarator(); + LocalVariableDeclarator(); label_27: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2396,11 +2516,24 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[80] = jj_gen; + jj_la1[84] = jj_gen; break label_27; } jj_consume_token(COMMA); - VariableDeclarator(); + LocalVariableDeclarator(); + } + } + + static final public void LocalVariableDeclarator() throws ParseException { + VariableDeclaratorId(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ASSIGN: + jj_consume_token(ASSIGN); + Expression(); + break; + default: + jj_la1[85] = jj_gen; + ; } } @@ -2424,8 +2557,6 @@ final StringBuffer buff = new StringBuffer(); PrimaryExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: - case INCR: - case DECR: case PLUSASSIGN: case MINUSASSIGN: case STARASSIGN: @@ -2435,9 +2566,11 @@ final StringBuffer buff = new StringBuffer(); case XORASSIGN: case DOTASSIGN: case REMASSIGN: + case TILDEEQUAL: + case INCR: + case DECR: case LSHIFTASSIGN: case RSIGNEDSHIFTASSIGN: - case TILDEEQUAL: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCR: jj_consume_token(INCR); @@ -2455,25 +2588,25 @@ final StringBuffer buff = new StringBuffer(); case XORASSIGN: case DOTASSIGN: case REMASSIGN: + case TILDEEQUAL: case LSHIFTASSIGN: case RSIGNEDSHIFTASSIGN: - case TILDEEQUAL: AssignmentOperator(); Expression(); break; default: - jj_la1[81] = jj_gen; + jj_la1[86] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[82] = jj_gen; + jj_la1[87] = jj_gen; ; } break; default: - jj_la1[83] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2493,7 +2626,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[84] = jj_gen; + jj_la1[89] = jj_gen; break label_28; } SwitchLabel(); @@ -2504,6 +2637,7 @@ final StringBuffer buff = new StringBuffer(); case FUNCTION: case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2512,16 +2646,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -2543,7 +2676,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[85] = jj_gen; + jj_la1[90] = jj_gen; break label_29; } BlockStatement(); @@ -2564,21 +2697,21 @@ final StringBuffer buff = new StringBuffer(); jj_consume_token(COLON); break; default: - jj_la1[86] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } static final public void IfStatement() throws ParseException { - Token token; + final Token token; final int pos = jj_input_stream.bufpos; token = jj_consume_token(IF); Condition("if"); IfStatement0(pos,pos+token.image.length()); } - static final public void Condition(String keyword) throws ParseException { + static final public void Condition(final String keyword) throws ParseException { try { jj_consume_token(LPAREN); } catch (ParseException e) { @@ -2596,7 +2729,7 @@ final StringBuffer buff = new StringBuffer(); } } - static final public void IfStatement0(int start,int end) throws ParseException { + static final public void IfStatement0(final int start,final int end) throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); @@ -2605,6 +2738,7 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2613,16 +2747,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -2644,7 +2777,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[87] = jj_gen; + jj_la1[92] = jj_gen; break label_30; } Statement(); @@ -2656,7 +2789,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[88] = jj_gen; + jj_la1[93] = jj_gen; break label_31; } ElseIfStatementColon(); @@ -2666,7 +2799,7 @@ final StringBuffer buff = new StringBuffer(); ElseStatementColon(); break; default: - jj_la1[89] = jj_gen; + jj_la1[94] = jj_gen; ; } try { @@ -2696,6 +2829,7 @@ final StringBuffer buff = new StringBuffer(); break; case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2704,16 +2838,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -2740,7 +2873,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[90] = jj_gen; + jj_la1[95] = jj_gen; break label_32; } ElseIfStatement(); @@ -2751,12 +2884,12 @@ final StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[91] = jj_gen; + jj_la1[96] = jj_gen; ; } break; default: - jj_la1[92] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2771,6 +2904,7 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2779,16 +2913,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -2810,7 +2943,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[93] = jj_gen; + jj_la1[98] = jj_gen; break label_33; } Statement(); @@ -2825,6 +2958,7 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2833,16 +2967,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -2864,7 +2997,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[94] = jj_gen; + jj_la1[99] = jj_gen; break label_34; } Statement(); @@ -2878,7 +3011,7 @@ final StringBuffer buff = new StringBuffer(); } static final public void WhileStatement() throws ParseException { - Token token; + final Token token; final int pos = jj_input_stream.bufpos; token = jj_consume_token(WHILE); Condition("while"); @@ -2894,6 +3027,7 @@ final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2902,16 +3036,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -2933,7 +3066,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[95] = jj_gen; + jj_la1[100] = jj_gen; break label_35; } Statement(); @@ -2960,11 +3093,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[96] = jj_gen; + jj_la1[101] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2976,6 +3109,7 @@ final StringBuffer buff = new StringBuffer(); break; case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -2984,16 +3118,15 @@ final StringBuffer buff = new StringBuffer(); case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -3015,7 +3148,7 @@ final StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[97] = jj_gen; + jj_la1[102] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3031,11 +3164,11 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 135: - jj_consume_token(135); + case 137: + jj_consume_token(137); break; default: - jj_la1[98] = jj_gen; + jj_la1[103] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3062,6 +3195,15 @@ final StringBuffer buff = new StringBuffer(); errorLevel = ERROR; {if (true) throw e;} } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CLASSACCESS: + case LBRACKET: + VariableSuffix(); + break; + default: + jj_la1[104] = jj_gen; + ; + } try { jj_consume_token(AS); } catch (ParseException e) { @@ -3082,7 +3224,7 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[99] = jj_gen; + jj_la1[105] = jj_gen; ; } try { @@ -3103,7 +3245,7 @@ final StringBuffer buff = new StringBuffer(); } static final public void ForStatement() throws ParseException { -Token token; +final Token token; final int pos = jj_input_stream.bufpos; token = jj_consume_token(FOR); try { @@ -3124,17 +3266,17 @@ final int pos = jj_input_stream.bufpos; ForInit(); break; default: - jj_la1[100] = jj_gen; + jj_la1[106] = jj_gen; ; } jj_consume_token(SEMICOLON); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3152,7 +3294,7 @@ final int pos = jj_input_stream.bufpos; Expression(); break; default: - jj_la1[101] = jj_gen; + jj_la1[107] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3167,13 +3309,14 @@ final int pos = jj_input_stream.bufpos; ForUpdate(); break; default: - jj_la1[102] = jj_gen; + jj_la1[108] = jj_gen; ; } jj_consume_token(RPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -3182,16 +3325,15 @@ final int pos = jj_input_stream.bufpos; case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -3219,6 +3361,7 @@ final int pos = jj_input_stream.bufpos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: + case BREAK: case PRINT: case ECHO: case INCLUDE: @@ -3227,16 +3370,15 @@ final int pos = jj_input_stream.bufpos; case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: case FOREACH: case INTEGER_LITERAL: @@ -3258,7 +3400,7 @@ final int pos = jj_input_stream.bufpos; ; break; default: - jj_la1[103] = jj_gen; + jj_la1[109] = jj_gen; break label_36; } Statement(); @@ -3289,7 +3431,7 @@ final int pos = jj_input_stream.bufpos; } break; default: - jj_la1[104] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3310,7 +3452,7 @@ final int pos = jj_input_stream.bufpos; StatementExpressionList(); break; default: - jj_la1[105] = jj_gen; + jj_la1[111] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3326,7 +3468,7 @@ final int pos = jj_input_stream.bufpos; ; break; default: - jj_la1[106] = jj_gen; + jj_la1[112] = jj_gen; break label_37; } jj_consume_token(COMMA); @@ -3345,7 +3487,7 @@ final int pos = jj_input_stream.bufpos; jj_consume_token(IDENTIFIER); break; default: - jj_la1[107] = jj_gen; + jj_la1[113] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3358,7 +3500,7 @@ final int pos = jj_input_stream.bufpos; jj_consume_token(IDENTIFIER); break; default: - jj_la1[108] = jj_gen; + jj_la1[114] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3369,10 +3511,10 @@ final int pos = jj_input_stream.bufpos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case PRINT: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3390,7 +3532,7 @@ final int pos = jj_input_stream.bufpos; Expression(); break; default: - jj_la1[109] = jj_gen; + jj_la1[115] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3445,105 +3587,64 @@ final int pos = jj_input_stream.bufpos; return retval; } - static final private boolean jj_3R_97() { - if (jj_3R_109()) return true; + static final private boolean jj_3R_70() { + if (jj_scan_token(DOLLAR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_61()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_135() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_138()) { - jj_scanpos = xsp; - if (jj_3R_139()) { - jj_scanpos = xsp; - if (jj_3R_140()) { - jj_scanpos = xsp; - if (jj_3R_141()) { - jj_scanpos = xsp; - if (jj_3R_142()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_134()) return true; + static final private boolean jj_3R_42() { + if (jj_scan_token(SEMICOLON)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_96() { - if (jj_scan_token(PLUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_107()) { - jj_scanpos = xsp; - if (jj_3R_108()) return true; + static final private boolean jj_3R_118() { + if (jj_scan_token(TRIPLEEQUAL)) 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_123() { - if (jj_3R_61()) return true; + static final private boolean jj_3R_117() { + if (jj_scan_token(BANGDOUBLEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_131() { - if (jj_3R_134()) return true; + static final private boolean jj_3R_116() { + if (jj_scan_token(NE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_135()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_95() { - if (jj_scan_token(MINUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_105()) { - jj_scanpos = xsp; - if (jj_3R_106()) return true; + static final private boolean jj_3R_115() { + if (jj_scan_token(DIF)) 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_3R_104()) return true; + static final private boolean jj_3R_114() { + 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_76() { + static final private boolean jj_3_5() { + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - 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()) { + if (jj_3R_42()) { jj_scanpos = xsp; - if (jj_3R_98()) return true; + if (jj_3R_43()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_122() { + static final private boolean jj_3R_97() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_41()) return true; @@ -3553,86 +3654,34 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_202() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_201() { - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_202()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_132() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_131()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_71() { - if (jj_scan_token(DOLLAR_ID)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_123()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_70() { - if (jj_scan_token(DOLLAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_61()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_127() { - if (jj_3R_131()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_132()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_200() { - if (jj_3R_201()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_69() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_122()) jj_scanpos = xsp; + if (jj_3R_104()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_103() { - if (jj_scan_token(LBRACE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + static final private boolean jj_3R_111() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_114()) { + jj_scanpos = xsp; + if (jj_3R_115()) { + jj_scanpos = xsp; + if (jj_3R_116()) { + jj_scanpos = xsp; + if (jj_3R_117()) { + jj_scanpos = xsp; + if (jj_3R_118()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_110()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3664,27 +3713,19 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_198() { - if (jj_scan_token(LPAREN)) return true; + static final private boolean jj_3R_108() { + if (jj_3R_110()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - xsp = jj_scanpos; - if (jj_3R_200()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_128() { - if (jj_scan_token(XOR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_127()) return true; - 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; + } return false; } - static final private boolean jj_3R_93() { + static final private boolean jj_3R_92() { if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_61()) return true; @@ -3692,30 +3733,28 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_125() { - if (jj_scan_token(NULL)) return true; + static final private boolean jj_3R_109() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_108()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_120() { - if (jj_3R_127()) return true; + static final private boolean jj_3R_192() { + if (jj_scan_token(COMMA)) 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; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_128()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_92() { + static final private boolean jj_3R_91() { 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_103()) jj_scanpos = xsp; + if (jj_3R_97()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3723,39 +3762,40 @@ final int pos = jj_input_stream.bufpos; static final private boolean jj_3R_75() { Token xsp; xsp = jj_scanpos; - if (jj_3R_92()) { + if (jj_3R_91()) { jj_scanpos = xsp; - if (jj_3R_93()) return true; + if (jj_3R_92()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_130() { - if (jj_scan_token(FALSE)) return true; + static final private boolean jj_3R_191() { + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_124() { Token xsp; - xsp = jj_scanpos; - if (jj_3R_129()) { - jj_scanpos = xsp; - if (jj_3R_130()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + while (true) { + xsp = jj_scanpos; + if (jj_3R_192()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_129() { - if (jj_scan_token(TRUE)) return true; + static final private boolean jj_3R_106() { + if (jj_3R_108()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_109()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_118() { - if (jj_3R_125()) return true; + static final private boolean jj_3R_189() { + if (jj_3R_191()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -3766,229 +3806,218 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_121() { - if (jj_scan_token(BIT_OR)) return true; + static final private boolean jj_3R_107() { + if (jj_scan_token(XOR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_120()) return true; + if (jj_3R_106()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_117() { - if (jj_3R_124()) return true; + static final private boolean jj_3R_66() { + if (jj_3R_75()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_1()) { 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_scan_token(STRING_LITERAL)) return true; + static final private boolean jj_3R_187() { + 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_189()) 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_110() { - if (jj_3R_120()) return true; + static final private boolean jj_3R_102() { + 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_121()) { 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_66() { - if (jj_3R_75()) return true; + static final private boolean jj_3R_170() { + 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_103() { + if (jj_scan_token(BIT_OR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_102()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_177() { + 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_98() { + if (jj_3R_102()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_1()) { jj_scanpos = xsp; break; } + if (jj_3R_103()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_115() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + static final private boolean jj_3R_176() { + 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_104() { + static final private boolean jj_3R_169() { Token xsp; xsp = jj_scanpos; - if (jj_3R_114()) { - jj_scanpos = xsp; - if (jj_3R_115()) { - jj_scanpos = xsp; - if (jj_3R_116()) { - jj_scanpos = xsp; - if (jj_3R_117()) { + if (jj_3R_176()) { jj_scanpos = xsp; - if (jj_3R_118()) return true; + 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; - } 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_114() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + static final private boolean jj_3R_101() { + if (jj_scan_token(_ANDL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_62() { - if (jj_3R_41()) return true; + static final private boolean jj_3R_165() { + if (jj_3R_170()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_111() { + static final private boolean jj_3R_99() { if (jj_scan_token(DOT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_110()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_113() { - if (jj_scan_token(_ANDL)) return true; + if (jj_3R_98()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_67() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_76()) return true; + static final private boolean jj_3R_164() { + if (jj_3R_169()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_99() { - if (jj_3R_110()) return true; + static final private boolean jj_3R_93() { + if (jj_3R_98()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_111()) { jj_scanpos = xsp; break; } + if (jj_3R_99()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_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_47() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_62()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; + static final private boolean jj_3R_163() { + 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_46() { - if (jj_scan_token(CLASSACCESS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_61()) return true; + static final private boolean jj_3R_162() { + 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_38() { + static final private boolean jj_3R_158() { Token xsp; xsp = jj_scanpos; - if (jj_3R_46()) { + if (jj_3R_161()) { jj_scanpos = xsp; - if (jj_3R_47()) return true; + if (jj_3R_162()) { + jj_scanpos = xsp; + if (jj_3R_163()) { + jj_scanpos = xsp; + if (jj_3R_164()) { + jj_scanpos = xsp; + if (jj_3R_165()) 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_195() { - if (jj_3R_38()) return true; + static final private boolean jj_3R_161() { + 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_scan_token(SC_AND)) return true; + static final private boolean jj_3R_96() { + 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_100() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_112()) { - jj_scanpos = xsp; - if (jj_3R_113()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_99()) return true; + if (jj_scan_token(SC_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_102() { - if (jj_scan_token(_ORL)) return true; + static final private boolean jj_3R_94() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_100()) { + jj_scanpos = xsp; + if (jj_3R_101()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_194() { - if (jj_3R_198()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_93()) 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_194()) { - jj_scanpos = xsp; - if (jj_3R_195()) return true; + static final private boolean jj_3R_62() { + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_77() { - if (jj_3R_99()) return true; + static final private boolean jj_3R_76() { + if (jj_3R_93()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_100()) { jj_scanpos = xsp; break; } + if (jj_3R_94()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_197() { - if (jj_3R_66()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_73() { if (jj_scan_token(HOOK)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4001,107 +4030,111 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_196() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_47() { + if (jj_scan_token(LBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_193() { Token xsp; xsp = jj_scanpos; - if (jj_3R_196()) { - jj_scanpos = xsp; - if (jj_3R_197()) return true; + if (jj_3R_62()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_101() { - if (jj_scan_token(SC_OR)) return true; + 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_61()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_78() { + static final private boolean jj_3R_38() { Token xsp; xsp = jj_scanpos; - if (jj_3R_101()) { + if (jj_3R_46()) { jj_scanpos = xsp; - if (jj_3R_102()) return true; + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_77()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_188() { - if (jj_3R_66()) return true; + static final private boolean jj_3R_95() { + 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_187() { - if (jj_scan_token(NEW)) return true; + static final private boolean jj_3R_77() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_95()) { + jj_scanpos = xsp; + if (jj_3R_96()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_193()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_76()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_72() { - if (jj_3R_77()) return true; + if (jj_3R_76()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_78()) { jj_scanpos = xsp; break; } + if (jj_3R_77()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_190() { - if (jj_scan_token(DECR)) return true; + static final private boolean jj_3R_184() { + if (jj_3R_38()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_186() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_183() { + if (jj_3R_187()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_184() { + static final private boolean jj_3R_179() { Token xsp; xsp = jj_scanpos; - if (jj_3R_186()) { + if (jj_3R_183()) { jj_scanpos = xsp; - if (jj_3R_187()) { - jj_scanpos = xsp; - if (jj_3R_188()) return true; + if (jj_3R_184()) 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_60() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_59()) return true; + static final private boolean jj_3R_186() { + if (jj_3R_66()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_109() { - if (jj_scan_token(ARRAY)) return true; + static final private boolean jj_3R_185() { + if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_119()) return true; + return false; + } + + static final private boolean jj_3R_181() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_185()) { + jj_scanpos = xsp; + 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; } @@ -4115,178 +4148,143 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_189() { - if (jj_scan_token(INCR)) return true; + static final private boolean jj_3R_173() { + if (jj_3R_66()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_185() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_189()) { - jj_scanpos = xsp; - if (jj_3R_190()) return true; + static final private boolean jj_3R_90() { + if (jj_scan_token(TILDEEQUAL)) 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_183() { - if (jj_3R_109()) return true; + static final private boolean jj_3R_89() { + 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_191() { - if (jj_3R_192()) return true; + static final private boolean jj_3R_67() { + 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_182() { - if (jj_3R_184()) return true; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_191()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_91() { - if (jj_scan_token(TILDEEQUAL)) return true; + static final private boolean jj_3R_88() { + 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_45() { - if (jj_3R_59()) return true; + static final private boolean jj_3R_172() { + if (jj_scan_token(NEW)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_181()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_60()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_199() { - if (jj_3R_192()) return true; + static final private boolean jj_3R_175() { + 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_90() { - if (jj_scan_token(DOTASSIGN)) return true; + static final private boolean jj_3R_87() { + 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_89() { - if (jj_scan_token(ORASSIGN)) return true; + static final private boolean jj_3R_60() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_59()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_179() { + static final private boolean jj_3R_166() { Token xsp; xsp = jj_scanpos; - if (jj_3_4()) { + if (jj_3R_171()) { jj_scanpos = xsp; - if (jj_3R_182()) { + if (jj_3R_172()) { jj_scanpos = xsp; - if (jj_3R_183()) return true; + if (jj_3R_173()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_4() { + static final private boolean jj_3R_171() { 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_193()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_199()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_88() { - if (jj_scan_token(XORASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_87() { + static final private boolean jj_3R_86() { 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_86() { + static final private boolean jj_3R_85() { 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_85() { + static final private boolean jj_3R_84() { 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_84() { + static final private boolean jj_3R_83() { 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_83() { + static final private boolean jj_3R_82() { 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_82() { - if (jj_scan_token(REMASSIGN)) return true; + static final private boolean jj_3R_167() { + if (jj_scan_token(ARRAY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_180()) 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(SLASHASSIGN)) return true; + if (jj_scan_token(REMASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_181() { - if (jj_3R_179()) return true; + static final private boolean jj_3R_80() { + if (jj_scan_token(SLASHASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_185()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_80() { + static final private boolean jj_3R_79() { 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_79() { + static final private boolean jj_3R_78() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -4295,6 +4293,8 @@ final int pos = jj_input_stream.bufpos; static final private boolean jj_3R_74() { Token xsp; xsp = jj_scanpos; + if (jj_3R_78()) { + jj_scanpos = xsp; if (jj_3R_79()) { jj_scanpos = xsp; if (jj_3R_80()) { @@ -4317,9 +4317,7 @@ final int pos = jj_input_stream.bufpos; jj_scanpos = xsp; if (jj_3R_89()) { jj_scanpos = xsp; - if (jj_3R_90()) { - jj_scanpos = xsp; - if (jj_3R_91()) return true; + if (jj_3R_90()) 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; @@ -4336,48 +4334,71 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_44() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; + static final private boolean jj_3R_174() { + 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() { - 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; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_154()) return true; + static final private boolean jj_3R_160() { + if (jj_3R_167()) 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_168() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_174()) { + jj_scanpos = xsp; + 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; return false; } static final private boolean jj_3R_178() { - if (jj_scan_token(LPAREN)) return true; + if (jj_3R_179()) 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_59() { + if (jj_3R_66()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + 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_159() { + if (jj_3R_166()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_178()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_177() { - if (jj_3R_104()) return true; + static final private boolean jj_3R_45() { + if (jj_3R_59()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_60()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + static final private boolean jj_3R_182() { + if (jj_3R_179()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4390,9 +4411,33 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_176() { + 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_181()) 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_155() { + Token xsp; + xsp = jj_scanpos; + if (jj_3_4()) { + jj_scanpos = xsp; + if (jj_3R_159()) { + jj_scanpos = xsp; + if (jj_3R_160()) 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; } @@ -4406,12 +4451,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_175() { - if (jj_3R_180()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_41() { Token xsp; xsp = jj_scanpos; @@ -4429,31 +4468,13 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_174() { - if (jj_scan_token(BANG)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_154()) return true; + static final private boolean jj_3R_157() { + if (jj_3R_155()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_173() { Token xsp; xsp = jj_scanpos; - if (jj_3R_174()) { - jj_scanpos = xsp; - if (jj_3R_175()) { - jj_scanpos = xsp; - if (jj_3R_176()) { - jj_scanpos = xsp; - if (jj_3R_177()) { - jj_scanpos = xsp; - if (jj_3R_178()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } 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_168()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4463,14 +4484,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_172() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_179()) 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; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4483,16 +4496,28 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_44() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(COLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_53() { if (jj_scan_token(FLOAT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_171() { - if (jj_scan_token(INCR)) return true; + static final private boolean jj_3R_156() { + if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_179()) return true; + if (jj_3R_40()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_130()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4503,14 +4528,18 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_170() { - if (jj_scan_token(MINUS)) return true; + 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_51() { - if (jj_scan_token(REAL)) 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; + if (jj_3R_40()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4521,16 +4550,12 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_63() { - if (jj_scan_token(PRINT)) return true; + static final private boolean jj_3R_154() { + 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; - return false; - } - - static final private boolean jj_3R_168() { - if (jj_3R_173()) return true; + if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4541,8 +4566,8 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_167() { - if (jj_3R_172()) return true; + static final private boolean jj_3R_153() { + if (jj_3R_158()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4585,247 +4610,246 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_162() { - if (jj_scan_token(REM)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_166() { - if (jj_3R_171()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_169() { - if (jj_scan_token(PLUS)) return true; + static final private boolean jj_3R_152() { + if (jj_3R_157()) return true; 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_151() { + if (jj_3R_156()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_163() { + static final private boolean jj_3R_149() { Token xsp; xsp = jj_scanpos; - if (jj_3R_165()) { + if (jj_3R_150()) { jj_scanpos = xsp; - if (jj_3R_166()) { + if (jj_3R_151()) { jj_scanpos = xsp; - if (jj_3R_167()) { + if (jj_3R_152()) { jj_scanpos = xsp; - if (jj_3R_168()) return true; + if (jj_3R_153()) { + jj_scanpos = xsp; + if (jj_3R_154()) 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() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_169()) { - jj_scanpos = xsp; - if (jj_3R_170()) return true; + static final private boolean jj_3R_150() { + if (jj_scan_token(BANG)) 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_154()) return true; + if (jj_3R_130()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_164() { - if (jj_scan_token(AT)) return true; + static final private boolean jj_3R_148() { + if (jj_scan_token(DECR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_155()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_159() { - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_164()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - if (jj_3R_163()) return true; + static final private boolean jj_3R_147() { + if (jj_scan_token(INCR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_155()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_161() { - if (jj_scan_token(SLASH)) return true; + static final private boolean jj_3R_146() { + if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_154() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_158()) { - jj_scanpos = xsp; - if (jj_3R_159()) return true; + static final private boolean jj_3R_63() { + if (jj_scan_token(PRINT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_158() { - if (jj_scan_token(BIT_AND)) return true; + static final private boolean jj_3R_144() { + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_163()) return true; + return false; + } + + static final private boolean jj_3R_143() { + if (jj_3R_148()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_153() { - if (jj_scan_token(RUNSIGNEDSHIFT)) return true; + static final private boolean jj_3R_138() { + 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_157() { - if (jj_scan_token(MINUS)) return true; + static final private boolean jj_3R_142() { + if (jj_3R_147()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_160() { - if (jj_scan_token(STAR)) return true; + static final private boolean jj_3_7() { + if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_148() { - if (jj_scan_token(GE)) return true; + static final private boolean jj_3R_145() { + 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_155() { + static final private boolean jj_3R_139() { Token xsp; xsp = jj_scanpos; - if (jj_3R_160()) { + if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_161()) { + if (jj_3R_142()) { jj_scanpos = xsp; - if (jj_3R_162()) return true; + if (jj_3R_143()) { + jj_scanpos = xsp; + if (jj_3R_144()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_154()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_141() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_145()) { + jj_scanpos = xsp; + if (jj_3R_146()) 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_130()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_149() { - if (jj_3R_154()) return true; + static final private boolean jj_3R_140() { + 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_135() { Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_155()) { jj_scanpos = xsp; break; } + if (jj_3R_140()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } - return false; - } - - static final private boolean jj_3R_152() { - if (jj_scan_token(RSIGNEDSHIFT)) return true; + if (jj_3R_139()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_156() { - if (jj_scan_token(PLUS)) return true; + static final private boolean jj_3R_137() { + 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_150() { + static final private boolean jj_3R_130() { Token xsp; xsp = jj_scanpos; - if (jj_3R_156()) { + if (jj_3R_134()) { jj_scanpos = xsp; - if (jj_3R_157()) return true; + if (jj_3R_135()) 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_149()) return true; + return false; + } + + static final private boolean jj_3R_134() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_139()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_147() { - if (jj_scan_token(LE)) return true; + static final private boolean jj_3R_129() { + 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_143() { - if (jj_3R_149()) return true; + static final private boolean jj_3R_133() { + if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_150()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_146() { - if (jj_scan_token(GT)) return true; + static final private boolean jj_3R_124() { + 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_151() { - if (jj_scan_token(LSHIFT)) return true; + static final private boolean jj_3R_136() { + 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_144() { + static final private boolean jj_3R_131() { Token xsp; xsp = jj_scanpos; - if (jj_3R_151()) { + if (jj_3R_136()) { jj_scanpos = xsp; - if (jj_3R_152()) { + if (jj_3R_137()) { jj_scanpos = xsp; - if (jj_3R_153()) return true; + if (jj_3R_138()) 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_143()) return true; + if (jj_3R_130()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_136() { - if (jj_3R_143()) return true; + static final private boolean jj_3_2() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_39()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_125() { + if (jj_3R_130()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_144()) { jj_scanpos = xsp; break; } + if (jj_3R_131()) { 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; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_39()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_126() { + static final private boolean jj_3R_188() { if (jj_3R_39()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; @@ -4837,74 +4861,62 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_108() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + static final private boolean jj_3R_128() { + 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_106() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + static final private boolean jj_3R_123() { + 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_145() { - if (jj_scan_token(LT)) return true; + static final private boolean jj_3R_132() { + if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_119() { + static final private boolean jj_3R_180() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_126()) jj_scanpos = xsp; + if (jj_3R_188()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_137() { + static final private boolean jj_3R_126() { Token xsp; xsp = jj_scanpos; - if (jj_3R_145()) { - jj_scanpos = xsp; - if (jj_3R_146()) { + if (jj_3R_132()) { jj_scanpos = xsp; - if (jj_3R_147()) { - jj_scanpos = xsp; - if (jj_3R_148()) return true; + if (jj_3R_133()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_136()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_43() { - if (jj_scan_token(135)) return true; + if (jj_3R_125()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_134() { - if (jj_3R_136()) return true; + static final private boolean jj_3R_119() { + if (jj_3R_125()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_137()) { jj_scanpos = xsp; break; } + if (jj_3R_126()) { jj_scanpos = xsp; break; } 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_190() { if (jj_scan_token(ARRAYASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_41()) return true; @@ -4912,85 +4924,127 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3_6() { - if (jj_3R_44()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_39() { if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_133()) jj_scanpos = xsp; + if (jj_3R_190()) jj_scanpos = xsp; else 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_122() { + if (jj_scan_token(GT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_142() { - if (jj_scan_token(TRIPLEEQUAL)) return true; + static final private boolean jj_3R_127() { + 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_141() { - if (jj_scan_token(BANGDOUBLEEQUAL)) return true; + static final private boolean jj_3R_120() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_127()) { + jj_scanpos = xsp; + if (jj_3R_128()) { + jj_scanpos = xsp; + if (jj_3R_129()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_119()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_107() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + static final private boolean jj_3R_112() { + if (jj_3R_119()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_120()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_140() { - if (jj_scan_token(NE)) return true; + static final private boolean jj_3R_105() { + if (jj_3R_61()) 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_3R_121() { + 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_113() { Token xsp; xsp = jj_scanpos; - if (jj_3R_42()) { + if (jj_3R_121()) { jj_scanpos = xsp; - if (jj_3R_43()) return true; + if (jj_3R_122()) { + jj_scanpos = xsp; + if (jj_3R_123()) { + jj_scanpos = xsp; + if (jj_3R_124()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_112()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_139() { - if (jj_scan_token(DIF)) return true; + static final private boolean jj_3R_104() { + 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; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_98() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_110() { + if (jj_3R_112()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_113()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_105() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + 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_138() { - if (jj_scan_token(EQ)) return true; + static final private boolean jj_3R_71() { + if (jj_scan_token(DOLLAR_ID)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_105()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3_6() { + if (jj_3R_44()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5005,7 +5059,7 @@ final int pos = jj_input_stream.bufpos; static public boolean lookingAhead = false; static private boolean jj_semLA; static private int jj_gen; - static final private int[] jj_la1 = new int[110]; + static final private int[] jj_la1 = new int[116]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -5019,19 +5073,19 @@ final int pos = jj_input_stream.bufpos; jj_la1_4(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0x2,0xff960000,0x0,0xc0000,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0xfe900000,0x0,0x0,0x0,0x0,0x3c000000,0x0,0x0,0x0,0x0,0x0,0x0,0xff960000,0xff960000,0x0,0x0,0x0,0x800000,0x0,0xff960000,0x0,0xff900000,0x200000,0x400000,0x200000,0x400000,0xff900000,0xff900000,0xff900000,0xff900000,0x0,0xff900000,0x0,0x0,0x800000,0x1800000,0x800000,0xff900000,0xff900000,0x800000,0x0,0x0,0x0,0x1800000,}; + jj_la1_0 = new int[] {0xfe58001e,0x0,0x6,0x6,0xfe58001e,0xfe580000,0x0,0x300000,0x300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x2000000,0x0,0x2000000,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xa000000,0x0,0x0,0x0,0xa000000,0x0,0x10,0x0,0xf6400000,0x0,0x0,0x0,0x0,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0xfe580000,0xfe580000,0x0,0x0,0x0,0x0,0x2000000,0x0,0xfe580000,0x0,0xfe400000,0x800000,0x1000000,0x800000,0x1000000,0xfe400000,0xfe400000,0xfe400000,0xfe400000,0x0,0xfe400000,0x0,0x0,0x0,0x2000000,0xa000000,0x2000000,0xfe400000,0xfe400000,0x2000000,0x0,0x0,0x0,0xa000000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x0,0x11aed48,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84400,0x4,0x86400,0x0,0x0,0x0,0x0,0xfc000000,0x0,0x86400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x86400,0x0,0x86400,0x0,0x86400,0x0,0x0,0x1,0x1,0x2000,0x2000,0x0,0x1,0x86400,0x1,0x84400,0x80400,0x86400,0x0,0x0,0x0,0x112a948,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11aed48,0x11aed48,0x0,0x0,0x0,0x2000,0x90,0x11aed48,0x90,0x11aed48,0x0,0x0,0x0,0x0,0x11aed48,0x11aed48,0x11aed48,0x11aed48,0x0,0x11aed48,0x0,0x4,0x2000,0x86400,0x2000,0x11aed48,0x11aed48,0x2000,0x0,0x0,0x0,0x86400,}; + jj_la1_1 = new int[] {0x475d507,0x0,0x0,0x0,0x475d507,0x475d507,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x308000,0x20,0x30c000,0x0,0x0,0x0,0x0,0xf0000000,0x0,0x30c000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c000,0x0,0x30c000,0x0,0x30c000,0x0,0x0,0x8,0x8,0x4000,0x4000,0x0,0x8,0x30c000,0x8,0x308000,0x300000,0x30c000,0x0,0x0,0x0,0x4455507,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x475d507,0x475d507,0x0,0x0,0x0,0x0,0x4000,0x240,0x475d507,0x240,0x475d507,0x0,0x0,0x0,0x0,0x475d507,0x475d507,0x475d507,0x475d507,0x0,0x475d507,0x0,0x8,0x20,0x4000,0x30c000,0x4000,0x475d507,0x475d507,0x4000,0x0,0x0,0x0,0x30c000,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x0,0x32288a20,0x0,0x0,0x0,0x4000000,0x40000000,0x200000,0x20000000,0x200000,0x20208000,0x20208000,0x220,0x220,0x8a20,0x0,0x30088a20,0x0,0x4000000,0x20000000,0x0,0x7,0x40000000,0x30088a20,0x40000000,0x0,0x8,0x8,0x10,0x10,0x8000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x30088a20,0x0,0x20088a20,0x0,0x20088a20,0x0,0x0,0x880000,0x880000,0x20008000,0x20008000,0x20008000,0x880000,0x30088a20,0x800000,0xa20,0x0,0x30088a20,0x4000000,0x2000000,0x10000000,0x32208000,0x2000000,0x2000000,0x2000000,0x2000000,0x0,0x4000000,0x2000000,0x4000000,0x2000000,0x4000000,0x2000000,0x32288a20,0x32288a20,0x4000000,0x40000000,0x40000000,0x20008000,0x0,0x32288a20,0x0,0x32288a20,0x0,0x0,0x0,0x0,0x32288a20,0x32288a20,0x32288a20,0x32288a20,0x2000000,0x32288a20,0x2000000,0x0,0x20008000,0x30088a20,0x20008000,0x32288a20,0x32288a20,0x20008000,0x4000000,0x8000,0x8000,0x30088a20,}; + jj_la1_2 = new int[] {0x8a22880,0x8000000,0x0,0x0,0x8a22880,0x8a22880,0x0,0x0,0x0,0x10000000,0x0,0x800000,0x0,0x800000,0x820000,0x820000,0x880,0x880,0x22880,0x0,0x222880,0x0,0x10000000,0x0,0x0,0x1f,0x0,0x222880,0x0,0x0,0x20,0x20,0x40,0x40,0x20000000,0x0,0x0,0x0,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x222880,0x0,0x222880,0x0,0x222880,0x0,0x0,0x2200000,0x2200000,0x20000,0x20000,0x20000,0x2200000,0x222880,0x2000000,0x2880,0x0,0x222880,0x10000000,0x8000000,0x0,0x8820000,0x8000000,0x8000000,0x8000000,0x8000000,0x0,0x10000000,0x8000000,0x10000000,0x8000000,0x10000000,0x8000000,0x8a22880,0x8a22880,0x10000000,0x0,0x0,0x0,0x20000,0x0,0x8a22880,0x0,0x8a22880,0x0,0x0,0x0,0x0,0x8a22880,0x8a22880,0x8a22880,0x8a22880,0x8000000,0x8a22880,0x8000000,0x2000000,0x0,0x20000,0x222880,0x20000,0x8a22880,0x8a22880,0x20000,0x10000000,0x20000,0x20000,0x222880,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x0,0x27802,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x27802,0x20000,0x0,0x20000,0x20000,0x0,0xff000000,0x27802,0xff000000,0x4,0x200,0x200,0x400,0x400,0x0,0x40000,0x80000,0x20000,0x190,0x190,0x61,0x61,0xe00000,0xe00000,0x6000,0x6000,0x118000,0x118000,0x0,0x27802,0x6000,0x7802,0x2,0x0,0x1800,0x1800,0x0,0x0,0x0,0x0,0x0,0x0,0x27802,0x0,0x0,0x0,0x27802,0x0,0x0,0x0,0x1800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x27802,0x27802,0x0,0xff001800,0xff001800,0x1800,0x0,0x27802,0x0,0x27802,0x0,0x0,0x0,0x0,0x2780a,0x27802,0x27802,0x27802,0x0,0x2780a,0x0,0x0,0x1800,0x27802,0x1800,0x27802,0x2780a,0x1800,0x0,0x0,0x0,0x27802,}; + jj_la1_3 = new int[] {0x9e1c0000,0x0,0x0,0x0,0x9e1c0000,0x9e1c0000,0x0,0x0,0x0,0x0,0x80,0x0,0x80000,0x0,0x80000,0x80000,0x0,0x0,0x18000000,0x0,0x9e1c0000,0x80000000,0x0,0x80080000,0x80000000,0x0,0x3ff80,0x9e1c0000,0x3ff80,0x200000,0x800000,0x800000,0x1000000,0x1000000,0x0,0x0,0x0,0x80000000,0x79,0x79,0x6,0x6,0x0,0x0,0x18000000,0x18000000,0x60000000,0x60000000,0x40000,0x9e1c0000,0x18000000,0x1e180000,0x100000,0x80000,0x6000000,0x6000000,0x0,0x0,0x80000,0x80000,0x80000,0x0,0x9e1c0000,0x0,0x0,0x0,0x9e1c0000,0x0,0x0,0x40000,0x60c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e1c0000,0x9e1c0000,0x0,0x80,0x603ff80,0x603ff80,0x6080000,0x0,0x9e1c0000,0x0,0x9e1c0000,0x0,0x0,0x0,0x0,0x9e5c0000,0x9e1c0000,0x9e1c0000,0x9e1c0000,0x0,0x9e5c0000,0x0,0x0,0x0,0x6080000,0x9e1c0000,0x6080000,0x9e1c0000,0x9e5c0000,0x6080000,0x0,0x0,0x0,0x9e1c0000,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x0,0x27,0x40,0x27,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40,0x40,0x0,0x40,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x40,0x80,0x80,0x80,0x80,0x0,0x0,0x80,0x0,0x80,0x0,0x80,0x40,0x40,0x0,0x27,0x27,0x40,0x0,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40,0x40,0x40,0x80,0x40,0x80,0x0,0x40,0x40,0x40,0x40,0x40,0x40,0x0,0x0,0x0,0x40,}; + jj_la1_4 = new int[] {0x100,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0xc0,0x100,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x2,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x4,0x4,0x0,0x100,0x0,0x100,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x200,0x200,0x200,0x200,0x0,0x0,0x200,0x0,0x200,0x0,0x200,0x100,0x100,0x0,0x0,0xc0,0xc0,0x100,0x0,0x100,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x200,0x100,0x200,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x100,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[7]; static private boolean jj_rescan = false; @@ -5050,7 +5104,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 110; i++) jj_la1[i] = -1; + for (int i = 0; i < 116; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5060,7 +5114,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 110; i++) jj_la1[i] = -1; + for (int i = 0; i < 116; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5077,7 +5131,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 110; i++) jj_la1[i] = -1; + for (int i = 0; i < 116; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5087,7 +5141,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 110; i++) jj_la1[i] = -1; + for (int i = 0; i < 116; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5103,7 +5157,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 110; i++) jj_la1[i] = -1; + for (int i = 0; i < 116; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5112,7 +5166,7 @@ final int pos = jj_input_stream.bufpos; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 110; i++) jj_la1[i] = -1; + for (int i = 0; i < 116; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5219,15 +5273,15 @@ final int pos = jj_input_stream.bufpos; static public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[136]; - for (int i = 0; i < 136; i++) { + boolean[] la1tokens = new boolean[138]; + for (int i = 0; i < 138; i++) { la1tokens[i] = false; } if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 110; i++) { + for (int i = 0; i < 116; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<", indx)) != -1) { // newer php error output (tested with 4.2.3) @@ -163,7 +164,10 @@ public final class PHPParser extends PHPParserSuperclass { } } - private static void scanLine(String output, IFile file, int indx, int brIndx) throws CoreException { + private static void scanLine(final String output, + final IFile file, + final int indx, + final int brIndx) throws CoreException { String current; StringBuffer lineNumberBuffer = new StringBuffer(10); char ch; @@ -201,8 +205,8 @@ public final class PHPParser extends PHPParserSuperclass { } } - public final void parse(String s) throws CoreException { - StringReader stream = new StringReader(s); + public final void parse(final String s) throws CoreException { + final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } @@ -218,15 +222,15 @@ public final class PHPParser extends PHPParserSuperclass { * Call the php parse command ( php -l -f <filename> ) * and create markers according to the external parser output */ - public static void phpExternalParse(IFile file) { - IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); - String filename = file.getLocation().toString(); + public static void phpExternalParse(final IFile file) { + final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); + final String filename = file.getLocation().toString(); - String[] arguments = { filename }; - MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); - String command = form.format(arguments); + final String[] arguments = { filename }; + final MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); + final String command = form.format(arguments); - String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: "); + final String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: "); try { // parse the buffer to find the errors and warnings @@ -245,7 +249,9 @@ PARSER_END(PHPParser) TOKEN : { - : PHPPARSING + : PHPPARSING +| : PHPPARSING +| : PHPPARSING } - TOKEN : + SPECIAL_TOKEN : { " > : DEFAULT } @@ -319,72 +325,72 @@ MORE : | | | +| } /* LANGUAGE CONSTRUCT */ TOKEN : { - -| -| -| -| -| -| -| -| "> -| -| "> + +| +| +| +| +| +| +| +| "> +| +| "> } /* RESERVED WORDS AND LITERALS */ TOKEN : { - < BREAK: "break" > -| < CASE: "case" > -| < CONST: "const" > -| < CONTINUE: "continue" > -| < _DEFAULT: "default" > -| < DO: "do" > -| < EXTENDS: "extends" > -| < FALSE: "false" > -| < FOR: "for" > -| < GOTO: "goto" > -| < NEW: "new" > -| < NULL: "null" > -| < RETURN: "return" > -| < SUPER: "super" > -| < SWITCH: "switch" > -| < THIS: "this" > -| < TRUE: "true" > -| < WHILE: "while" > -| < ENDWHILE : "endwhile" > -| -| -| -| + +| +| +| <_DEFAULT : "default"> +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| } /* TYPES */ TOKEN : { - -| -| + +| +| | -| -| -| -| +| +| +| +| | } TOKEN : { - < _ORL : "OR" > -| < _ANDL: "AND"> + <_ORL : "OR"> +| <_ANDL : "AND"> } /* LITERALS */ @@ -466,77 +472,79 @@ MORE : TOKEN : { - < LPAREN: "(" > -| < RPAREN: ")" > -| < LBRACE: "{" > -| < RBRACE: "}" > -| < LBRACKET: "[" > -| < RBRACKET: "]" > -| < SEMICOLON: ";" > -| < COMMA: "," > -| < DOT: "." > + +| +| +| +| +| +| +| +| } -/* OPERATORS */ +/* COMPARATOR */ TOKEN : { - -| -| " > -| -| -| -| -| -| =" > -| " > -| -| -| -| -| -| -| -| -| -| -| -| -| -| >" > -| >>" > -| -| >=" > -| -| -| "> +| +| +| ="> +| "> +| +| } +/* ASSIGNATION */ TOKEN : { - < DOLLAR_ID: > + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| >"> +| >>"> +| >="> +} -/* - * Program structuring syntax follows. - */ + TOKEN : +{ + < DOLLAR_ID: > +} void phpTest() : {} @@ -549,7 +557,35 @@ void phpFile() : {} { try { - ( Php() + (PhpBlock())* + + } catch (TokenMgrError e) { + errorMessage = e.getMessage(); + errorLevel = ERROR; + throw generateParseException(); + } +} + +void PhpBlock() : +{ + final int start = jj_input_stream.bufpos; +} +{ + Expression() [ ] +| + [ + | + {try { + setMarker(fileToParse, + "You should use ' } catch (ParseException e) { @@ -557,13 +593,6 @@ void phpFile() : errorLevel = ERROR; throw e; } - )* - - } catch (TokenMgrError e) { - errorMessage = e.getMessage(); - errorLevel = ERROR; - throw generateParseException(); - } } void Php() : @@ -574,8 +603,8 @@ void Php() : void ClassDeclaration() : { - PHPClassDeclaration classDeclaration; - Token className; + final PHPClassDeclaration classDeclaration; + final Token className; final int pos = jj_input_stream.bufpos; } { @@ -653,7 +682,7 @@ void FieldDeclaration() : PHPVarDeclaration VariableDeclarator() : { - String varName; + final String varName; String varValue = null; final int pos = jj_input_stream.bufpos; } @@ -663,18 +692,14 @@ PHPVarDeclaration VariableDeclarator() : try { varValue = VariableInitializer() + {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; throw e; } ] - { - if (varValue == null) { - return new PHPVarDeclaration(currentSegment,varName,pos); - } - return new PHPVarDeclaration(currentSegment,varName,pos,varValue); - } + {return new PHPVarDeclaration(currentSegment,varName,pos);} } String VariableDeclaratorId() : @@ -700,7 +725,7 @@ String VariableDeclaratorId() : String Variable(): { String expr = null; - Token token; + final Token token; } { token = [ expr = Expression() ] @@ -718,7 +743,7 @@ String Variable(): String VariableName(): { String expr = null; -Token token; +final Token token; } { expr = Expression() @@ -746,8 +771,8 @@ Token token; String VariableInitializer() : { - String expr; - Token token; + final String expr; + final Token token; } { expr = Literal() @@ -781,7 +806,7 @@ final StringBuffer buff = new StringBuffer(); String ArrayInitializer() : { -String expr = null; +String expr; final StringBuffer buff = new StringBuffer("("); } { @@ -799,7 +824,7 @@ final StringBuffer buff = new StringBuffer("("); void MethodDeclaration() : { - PHPFunctionDeclaration functionDeclaration; + final PHPFunctionDeclaration functionDeclaration; } { functionDeclaration = MethodDeclarator() @@ -819,9 +844,9 @@ void MethodDeclaration() : PHPFunctionDeclaration MethodDeclarator() : { - Token identifier; - StringBuffer methodDeclaration = new StringBuffer(); - String formalParameters; + final Token identifier; + final StringBuffer methodDeclaration = new StringBuffer(); + final String formalParameters; final int pos = jj_input_stream.bufpos; } { @@ -870,7 +895,7 @@ String FormalParameters() : String FormalParameter() : { - PHPVarDeclaration variableDeclaration; + final PHPVarDeclaration variableDeclaration; final StringBuffer buff = new StringBuffer(); } { @@ -914,9 +939,9 @@ String Type() : String Expression() : { - String expr; - String assignOperator = null; - String expr2 = null; + final String expr; + final String assignOperator; + final String expr2; } { expr = PrintExpression() @@ -927,19 +952,14 @@ String Expression() : assignOperator = AssignmentOperator() try { expr2 = Expression() + {return expr + assignOperator + expr2;} } catch (ParseException e) { errorMessage = "expression expected"; errorLevel = ERROR; throw e; } ] - { - if (expr2 == null) { - return expr; - } else { - return expr + assignOperator + expr2; - } - } + {return expr;} } String AssignmentOperator() : @@ -975,7 +995,7 @@ String AssignmentOperator() : String ConditionalExpression() : { - String expr; + final String expr; String expr2 = null; String expr3 = null; } @@ -994,19 +1014,16 @@ String ConditionalOrExpression() : { String expr; Token operator; - String expr2 = null; final StringBuffer buff = new StringBuffer(); } { expr = ConditionalAndExpression() - { - buff.append(expr); - } + {buff.append(expr);} ( - (operator = | operator = <_ORL>) expr2 = ConditionalAndExpression() + (operator = | operator = <_ORL>) expr = ConditionalAndExpression() { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* { @@ -1018,76 +1035,54 @@ String ConditionalAndExpression() : { String expr; Token operator; - String expr2 = null; final StringBuffer buff = new StringBuffer(); } { expr = ConcatExpression() - { - buff.append(expr); - } + {buff.append(expr);} ( - (operator = | operator = <_ANDL>) expr2 = ConcatExpression() + (operator = | operator = <_ANDL>) expr = ConcatExpression() { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* - { - return buff.toString(); - } + {return buff.toString();} } String ConcatExpression() : { String expr; - String expr2 = null; final StringBuffer buff = new StringBuffer(); } { expr = InclusiveOrExpression() - { - buff.append(expr); - } + {buff.append(expr);} ( - expr2 = InclusiveOrExpression() - { - buff.append("."); - buff.append(expr2); - } + expr = InclusiveOrExpression() + {buff.append(".").append(expr);} )* - { - return buff.toString(); - } + {return buff.toString();} } String InclusiveOrExpression() : { String expr; - String expr2 = null; final StringBuffer buff = new StringBuffer(); } { expr = ExclusiveOrExpression() - { - buff.append(expr); - } + {buff.append(expr);} ( - expr2 = ExclusiveOrExpression() - { - buff.append("|"); - buff.append(expr2); - } + expr = ExclusiveOrExpression() + {buff.append("|").append(expr);} )* - { - return buff.toString(); - } + {return buff.toString();} } String ExclusiveOrExpression() : { String expr; - String expr2 = null; final StringBuffer buff = new StringBuffer(); } { @@ -1096,10 +1091,10 @@ String ExclusiveOrExpression() : buff.append(expr); } ( - expr2 = AndExpression() + expr = AndExpression() { buff.append("^"); - buff.append(expr2); + buff.append(expr); } )* { @@ -1109,8 +1104,7 @@ String ExclusiveOrExpression() : String AndExpression() : { - final String expr; - String expr2 = null; + String expr; final StringBuffer buff = new StringBuffer(); } { @@ -1119,22 +1113,18 @@ String AndExpression() : buff.append(expr); } ( - expr2 = EqualityExpression() + expr = EqualityExpression() { - buff.append("&"); - buff.append(expr2); + buff.append("&").append(expr); } )* - { - return buff.toString(); - } + {return buff.toString();} } String EqualityExpression() : { String expr; Token operator; - String expr2; final StringBuffer buff = new StringBuffer(); } { @@ -1147,10 +1137,10 @@ String EqualityExpression() : | operator = | operator = ) - expr2 = RelationalExpression() + expr = RelationalExpression() { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* {return buff.toString();} @@ -1160,18 +1150,14 @@ String RelationalExpression() : { String expr; Token operator; - String expr2; final StringBuffer buff = new StringBuffer(); } { expr = ShiftExpression() {buff.append(expr);} ( - ( operator = | operator = | operator = | operator = ) expr2 = ShiftExpression() - { - buff.append(operator.image); - buff.append(expr2); - } + ( operator = | operator = | operator = | operator = ) expr = ShiftExpression() + {buff.append(operator.image).append(expr);} )* {return buff.toString();} } @@ -1237,8 +1223,8 @@ String MultiplicativeExpression() : */ String UnaryExpression() : { - String expr; - Token token; + final String expr; + final Token token; final StringBuffer buff = new StringBuffer(); } { @@ -1256,8 +1242,8 @@ String UnaryExpression() : String UnaryExpressionNoPrefix() : { - String expr; - Token token; + final String expr; + final Token token; } { ( token = | token = ) expr = UnaryExpression() @@ -1278,7 +1264,7 @@ String UnaryExpressionNoPrefix() : String PreIncrementExpression() : { -String expr; +final String expr; } { expr = PrimaryExpression() @@ -1287,7 +1273,7 @@ String expr; String PreDecrementExpression() : { -String expr; +final String expr; } { expr = PrimaryExpression() @@ -1296,7 +1282,7 @@ String expr; String UnaryExpressionNotPlusMinus() : { - String expr; + final String expr; } { expr = UnaryExpression() @@ -1327,7 +1313,7 @@ final String type, expr; String PostfixExpression() : { - String expr; + final String expr; Token operator = null; } { @@ -1342,7 +1328,7 @@ String PostfixExpression() : String PrimaryExpression() : { - Token identifier; + final Token identifier; String expr; final StringBuffer buff = new StringBuffer(); } @@ -1375,8 +1361,8 @@ String ArrayDeclarator() : String PrimaryPrefix() : { - String expr; - Token token = null; + final String expr; + final Token token; } { token = @@ -1393,8 +1379,8 @@ String PrimaryPrefix() : String ClassIdentifier(): { - String expr; - Token token; + final String expr; + final Token token; } { token = @@ -1406,7 +1392,7 @@ String ClassIdentifier(): String PrimarySuffix() : { - String expr; + final String expr; } { expr = Arguments() @@ -1442,8 +1428,8 @@ String VariableSuffix() : String Literal() : { - String expr; - Token token; + final String expr; + final Token token; } { token = @@ -1517,7 +1503,7 @@ final StringBuffer buff = new StringBuffer(); throw e; } { - buff.append(",").append("expr"); + buff.append(",").append(expr); } )* {return buff.toString();} @@ -1533,7 +1519,7 @@ void Statement() : LOOKAHEAD(2) Expression() try { - ( | "?>") + ( | ) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1585,7 +1571,7 @@ void Statement() : void IncludeStatement() : { - String expr; + final String expr; final int pos = jj_input_stream.bufpos; } { @@ -1653,7 +1639,7 @@ void IncludeStatement() : String PrintExpression() : { final StringBuffer buff = new StringBuffer("print "); - String expr; + final String expr; } { expr = Expression() @@ -1735,7 +1721,13 @@ void BlockStatement() : void LocalVariableDeclaration() : {} { - VariableDeclarator() ( VariableDeclarator() )* + LocalVariableDeclarator() ( LocalVariableDeclarator() )* +} + +void LocalVariableDeclarator() : +{} +{ + VariableDeclaratorId() [ Expression() ] } void EmptyStatement() : @@ -1778,20 +1770,15 @@ void SwitchLabel() : } void IfStatement() : -/* - * The disambiguating algorithm of JavaCC automatically binds dangling - * else's to the innermost if statement. The LOOKAHEAD specification - * is to tell JavaCC that we know what we are doing. - */ { - Token token; + final Token token; final int pos = jj_input_stream.bufpos; } { token = Condition("if") IfStatement0(pos,pos+token.image.length()) } -void Condition(String keyword) : +void Condition(final String keyword) : {} { try { @@ -1811,7 +1798,7 @@ void Condition(String keyword) : } } -void IfStatement0(int start,int end) : +void IfStatement0(final int start,final int end) : { } { @@ -1865,7 +1852,7 @@ void ElseIfStatement() : void WhileStatement() : { - Token token; + final Token token; final int pos = jj_input_stream.bufpos; } { @@ -1935,6 +1922,7 @@ void ForeachStatement() : errorLevel = ERROR; throw e; } + [ VariableSuffix() ] try { } catch (ParseException e) { @@ -1958,7 +1946,7 @@ void ForeachStatement() : throw e; } try { - Statement() + Statement() } catch (ParseException e) { if (errorMessage != null) throw e; errorMessage = "statement expected"; @@ -1969,7 +1957,7 @@ void ForeachStatement() : void ForStatement() : { -Token token; +final Token token; final int pos = jj_input_stream.bufpos; } { diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java index 8248034..e481eff 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java @@ -4,130 +4,132 @@ package test; public interface PHPParserConstants { int EOF = 0; - int PHPSTART = 1; - int PHPEND = 2; - int SINGLE_LINE_COMMENT = 12; - int SINGLE_LINE_COMMENT_PHPEND = 13; - int FORMAL_COMMENT = 14; - int MULTI_LINE_COMMENT = 15; - int CLASS = 17; - int FUNCTION = 18; - int VAR = 19; - int IF = 20; - int ELSEIF = 21; - int ELSE = 22; - int ARRAY = 23; - int PRINT = 24; - int ECHO = 25; - int INCLUDE = 26; - int REQUIRE = 27; - int INCLUDE_ONCE = 28; - int REQUIRE_ONCE = 29; - int GLOBAL = 30; - int STATIC = 31; - int CLASSACCESS = 32; - int STATICCLASSACCESS = 33; - int ARRAYASSIGN = 34; - int BREAK = 35; - int CASE = 36; - int CONST = 37; - int CONTINUE = 38; - int _DEFAULT = 39; - int DO = 40; - int EXTENDS = 41; - int FALSE = 42; - int FOR = 43; - int GOTO = 44; - int NEW = 45; - int NULL = 46; - int RETURN = 47; - int SUPER = 48; - int SWITCH = 49; - int THIS = 50; - int TRUE = 51; - int WHILE = 52; - int ENDWHILE = 53; - int ENDIF = 54; - int ENDFOR = 55; - int FOREACH = 56; - int AS = 57; - int STRING = 58; - int OBJECT = 59; - int BOOL = 60; - int BOOLEAN = 61; - int REAL = 62; - int DOUBLE = 63; - int FLOAT = 64; - int INT = 65; - int INTEGER = 66; - int _ORL = 67; - int _ANDL = 68; - int INTEGER_LITERAL = 69; - int DECIMAL_LITERAL = 70; - int HEX_LITERAL = 71; - int OCTAL_LITERAL = 72; - int FLOATING_POINT_LITERAL = 73; - int EXPONENT = 74; - int STRING_LITERAL = 75; - int STRING_1 = 76; - int STRING_2 = 77; - int STRING_3 = 78; - int IDENTIFIER = 79; - int LETTER = 80; - int DIGIT = 81; - int SPECIAL = 82; - int LPAREN = 83; - int RPAREN = 84; - int LBRACE = 85; - int RBRACE = 86; - int LBRACKET = 87; - int RBRACKET = 88; - int SEMICOLON = 89; - int COMMA = 90; - int DOT = 91; - int AT = 92; - int DOLLAR = 93; - int ASSIGN = 94; - int GT = 95; - int LT = 96; - int BANG = 97; - int HOOK = 98; - int COLON = 99; - int EQ = 100; - int LE = 101; - int GE = 102; - int NE = 103; - int DIF = 104; - int SC_OR = 105; - int SC_AND = 106; - int INCR = 107; - int DECR = 108; - int PLUS = 109; - int MINUS = 110; - int STAR = 111; - int SLASH = 112; - int BIT_AND = 113; - int BIT_OR = 114; - int XOR = 115; - int REM = 116; - int LSHIFT = 117; - int RSIGNEDSHIFT = 118; - int RUNSIGNEDSHIFT = 119; - int PLUSASSIGN = 120; - int MINUSASSIGN = 121; - int STARASSIGN = 122; - int SLASHASSIGN = 123; - int ANDASSIGN = 124; - int ORASSIGN = 125; - int XORASSIGN = 126; - int DOTASSIGN = 127; - int REMASSIGN = 128; - int LSHIFTASSIGN = 129; - int RSIGNEDSHIFTASSIGN = 130; - int BANGDOUBLEEQUAL = 131; - int TRIPLEEQUAL = 132; - int TILDEEQUAL = 133; - int DOLLAR_ID = 134; + int PHPSTARTSHORT = 1; + int PHPSTARTLONG = 2; + int PHPECHOSTART = 3; + int PHPEND = 4; + int SINGLE_LINE_COMMENT = 14; + int SINGLE_LINE_COMMENT_PHPEND = 15; + int FORMAL_COMMENT = 16; + int MULTI_LINE_COMMENT = 17; + int CLASS = 19; + int FUNCTION = 20; + int VAR = 21; + int IF = 22; + int ELSEIF = 23; + int ELSE = 24; + int ARRAY = 25; + int BREAK = 26; + int PRINT = 27; + int ECHO = 28; + int INCLUDE = 29; + int REQUIRE = 30; + int INCLUDE_ONCE = 31; + int REQUIRE_ONCE = 32; + int GLOBAL = 33; + int STATIC = 34; + int CLASSACCESS = 35; + int STATICCLASSACCESS = 36; + int ARRAYASSIGN = 37; + int CASE = 38; + int CONST = 39; + int CONTINUE = 40; + int _DEFAULT = 41; + int DO = 42; + int EXTENDS = 43; + int FOR = 44; + int GOTO = 45; + int NEW = 46; + int NULL = 47; + int RETURN = 48; + int SUPER = 49; + int SWITCH = 50; + int THIS = 51; + int TRUE = 52; + int FALSE = 53; + int WHILE = 54; + int ENDWHILE = 55; + int ENDIF = 56; + int ENDFOR = 57; + int FOREACH = 58; + int AS = 59; + int STRING = 60; + int OBJECT = 61; + int BOOL = 62; + int BOOLEAN = 63; + int REAL = 64; + int DOUBLE = 65; + int FLOAT = 66; + int INT = 67; + int INTEGER = 68; + int _ORL = 69; + int _ANDL = 70; + int INTEGER_LITERAL = 71; + int DECIMAL_LITERAL = 72; + int HEX_LITERAL = 73; + int OCTAL_LITERAL = 74; + int FLOATING_POINT_LITERAL = 75; + int EXPONENT = 76; + int STRING_LITERAL = 77; + int STRING_1 = 78; + int STRING_2 = 79; + int STRING_3 = 80; + int IDENTIFIER = 81; + int LETTER = 82; + int DIGIT = 83; + int SPECIAL = 84; + int LPAREN = 85; + int RPAREN = 86; + int LBRACE = 87; + int RBRACE = 88; + int LBRACKET = 89; + int RBRACKET = 90; + int SEMICOLON = 91; + int COMMA = 92; + int DOT = 93; + int GT = 94; + int LT = 95; + int EQ = 96; + int LE = 97; + int GE = 98; + int NE = 99; + int DIF = 100; + int BANGDOUBLEEQUAL = 101; + int TRIPLEEQUAL = 102; + int ASSIGN = 103; + int PLUSASSIGN = 104; + int MINUSASSIGN = 105; + int STARASSIGN = 106; + int SLASHASSIGN = 107; + int ANDASSIGN = 108; + int ORASSIGN = 109; + int XORASSIGN = 110; + int DOTASSIGN = 111; + int REMASSIGN = 112; + int TILDEEQUAL = 113; + int AT = 114; + int DOLLAR = 115; + int BANG = 116; + int HOOK = 117; + int COLON = 118; + int SC_OR = 119; + int SC_AND = 120; + int INCR = 121; + int DECR = 122; + int PLUS = 123; + int MINUS = 124; + int STAR = 125; + int SLASH = 126; + int BIT_AND = 127; + int BIT_OR = 128; + int XOR = 129; + int REM = 130; + int LSHIFT = 131; + int RSIGNEDSHIFT = 132; + int RUNSIGNEDSHIFT = 133; + int LSHIFTASSIGN = 134; + int RSIGNEDSHIFTASSIGN = 135; + int DOLLAR_ID = 136; int DEFAULT = 0; int PHPPARSING = 1; @@ -137,22 +139,24 @@ public interface PHPParserConstants { String[] tokenImage = { "", - "", + "\"\"", - "", + "", "\" \"", "\"\\t\"", "\"\\n\"", "\"\\r\"", "\"\\f\"", "\"//\"", - "", + "", "\"/*\"", "", "\"?>\"", "\"*/\"", "\"*/\"", - "", + "", "\"class\"", "\"function\"", "\"var\"", @@ -160,6 +164,7 @@ public interface PHPParserConstants { "\"elseif\"", "\"else\"", "\"array\"", + "\"break\"", "\"print\"", "\"echo\"", "\"include\"", @@ -171,14 +176,12 @@ public interface PHPParserConstants { "\"->\"", "\"::\"", "\"=>\"", - "\"break\"", "\"case\"", "\"const\"", "\"continue\"", "\"default\"", "\"do\"", "\"extends\"", - "\"false\"", "\"for\"", "\"goto\"", "\"new\"", @@ -188,6 +191,7 @@ public interface PHPParserConstants { "\"switch\"", "\"this\"", "\"true\"", + "\"false\"", "\"while\"", "\"endwhile\"", "\"endif\"", @@ -228,19 +232,31 @@ public interface PHPParserConstants { "\";\"", "\",\"", "\".\"", - "\"@\"", - "\"$\"", - "\"=\"", "\">\"", "\"<\"", - "\"!\"", - "\"?\"", - "\":\"", "\"==\"", "\"<=\"", "\">=\"", "\"!=\"", "\"<>\"", + "\"!==\"", + "\"===\"", + "\"=\"", + "\"+=\"", + "\"-=\"", + "\"*=\"", + "\"/=\"", + "\"&=\"", + "\"|=\"", + "\"^=\"", + "\".=\"", + "\"%=\"", + "\"~=\"", + "\"@\"", + "\"$\"", + "\"!\"", + "\"?\"", + "\":\"", "\"||\"", "\"&&\"", "\"++\"", @@ -256,20 +272,8 @@ public interface PHPParserConstants { "\"<<\"", "\">>\"", "\">>>\"", - "\"+=\"", - "\"-=\"", - "\"*=\"", - "\"/=\"", - "\"&=\"", - "\"|=\"", - "\"^=\"", - "\".=\"", - "\"%=\"", "\"<<=\"", "\">>=\"", - "\"!==\"", - "\"===\"", - "\"~=\"", "", "\"?>\"", }; diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java index 687cbf4..c500582 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java @@ -2,7 +2,6 @@ package test; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.texteditor.MarkerUtilities; @@ -28,20 +27,21 @@ public abstract class PHPParserSuperclass { /** * Call the php parse command ( php -l -f <filename> ) - * and create markers according to the external parser output + * and create markers according to the external parser output. + * @param file the file that will be parsed */ - public static void phpExternalParse(IFile file) { + public static void phpExternalParse(final IFile file) { //IFile file = (IFile) resource; - IPath path = file.getFullPath(); - IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); - String filename = file.getLocation().toString(); + // final IPath path = file.getFullPath(); + final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); + final String filename = file.getLocation().toString(); - String[] arguments = { filename }; - MessageFormat form = + final String[] arguments = { filename }; + final MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); - String command = form.format(arguments); + final String command = form.format(arguments); - String parserResult = + final String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: "); try { @@ -52,15 +52,15 @@ public abstract class PHPParserSuperclass { } /** - * Create markers according to the external parser output + * Create markers according to the external parser output. */ - private static void createMarkers(String output, IFile file) + private static void createMarkers(final String output, final IFile file) throws CoreException { // delete all markers file.deleteMarkers(IMarker.PROBLEM, false, 0); int indx = 0; - int brIndx = 0; + int brIndx; boolean flag = true; while ((brIndx = output.indexOf("
", indx)) != -1) { // newer php error output (tested with 4.2.3) @@ -77,17 +77,17 @@ public abstract class PHPParserSuperclass { } } - private static void scanLine(String output, IFile file, int indx, int brIndx) + private static void scanLine(final String output, final IFile file, final int indx, final int brIndx) throws CoreException { String current; - String outLineNumberString; - StringBuffer lineNumberBuffer = new StringBuffer(10); + // String outLineNumberString; never used + final StringBuffer lineNumberBuffer = new StringBuffer(10); char ch; current = output.substring(indx, brIndx); if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) { - int onLine = current.indexOf("on line "); + final int onLine = current.indexOf("on line "); if (onLine != -1) { lineNumberBuffer.delete(0, lineNumberBuffer.length()); for (int i = onLine; i < current.length(); i++) { @@ -97,9 +97,9 @@ public abstract class PHPParserSuperclass { } } - int lineNumber = Integer.parseInt(lineNumberBuffer.toString()); + final int lineNumber = Integer.parseInt(lineNumberBuffer.toString()); - Hashtable attributes = new Hashtable(); + final Hashtable attributes = new Hashtable(); current = current.replaceAll("\n", ""); current = current.replaceAll("", ""); @@ -120,21 +120,45 @@ public abstract class PHPParserSuperclass { } } + /** + * This will parse the file and generate the outline info + * @param parent the parent object + * @param s the string that should be parsed + * @return the outline info + */ public abstract PHPOutlineInfo parseInfo(Object parent, String s); + /** + * This will change the file to parse. + * @param fileToParse the file that should be parsed + */ public abstract void setFileToParse(IFile fileToParse); + /** + * This will parse the given string + * @param s the string to parse + * @throws CoreException an exception that can be launched + */ public abstract void parse(String s) throws CoreException; - public static void setMarker( - IFile file, - String message, - int charStart, - int charEnd, - int errorLevel) + /** + * This will set a marker. + * @param file the file that generated the marker + * @param message the message + * @param charStart the starting character + * @param charEnd the end character + * @param errorLevel the error level ({@link PHPParserSuperclass#ERROR}, + * {@link PHPParserSuperclass#INFO},{@link PHPParserSuperclass#WARNING}) + * @throws CoreException an exception throwed by the MarkerUtilities + */ + public static void setMarker(final IFile file, + final String message, + final int charStart, + final int charEnd, + final int errorLevel) throws CoreException { if (file != null) { - Hashtable attributes = new Hashtable(); + final Hashtable attributes = new Hashtable(); MarkerUtilities.setMessage(attributes, message); switch (errorLevel) { case Parser.ERROR : @@ -149,20 +173,30 @@ public abstract class PHPParserSuperclass { } MarkerUtilities.setCharStart(attributes, charStart); MarkerUtilities.setCharEnd(attributes, charEnd); - // setLineNumber(attributes, lineNumber); MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); } } - public static void setMarker(IFile file, - String message, - int charStart, - int charEnd, - int errorLevel, - String location) + /** + * This will set a marker. + * @param file the file that generated the marker + * @param message the message + * @param charStart the starting character + * @param charEnd the end character + * @param errorLevel the error level ({@link PHPParserSuperclass#ERROR}, + * {@link PHPParserSuperclass#INFO},{@link PHPParserSuperclass#WARNING}) + * @param location the location of the error + * @throws CoreException an exception throwed by the MarkerUtilities + */ + public static void setMarker(final IFile file, + final String message, + final int charStart, + final int charEnd, + final int errorLevel, + final String location) throws CoreException { if (file != null) { - Hashtable attributes = new Hashtable(); + final Hashtable attributes = new Hashtable(); MarkerUtilities.setMessage(attributes, message); switch (errorLevel) { case Parser.ERROR : @@ -178,7 +212,6 @@ public abstract class PHPParserSuperclass { attributes.put(IMarker.LOCATION,location); MarkerUtilities.setCharStart(attributes, charStart); MarkerUtilities.setCharEnd(attributes, charEnd); - // setLineNumber(attributes, lineNumber); MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); } } diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 5555d08..e6b45da 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -21,179 +21,113 @@ public class PHPParserTokenManager implements PHPParserConstants { public static java.io.PrintStream debugStream = System.out; public static void setDebugStream(java.io.PrintStream ds) { debugStream = ds; } -private static final int jjStopStringLiteralDfa_0(int pos, long active0, long active1, long active2) -{ - switch (pos) - { - default : - return -1; - } -} -private static final int jjStartNfa_0(int pos, long active0, long active1, long active2) -{ - return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1, active2), pos + 1); -} static private final int jjStopAtPos(int pos, int kind) { jjmatchedKind = kind; jjmatchedPos = pos; return pos + 1; } -static private final int jjStartNfaWithStates_0(int pos, int kind, int state) -{ - jjmatchedKind = kind; - jjmatchedPos = pos; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { return pos + 1; } - return jjMoveNfa_0(state, pos + 1); -} static private final int jjMoveStringLiteralDfa0_0() { switch(curChar) { + case 60: + return jjMoveStringLiteralDfa1_0(0xeL, 0x0L); case 63: - return jjMoveStringLiteralDfa1_0(0x80L); + return jjMoveStringLiteralDfa1_0(0x0L, 0x200L); default : - return jjMoveNfa_0(0, 0); + return 1; } } -static private final int jjMoveStringLiteralDfa1_0(long active2) +static private final int jjMoveStringLiteralDfa1_0(long active0, long active2) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_0(0, 0L, 0L, active2); return 1; } switch(curChar) { case 62: - if ((active2 & 0x80L) != 0L) - return jjStopAtPos(1, 135); + if ((active2 & 0x200L) != 0L) + return jjStopAtPos(1, 137); break; + case 63: + if ((active0 & 0x2L) != 0L) + { + jjmatchedKind = 1; + jjmatchedPos = 1; + } + return jjMoveStringLiteralDfa2_0(active0, 0xcL, active2, 0L); default : - break; + return 2; } - return jjStartNfa_0(0, 0L, 0L, active2); + return 2; } -static private final void jjCheckNAdd(int state) +static private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old2, long active2) { - if (jjrounds[state] != jjround) + if (((active0 &= old0) | (active2 &= old2)) == 0L) + return 2; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 2; + } + switch(curChar) { - jjstateSet[jjnewStateCnt++] = state; - jjrounds[state] = jjround; + case 61: + if ((active0 & 0x8L) != 0L) + return jjStopAtPos(2, 3); + break; + case 80: + case 112: + return jjMoveStringLiteralDfa3_0(active0, 0x4L); + default : + return 3; } + return 3; } -static private final void jjAddStates(int start, int end) -{ - do { - jjstateSet[jjnewStateCnt++] = jjnextStates[start]; - } while (start++ != end); -} -static private final void jjCheckNAddTwoStates(int state1, int state2) -{ - jjCheckNAdd(state1); - jjCheckNAdd(state2); -} -static private final void jjCheckNAddStates(int start, int end) -{ - do { - jjCheckNAdd(jjnextStates[start]); - } while (start++ != end); -} -static private final void jjCheckNAddStates(int start) +static private final int jjMoveStringLiteralDfa3_0(long old0, long active0) { - jjCheckNAdd(jjnextStates[start]); - jjCheckNAdd(jjnextStates[start + 1]); + if (((active0 &= old0)) == 0L) + return 3; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 3; + } + switch(curChar) + { + case 72: + case 104: + return jjMoveStringLiteralDfa4_0(active0, 0x4L); + default : + return 4; + } } -static private final int jjMoveNfa_0(int startState, int curPos) +static private final int jjMoveStringLiteralDfa4_0(long old0, long active0) { - int[] nextStates; - int startsAt = 0; - jjnewStateCnt = 6; - int i = 1; - jjstateSet[0] = startState; - int j, kind = 0x7fffffff; - for (;;) + if (((active0 &= old0)) == 0L) + return 4; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 4; + } + switch(curChar) { - if (++jjround == 0x7fffffff) - ReInitRounds(); - if (curChar < 64) - { - long l = 1L << curChar; - MatchLoop: do - { - switch(jjstateSet[--i]) - { - case 0: - if (curChar == 60) - jjAddStates(0, 1); - break; - case 4: - if (curChar == 63) - jjstateSet[jjnewStateCnt++] = 3; - break; - case 5: - if (curChar == 63 && kind > 1) - kind = 1; - break; - default : break; - } - } while(i != startsAt); - } - else if (curChar < 128) - { - long l = 1L << (curChar & 077); - MatchLoop: do - { - switch(jjstateSet[--i]) - { - case 1: - if ((0x1000000010000L & l) != 0L && kind > 1) - kind = 1; - break; - case 2: - if ((0x10000000100L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 1; - break; - case 3: - if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 2; - break; - default : break; - } - } while(i != startsAt); - } - else - { - int i2 = (curChar & 0xff) >> 6; - long l2 = 1L << (curChar & 077); - MatchLoop: do - { - switch(jjstateSet[--i]) - { - default : break; - } - } while(i != startsAt); - } - if (kind != 0x7fffffff) - { - jjmatchedKind = kind; - jjmatchedPos = curPos; - kind = 0x7fffffff; - } - ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 6 - (jjnewStateCnt = startsAt))) - return curPos; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { return curPos; } + case 80: + case 112: + if ((active0 & 0x4L) != 0L) + return jjStopAtPos(4, 2); + break; + default : + return 5; } + return 5; } static private final int jjMoveStringLiteralDfa0_4() { switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_4(0x8000L); + return jjMoveStringLiteralDfa1_4(0x20000L); default : return 1; } @@ -207,8 +141,8 @@ static private final int jjMoveStringLiteralDfa1_4(long active0) switch(curChar) { case 47: - if ((active0 & 0x8000L) != 0L) - return jjStopAtPos(1, 15); + if ((active0 & 0x20000L) != 0L) + return jjStopAtPos(1, 17); break; default : return 2; @@ -240,7 +174,7 @@ static private final int jjMoveStringLiteralDfa0_2() switch(curChar) { case 63: - return jjMoveStringLiteralDfa1_2(0x2000L); + return jjMoveStringLiteralDfa1_2(0x8000L); default : return jjMoveNfa_2(0, 0); } @@ -255,14 +189,44 @@ static private final int jjMoveStringLiteralDfa1_2(long active0) switch(curChar) { case 62: - if ((active0 & 0x2000L) != 0L) - return jjStopAtPos(1, 13); + if ((active0 & 0x8000L) != 0L) + return jjStopAtPos(1, 15); break; default : break; } return jjStartNfa_2(0, active0); } +static private final void jjCheckNAdd(int state) +{ + if (jjrounds[state] != jjround) + { + jjstateSet[jjnewStateCnt++] = state; + jjrounds[state] = jjround; + } +} +static private final void jjAddStates(int start, int end) +{ + do { + jjstateSet[jjnewStateCnt++] = jjnextStates[start]; + } while (start++ != end); +} +static private final void jjCheckNAddTwoStates(int state1, int state2) +{ + jjCheckNAdd(state1); + jjCheckNAdd(state2); +} +static private final void jjCheckNAddStates(int start, int end) +{ + do { + jjCheckNAdd(jjnextStates[start]); + } while (start++ != end); +} +static private final void jjCheckNAddStates(int start) +{ + jjCheckNAdd(jjnextStates[start]); + jjCheckNAdd(jjnextStates[start + 1]); +} static private final int jjMoveNfa_2(int startState, int curPos) { int[] nextStates; @@ -285,15 +249,15 @@ static private final int jjMoveNfa_2(int startState, int curPos) case 0: if ((0x2400L & l) != 0L) { - if (kind > 12) - kind = 12; + if (kind > 14) + kind = 14; } if (curChar == 13) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if (curChar == 10 && kind > 12) - kind = 12; + if (curChar == 10 && kind > 14) + kind = 14; break; case 2: if (curChar == 13) @@ -344,122 +308,122 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0xa00L) != 0L || (active1 & 0x801000000000000L) != 0L) + if ((active0 & 0x2800L) != 0L || (active1 & 0x4000080000000000L) != 0L) return 2; - if ((active1 & 0x20000000L) != 0L) + if ((active1 & 0x8000000000000L) != 0L) return 16; - if ((active1 & 0x8000000008000000L) != 0L) + if ((active1 & 0x800020000000L) != 0L) return 8; - if ((active0 & 0xfffffff8fffe0000L) != 0L || (active1 & 0x1fL) != 0L) + if ((active0 & 0xffffffc7fff80000L) != 0L || (active1 & 0x7fL) != 0L) { - jjmatchedKind = 79; + jjmatchedKind = 81; return 14; } return -1; case 1: - if ((active0 & 0x800L) != 0L) + if ((active0 & 0x2000L) != 0L) return 0; - if ((active0 & 0x7dfffef8ffee0000L) != 0L || (active1 & 0x17L) != 0L) + if ((active0 & 0x800040000400000L) != 0L || (active1 & 0x22L) != 0L) + return 14; + if ((active0 & 0xf7fffbc7ffb80000L) != 0L || (active1 & 0x5dL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 1; } return 14; } - if ((active0 & 0x8200010000100000L) != 0L || (active1 & 0x8L) != 0L) - return 14; return -1; case 2: - if ((active0 & 0x100280000080000L) != 0L || (active1 & 0x16L) != 0L) + if ((active0 & 0x400500000200000L) != 0L || (active1 & 0x58L) != 0L) return 14; - if ((active0 & 0xfcffd6f8ffe60000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0xf3ffabc7ff980000L) != 0L || (active1 & 0x7L) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0x700c501002600000L) != 0L) + if ((active0 & 0xc018a04011800000L) != 0L || (active1 & 0x1L) != 0L) return 14; - if ((active0 & 0x8df386e8fd860000L) != 0L || (active1 & 0x5L) != 0L) + if ((active0 & 0x37e70b87ee180000L) != 0L || (active1 & 0x16L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0xada282c0fc240000L) != 0L || (active1 & 0x4L) != 0L) + if ((active0 & 0xb6850b07e0900000L) != 0L || (active1 & 0x12L) != 0L) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 4; return 14; } - if ((active0 & 0x51042801820000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0x16200800e080000L) != 0L || (active1 & 0x4L) != 0L) return 14; return -1; case 5: - if ((active0 & 0x8c828000c0200000L) != 0L) + if ((active0 & 0x3205000600800000L) != 0L || (active1 & 0x2L) != 0L) return 14; - if ((active0 & 0x212002c03c040000L) != 0L || (active1 & 0x4L) != 0L) + if ((active0 & 0x84800b01e0100000L) != 0L || (active1 & 0x10L) != 0L) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x210002803c000000L) != 0L || (active1 & 0x4L) != 0L) + if ((active0 & 0x84000a01e0000000L) != 0L || (active1 & 0x10L) != 0L) return 14; - if ((active0 & 0x20004000040000L) != 0L) + if ((active0 & 0x80010000100000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 6; } return 14; } return -1; case 7: - if ((active0 & 0x20004000040000L) != 0L) - return 14; - if ((active0 & 0x30000000L) != 0L) + if ((active0 & 0x180000000L) != 0L) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 7; return 14; } + if ((active0 & 0x80010000100000L) != 0L) + return 14; return -1; case 8: - if ((active0 & 0x30000000L) != 0L) + if ((active0 & 0x180000000L) != 0L) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 8; return 14; } return -1; case 9: - if ((active0 & 0x30000000L) != 0L) + if ((active0 & 0x180000000L) != 0L) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 9; return 14; } return -1; case 10: - if ((active0 & 0x30000000L) != 0L) + if ((active0 & 0x180000000L) != 0L) { - jjmatchedKind = 79; + jjmatchedKind = 81; jjmatchedPos = 10; return 14; } @@ -485,120 +449,120 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 97; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000L, 0x8L); + jjmatchedKind = 116; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2800000000L, 0x0L); case 36: - return jjStartNfaWithStates_1(0, 93, 16); + return jjStartNfaWithStates_1(0, 115, 16); case 37: - jjmatchedKind = 116; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x1L); + jjmatchedKind = 130; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L); case 38: - jjmatchedKind = 113; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000040000000000L, 0x0L); + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_1(0x0L, 0x100100000000000L, 0x0L); case 40: - return jjStopAtPos(0, 83); + return jjStopAtPos(0, 85); case 41: - return jjStopAtPos(0, 84); + return jjStopAtPos(0, 86); case 42: - jjmatchedKind = 111; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000000L, 0x0L); + jjmatchedKind = 125; + return jjMoveStringLiteralDfa1_1(0x0L, 0x40000000000L, 0x0L); case 43: - jjmatchedKind = 109; - return jjMoveStringLiteralDfa1_1(0x0L, 0x100080000000000L, 0x0L); + jjmatchedKind = 123; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200010000000000L, 0x0L); case 44: - return jjStopAtPos(0, 90); + return jjStopAtPos(0, 92); case 45: - jjmatchedKind = 110; - return jjMoveStringLiteralDfa1_1(0x100000000L, 0x200100000000000L, 0x0L); + jjmatchedKind = 124; + return jjMoveStringLiteralDfa1_1(0x800000000L, 0x400020000000000L, 0x0L); case 46: - jjmatchedKind = 91; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000000L, 0x0L); + jjmatchedKind = 93; + return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000L, 0x0L); case 47: - jjmatchedKind = 112; - return jjMoveStringLiteralDfa1_1(0xa00L, 0x800000000000000L, 0x0L); + jjmatchedKind = 126; + return jjMoveStringLiteralDfa1_1(0x2800L, 0x80000000000L, 0x0L); case 58: - jjmatchedKind = 99; - return jjMoveStringLiteralDfa1_1(0x200000000L, 0x0L, 0x0L); + jjmatchedKind = 118; + return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 89); + return jjStopAtPos(0, 91); case 60: - jjmatchedKind = 96; - return jjMoveStringLiteralDfa1_1(0x0L, 0x20012000000000L, 0x2L); + jjmatchedKind = 95; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1200000000L, 0x48L); case 61: - jjmatchedKind = 94; - return jjMoveStringLiteralDfa1_1(0x400000000L, 0x1000000000L, 0x10L); + jjmatchedKind = 103; + return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x4100000000L, 0x0L); case 62: - jjmatchedKind = 95; - return jjMoveStringLiteralDfa1_1(0x0L, 0xc0004000000000L, 0x4L); + jjmatchedKind = 94; + return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000L, 0xb0L); case 63: - jjmatchedKind = 98; - return jjMoveStringLiteralDfa1_1(0x4L, 0x0L, 0x0L); + jjmatchedKind = 117; + return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 92); + return jjStopAtPos(0, 114); case 91: - return jjStopAtPos(0, 87); + return jjStopAtPos(0, 89); case 93: - return jjStopAtPos(0, 88); + return jjStopAtPos(0, 90); case 94: - jjmatchedKind = 115; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000000L, 0x0L); + jjmatchedKind = 129; + return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000L, 0x0L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x200000000800000L, 0x10L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800000002000000L, 0x40L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x3000000800000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xc000000004000000L, 0x0L, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0x7000020000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1c000080000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x8000018000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x60000000000L, 0x2L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0xe0020002600000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x380080011800000L, 0x0L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x1000c0000040000L, 0x1L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x420100000100000L, 0x4L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x100040000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200200000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x14100000L, 0x6L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xa0400000L, 0x18L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0x600000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xc00000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x800000000000000L, 0x8L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x2000000000000000L, 0x20L, 0x0L); case 80: case 112: - return jjMoveStringLiteralDfa1_1(0x1000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x4000800028000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1000140000000L, 0x1L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x403000080000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1006000400000000L, 0x0L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x18000000000000L, 0x0L, 0x0L); case 86: case 118: - return jjMoveStringLiteralDfa1_1(0x80000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200000L, 0x0L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x10000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x40000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 85); + return jjStopAtPos(0, 87); case 124: - jjmatchedKind = 114; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000020000000000L, 0x0L); + jjmatchedKind = 128; + return jjMoveStringLiteralDfa1_1(0x0L, 0x80200000000000L, 0x0L); case 125: - return jjStopAtPos(0, 86); + return jjStopAtPos(0, 88); case 126: - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x20L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); default : return jjMoveNfa_1(3, 0); } @@ -613,146 +577,146 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x40000000000L) != 0L) - return jjStopAtPos(1, 106); + if ((active1 & 0x100000000000000L) != 0L) + return jjStopAtPos(1, 120); break; case 42: - if ((active0 & 0x800L) != 0L) - return jjStartNfaWithStates_1(1, 11, 0); + if ((active0 & 0x2000L) != 0L) + return jjStartNfaWithStates_1(1, 13, 0); break; case 43: - if ((active1 & 0x80000000000L) != 0L) - return jjStopAtPos(1, 107); + if ((active1 & 0x200000000000000L) != 0L) + return jjStopAtPos(1, 121); break; case 45: - if ((active1 & 0x100000000000L) != 0L) - return jjStopAtPos(1, 108); + if ((active1 & 0x400000000000000L) != 0L) + return jjStopAtPos(1, 122); break; case 47: - if ((active0 & 0x200L) != 0L) - return jjStopAtPos(1, 9); + if ((active0 & 0x800L) != 0L) + return jjStopAtPos(1, 11); break; case 58: - if ((active0 & 0x200000000L) != 0L) - return jjStopAtPos(1, 33); + if ((active0 & 0x1000000000L) != 0L) + return jjStopAtPos(1, 36); break; case 60: - if ((active1 & 0x20000000000000L) != 0L) + if ((active2 & 0x8L) != 0L) { - jjmatchedKind = 117; + jjmatchedKind = 131; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x2L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x40L); case 61: - if ((active1 & 0x1000000000L) != 0L) + if ((active1 & 0x100000000L) != 0L) { - jjmatchedKind = 100; + jjmatchedKind = 96; jjmatchedPos = 1; } - else if ((active1 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 101); - else if ((active1 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 102); - else if ((active1 & 0x8000000000L) != 0L) + else if ((active1 & 0x200000000L) != 0L) + return jjStopAtPos(1, 97); + else if ((active1 & 0x400000000L) != 0L) + return jjStopAtPos(1, 98); + else if ((active1 & 0x800000000L) != 0L) { - jjmatchedKind = 103; + jjmatchedKind = 99; jjmatchedPos = 1; } - else if ((active1 & 0x100000000000000L) != 0L) - return jjStopAtPos(1, 120); - else if ((active1 & 0x200000000000000L) != 0L) - return jjStopAtPos(1, 121); - else if ((active1 & 0x400000000000000L) != 0L) - return jjStopAtPos(1, 122); - else if ((active1 & 0x800000000000000L) != 0L) - return jjStopAtPos(1, 123); - else if ((active1 & 0x1000000000000000L) != 0L) - return jjStopAtPos(1, 124); - else if ((active1 & 0x2000000000000000L) != 0L) - return jjStopAtPos(1, 125); - else if ((active1 & 0x4000000000000000L) != 0L) - return jjStopAtPos(1, 126); - else if ((active1 & 0x8000000000000000L) != 0L) - return jjStopAtPos(1, 127); - else if ((active2 & 0x1L) != 0L) - return jjStopAtPos(1, 128); - else if ((active2 & 0x20L) != 0L) - return jjStopAtPos(1, 133); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x18L); - case 62: - if ((active0 & 0x4L) != 0L) - return jjStopAtPos(1, 2); - else if ((active0 & 0x100000000L) != 0L) - return jjStopAtPos(1, 32); - else if ((active0 & 0x400000000L) != 0L) - return jjStopAtPos(1, 34); else if ((active1 & 0x10000000000L) != 0L) return jjStopAtPos(1, 104); - else if ((active1 & 0x40000000000000L) != 0L) + else if ((active1 & 0x20000000000L) != 0L) + return jjStopAtPos(1, 105); + else if ((active1 & 0x40000000000L) != 0L) + return jjStopAtPos(1, 106); + else if ((active1 & 0x80000000000L) != 0L) + return jjStopAtPos(1, 107); + else if ((active1 & 0x100000000000L) != 0L) + return jjStopAtPos(1, 108); + else if ((active1 & 0x200000000000L) != 0L) + return jjStopAtPos(1, 109); + else if ((active1 & 0x400000000000L) != 0L) + return jjStopAtPos(1, 110); + else if ((active1 & 0x800000000000L) != 0L) + return jjStopAtPos(1, 111); + else if ((active1 & 0x1000000000000L) != 0L) + return jjStopAtPos(1, 112); + else if ((active1 & 0x2000000000000L) != 0L) + return jjStopAtPos(1, 113); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000L, active2, 0L); + case 62: + if ((active0 & 0x10L) != 0L) + return jjStopAtPos(1, 4); + else if ((active0 & 0x800000000L) != 0L) + return jjStopAtPos(1, 35); + else if ((active0 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 37); + else if ((active1 & 0x1000000000L) != 0L) + return jjStopAtPos(1, 100); + else if ((active2 & 0x10L) != 0L) { - jjmatchedKind = 118; + jjmatchedKind = 132; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x80000000000000L, active2, 0x4L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0xa0L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x41000080000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20004000200000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0x800000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000000L, active1, 0L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa2_1(active0, 0x2000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x4000a08028000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1420140000000L, active1, 0x1L, active2, 0L); case 70: case 102: - if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_1(1, 20, 14); + if ((active0 & 0x400000L) != 0L) + return jjStartNfaWithStates_1(1, 22, 14); break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x14000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x48000000000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x40620000L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x201880000L, active1, 0x4L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0xe0000014000000L, active1, 0x16L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x3800000a0000000L, active1, 0x58L, active2, 0L); case 79: case 111: - if ((active0 & 0x10000000000L) != 0L) + if ((active0 & 0x40000000000L) != 0L) { - jjmatchedKind = 40; + jjmatchedKind = 42; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0xb100186000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xc400318000000000L, active1, 0x2L, active2, 0L); case 82: case 114: - if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_1(1, 67, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x8000801800000L, active1, 0L, active2, 0L); + if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(1, 69, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x1000000e000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 57, 14); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(1, 59, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x400000080000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1000000400000000L, active1, 0L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0x1400000040000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2800000100000L, active1, 0L, active2, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000L, active1, 0L, active2, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x20000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x80000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x20000000000L) != 0L) - return jjStopAtPos(1, 105); + if ((active1 & 0x80000000000000L) != 0L) + return jjStopAtPos(1, 119); break; default : break; @@ -771,88 +735,88 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active2 & 0x2L) != 0L) - return jjStopAtPos(2, 129); - else if ((active2 & 0x4L) != 0L) - return jjStopAtPos(2, 130); - else if ((active2 & 0x8L) != 0L) - return jjStopAtPos(2, 131); - else if ((active2 & 0x10L) != 0L) - return jjStopAtPos(2, 132); + if ((active1 & 0x2000000000L) != 0L) + return jjStopAtPos(2, 101); + else if ((active1 & 0x4000000000L) != 0L) + return jjStopAtPos(2, 102); + else if ((active2 & 0x40L) != 0L) + return jjStopAtPos(2, 134); + else if ((active2 & 0x80L) != 0L) + return jjStopAtPos(2, 135); break; case 62: - if ((active1 & 0x80000000000000L) != 0L) - return jjStopAtPos(2, 119); + if ((active2 & 0x20L) != 0L) + return jjStopAtPos(2, 133); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x4000000080020000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x400080000L, active1, 0x1L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_1(active0, 0x14000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xa0000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_1(2, 68, 14); - return jjMoveStringLiteralDfa3_1(active0, 0xe0000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x40L) != 0L) + return jjStartNfaWithStates_1(2, 70, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x380000000000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000L, active1, 0L, active2, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x20000000000L, active1, 0L, active2, 0L); case 72: case 104: - return jjMoveStringLiteralDfa3_1(active0, 0x2000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x16000001000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4c000008000000L, active1, 0L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0x800000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2000000000000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x440000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x20800000000000L, active1, 0L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0x6000040000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x18000100000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x3000000040000000L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xc000000200000000L, active1, 0x4L, active2, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x1000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2000000000000L, active1, 0L, active2, 0L); case 81: case 113: - return jjMoveStringLiteralDfa3_1(active0, 0x28000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x140000000L, active1, 0L, active2, 0L); case 82: case 114: - if ((active0 & 0x80000L) != 0L) - return jjStartNfaWithStates_1(2, 19, 14); - else if ((active0 & 0x80000000000L) != 0L) + if ((active0 & 0x200000L) != 0L) + return jjStartNfaWithStates_1(2, 21, 14); + else if ((active0 & 0x100000000000L) != 0L) { - jjmatchedKind = 43; + jjmatchedKind = 44; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x500000000800000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1400000002000000L, active1, 0L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x1000600000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4001800000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x2L) != 0L) + if ((active1 & 0x8L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 67; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x920000000000L, active1, 0x4L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1280000000000L, active1, 0x10L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x8008000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0x2L, active2, 0L); case 87: case 119: - if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_1(2, 45, 14); + if ((active0 & 0x400000000000L) != 0L) + return jjStartNfaWithStates_1(2, 46, 14); break; default : break; @@ -872,67 +836,67 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x8800800000L, active1, 0x1L); + return jjMoveStringLiteralDfa4_1(active0, 0x20006000000L, active1, 0x4L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x8000000040000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x200000000L, active1, 0x2L); case 67: case 99: - return jjMoveStringLiteralDfa4_1(active0, 0x40000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x100000L, active1, 0L); case 69: case 101: - if ((active0 & 0x400000L) != 0L) + if ((active0 & 0x1000000L) != 0L) { - jjmatchedKind = 22; + jjmatchedKind = 24; jjmatchedPos = 3; } - else if ((active0 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_1(3, 36, 14); - else if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 51, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x901020000200000L, active1, 0x4L); + else if ((active0 & 0x4000000000L) != 0L) + return jjStartNfaWithStates_1(3, 38, 14); + else if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 52, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x2402080000800000L, active1, 0x10L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x440000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1100000000000000L, active1, 0L); case 76: case 108: - if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_1(3, 46, 14); - else if ((active0 & 0x1000000000000000L) != 0L) + if ((active0 & 0x800000000000L) != 0L) + return jjStartNfaWithStates_1(3, 47, 14); + else if ((active0 & 0x4000000000000000L) != 0L) { - jjmatchedKind = 60; + jjmatchedKind = 62; jjmatchedPos = 3; } - else if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 62, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x2010000014000000L, active1, 0L); + else if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(3, 64, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x80400000a0000000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x1000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x8000000L, active1, 0L); case 79: case 111: - if ((active0 & 0x2000000L) != 0L) - return jjStartNfaWithStates_1(3, 25, 14); - else if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_1(3, 44, 14); + if ((active0 & 0x10000000L) != 0L) + return jjStartNfaWithStates_1(3, 28, 14); + else if ((active0 & 0x200000000000L) != 0L) + return jjStartNfaWithStates_1(3, 45, 14); break; case 83: case 115: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 50, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x42000020000L, active1, 0L); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 51, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x20008000080000L, active1, 0L); case 84: case 116: - return jjMoveStringLiteralDfa4_1(active0, 0x2004080000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x4010400000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x800028000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000140000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x80000000000000L, active1, 0L); default : break; } @@ -951,71 +915,71 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x100000040000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x400000200000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x802000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x2004000000000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_1(4, 42, 14); - else if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 52, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 53, 14); + else if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 54, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000000L, active1, 0L); case 70: case 102: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 54, 14); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 56, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x80000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x40a8200000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x10540800000L, active1, 0L); case 75: case 107: - if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_1(4, 35, 14); + if ((active0 & 0x4000000L) != 0L) + return jjStartNfaWithStates_1(4, 26, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x400020000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x1000080000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 48, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x800000000000L, active1, 0L); + if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 49, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000L, active1, 0L); case 83: case 115: - if ((active0 & 0x20000L) != 0L) - return jjStartNfaWithStates_1(4, 17, 14); + if ((active0 & 0x80000L) != 0L) + return jjStartNfaWithStates_1(4, 19, 14); break; case 84: case 116: - if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_1(4, 24, 14); - else if ((active0 & 0x2000000000L) != 0L) - return jjStartNfaWithStates_1(4, 37, 14); - else if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(4, 64, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x40000L, active1, 0L); + if ((active0 & 0x8000000L) != 0L) + return jjStartNfaWithStates_1(4, 27, 14); + else if ((active0 & 0x8000000000L) != 0L) + return jjStartNfaWithStates_1(4, 39, 14); + else if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_1(4, 66, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x100000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x8014000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x200a0000000L, active1, 0L); case 89: case 121: - if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_1(4, 23, 14); + if ((active0 & 0x2000000L) != 0L) + return jjStartNfaWithStates_1(4, 25, 14); break; default : break; @@ -1035,57 +999,57 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000000L, active1, 0L); case 67: case 99: - if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_1(5, 31, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x100000000000000L, active1, 0L); + if ((active0 & 0x400000000L) != 0L) + return jjStartNfaWithStates_1(5, 34, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x400000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x20014000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x800a0000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 63, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x4L); + if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_1(5, 65, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x10L); case 70: case 102: - if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_1(5, 21, 14); + if ((active0 & 0x800000L) != 0L) + return jjStartNfaWithStates_1(5, 23, 14); break; case 71: case 103: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 58, 14); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 60, 14); break; case 72: case 104: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 49, 14); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 50, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x20000000040000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x80000000100000L, active1, 0L); case 76: case 108: - if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_1(5, 30, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x8000000000L, active1, 0L); + if ((active0 & 0x200000000L) != 0L) + return jjStartNfaWithStates_1(5, 33, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x20000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_1(5, 47, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L, active1, 0L); + if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 48, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x10000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 55, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x28000000L, active1, 0L); + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 57, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x140000000L, active1, 0L); case 84: case 116: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 59, 14); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 61, 14); break; default : break; @@ -1105,51 +1069,51 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long { case 69: case 101: - if ((active0 & 0x4000000L) != 0L) + if ((active0 & 0x20000000L) != 0L) { - jjmatchedKind = 26; + jjmatchedKind = 29; jjmatchedPos = 6; } - else if ((active0 & 0x8000000L) != 0L) + else if ((active0 & 0x40000000L) != 0L) { - jjmatchedKind = 27; + jjmatchedKind = 30; jjmatchedPos = 6; } - return jjMoveStringLiteralDfa7_1(active0, 0x30000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x180000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 56, 14); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 58, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x80000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 61, 14); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 63, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa7_1(active0, 0x40000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x100000L, active1, 0L); case 82: case 114: - if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(6, 66, 14); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(6, 68, 14); break; case 83: case 115: - if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_1(6, 41, 14); + if ((active0 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_1(6, 43, 14); break; case 84: case 116: - if ((active0 & 0x8000000000L) != 0L) - return jjStartNfaWithStates_1(6, 39, 14); + if ((active0 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_1(6, 41, 14); break; case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x4000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x10000000000L, active1, 0L); default : break; } @@ -1167,18 +1131,18 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long switch(curChar) { case 95: - return jjMoveStringLiteralDfa8_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x180000000L); case 69: case 101: - if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_1(7, 38, 14); - else if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_1(7, 53, 14); + if ((active0 & 0x10000000000L) != 0L) + return jjStartNfaWithStates_1(7, 40, 14); + else if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 55, 14); break; case 78: case 110: - if ((active0 & 0x40000L) != 0L) - return jjStartNfaWithStates_1(7, 18, 14); + if ((active0 & 0x100000L) != 0L) + return jjStartNfaWithStates_1(7, 20, 14); break; default : break; @@ -1198,7 +1162,7 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) { case 79: case 111: - return jjMoveStringLiteralDfa9_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa9_1(active0, 0x180000000L); default : break; } @@ -1217,7 +1181,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) { case 78: case 110: - return jjMoveStringLiteralDfa10_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa10_1(active0, 0x180000000L); default : break; } @@ -1236,7 +1200,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) { case 67: case 99: - return jjMoveStringLiteralDfa11_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa11_1(active0, 0x180000000L); default : break; } @@ -1255,10 +1219,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0) { case 69: case 101: - if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_1(11, 28, 14); - else if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_1(11, 29, 14); + if ((active0 & 0x80000000L) != 0L) + return jjStartNfaWithStates_1(11, 31, 14); + else if ((active0 & 0x100000000L) != 0L) + return jjStartNfaWithStates_1(11, 32, 14); break; default : break; @@ -1289,11 +1253,11 @@ static private final int jjMoveNfa_1(int startState, int curPos) { case 3: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(2, 8); + jjCheckNAddStates(0, 6); else if (curChar == 39) - jjCheckNAddStates(9, 14); + jjCheckNAddStates(7, 12); else if (curChar == 34) - jjCheckNAddStates(15, 20); + jjCheckNAddStates(13, 18); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1302,15 +1266,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 69) - kind = 69; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 69) - kind = 69; - jjCheckNAddStates(21, 23); + if (kind > 71) + kind = 71; + jjCheckNAddStates(19, 21); } break; case 0: @@ -1318,8 +1282,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if ((0xffff7fffffffffffL & l) != 0L && kind > 10) - kind = 10; + if ((0xffff7fffffffffffL & l) != 0L && kind > 12) + kind = 12; break; case 2: if (curChar == 42) @@ -1328,15 +1292,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1346,9 +1310,9 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; - jjCheckNAddStates(24, 26); + if (kind > 75) + kind = 75; + jjCheckNAddStates(22, 24); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1357,15 +1321,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 79) - kind = 79; + if (kind > 81) + kind = 81; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1375,13 +1339,13 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 134) - kind = 134; + if (kind > 136) + kind = 136; jjstateSet[jjnewStateCnt++] = 17; break; case 18: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(2, 8); + jjCheckNAddStates(0, 6); break; case 19: if ((0x3ff000000000000L & l) != 0L) @@ -1390,16 +1354,16 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 73) - kind = 73; - jjCheckNAddStates(27, 29); + if (kind > 75) + kind = 75; + jjCheckNAddStates(25, 27); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; - jjCheckNAddStates(27, 29); + if (kind > 75) + kind = 75; + jjCheckNAddStates(25, 27); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1408,8 +1372,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1423,13 +1387,13 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 73) - kind = 73; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(28, 12); break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(30, 32); + jjCheckNAddStates(28, 30); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1442,85 +1406,85 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 69) - kind = 69; - jjCheckNAddStates(21, 23); + if (kind > 71) + kind = 71; + jjCheckNAddStates(19, 21); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(36, 6); break; case 37: if (curChar == 34) - jjCheckNAddStates(15, 20); + jjCheckNAddStates(13, 18); break; case 38: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(33, 35); + jjCheckNAddStates(31, 33); break; case 39: if (curChar == 34) - jjCheckNAddStates(33, 35); + jjCheckNAddStates(31, 33); break; case 41: - if (curChar == 34 && kind > 75) - kind = 75; + if (curChar == 34 && kind > 77) + kind = 77; break; case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(36, 38); + jjCheckNAddStates(34, 36); break; case 43: if (curChar == 34) - jjCheckNAddStates(36, 38); + jjCheckNAddStates(34, 36); break; case 45: - if (curChar == 34 && kind > 76) - kind = 76; + if (curChar == 34 && kind > 78) + kind = 78; break; case 46: if (curChar == 39) - jjCheckNAddStates(9, 14); + jjCheckNAddStates(7, 12); break; case 47: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(39, 41); + jjCheckNAddStates(37, 39); break; case 48: if (curChar == 39) - jjCheckNAddStates(39, 41); + jjCheckNAddStates(37, 39); break; case 50: - if (curChar == 39 && kind > 75) - kind = 75; + if (curChar == 39 && kind > 77) + kind = 77; break; case 51: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(42, 44); + jjCheckNAddStates(40, 42); break; case 52: if (curChar == 39) - jjCheckNAddStates(42, 44); + jjCheckNAddStates(40, 42); break; case 54: - if (curChar == 39 && kind > 77) - kind = 77; + if (curChar == 39 && kind > 79) + kind = 79; break; case 56: - jjAddStates(45, 47); + jjAddStates(43, 45); break; case 60: - jjAddStates(48, 50); + jjAddStates(46, 48); break; default : break; } @@ -1536,56 +1500,56 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 79) - kind = 79; + if (kind > 81) + kind = 81; jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(51, 56); + jjCheckNAddStates(49, 54); break; case 1: - if (kind > 10) - kind = 10; + if (kind > 12) + kind = 12; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 69) - kind = 69; + if ((0x100000001000L & l) != 0L && kind > 71) + kind = 71; break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(57, 58); + jjAddStates(55, 56); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 73) - kind = 73; + if ((0x5000000050L & l) != 0L && kind > 75) + kind = 75; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 79) - kind = 79; + if (kind > 81) + kind = 81; jjCheckNAdd(14); break; case 16: case 17: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 134) - kind = 134; + if (kind > 136) + kind = 136; jjCheckNAdd(17); break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(59, 60); + jjAddStates(57, 58); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(61, 62); + jjAddStates(59, 60); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(63, 64); + jjAddStates(61, 62); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1594,33 +1558,33 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 69) - kind = 69; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(33, 35); + jjAddStates(31, 33); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; case 42: - jjAddStates(36, 38); + jjAddStates(34, 36); break; case 44: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 43; break; case 47: - jjAddStates(39, 41); + jjAddStates(37, 39); break; case 49: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 48; break; case 51: - jjAddStates(42, 44); + jjAddStates(40, 42); break; case 53: if (curChar == 92) @@ -1628,39 +1592,39 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 55: if (curChar == 96) - jjCheckNAddStates(51, 56); + jjCheckNAddStates(49, 54); break; case 56: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(45, 47); + jjCheckNAddStates(43, 45); break; case 57: if (curChar == 96) - jjCheckNAddStates(45, 47); + jjCheckNAddStates(43, 45); break; case 58: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 57; break; case 59: - if (curChar == 96 && kind > 75) - kind = 75; + if (curChar == 96 && kind > 77) + kind = 77; break; case 60: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(48, 50); + jjCheckNAddStates(46, 48); break; case 61: if (curChar == 96) - jjCheckNAddStates(48, 50); + jjCheckNAddStates(46, 48); break; case 62: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 61; break; case 63: - if (curChar == 96 && kind > 78) - kind = 78; + if (curChar == 96 && kind > 80) + kind = 80; break; default : break; } @@ -1678,45 +1642,45 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 79) - kind = 79; + if (kind > 81) + kind = 81; jjCheckNAdd(14); break; case 1: - if ((jjbitVec0[i2] & l2) != 0L && kind > 10) - kind = 10; + if ((jjbitVec0[i2] & l2) != 0L && kind > 12) + kind = 12; break; case 16: case 17: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 134) - kind = 134; + if (kind > 136) + kind = 136; jjCheckNAdd(17); break; case 38: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(33, 35); + jjAddStates(31, 33); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(36, 38); + jjAddStates(34, 36); break; case 47: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(39, 41); + jjAddStates(37, 39); break; case 51: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(42, 44); + jjAddStates(40, 42); break; case 56: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(45, 47); + jjAddStates(43, 45); break; case 60: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(48, 50); + jjAddStates(46, 48); break; default : break; } @@ -1740,7 +1704,7 @@ static private final int jjMoveStringLiteralDfa0_3() switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_3(0x4000L); + return jjMoveStringLiteralDfa1_3(0x10000L); default : return 1; } @@ -1754,8 +1718,8 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) switch(curChar) { case 47: - if ((active0 & 0x4000L) != 0L) - return jjStopAtPos(1, 14); + if ((active0 & 0x10000L) != 0L) + return jjStopAtPos(1, 16); break; default : return 2; @@ -1763,25 +1727,25 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) return 2; } static final int[] jjnextStates = { - 4, 5, 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, - 40, 41, 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, - 12, 38, 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, - 60, 62, 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, - 32, + 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, 40, 41, + 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, + 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, 60, 62, + 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, 32, }; public static final String[] jjstrLiteralImages = { -"", null, "\77\76", null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, null, +"", "\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, "\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, null, null, -null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", "\56", -"\100", "\44", "\75", "\76", "\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", -"\41\75", "\74\76", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", -"\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", "\53\75", -"\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", -"\74\74\75", "\76\76\75", "\41\75\75", "\75\75\75", "\176\75", null, "\77\76", }; +null, null, null, null, null, null, "\50", "\51", "\173", "\175", "\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, +"\77\76", }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", @@ -1790,24 +1754,24 @@ public static final String[] lexStateNames = { "IN_MULTI_LINE_COMMENT", }; public static final int[] jjnewLexState = { - -1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 3, 4, 1, 0, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 3, 4, 1, 0, 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, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffffffffffe2007L, 0xfffffffffff8fa3fL, 0xffL, + 0xfffffffffff8001fL, 0xffffffffffe3e8ffL, 0x3ffL, }; static final long[] jjtoSkip = { - 0xd1f8L, 0x0L, 0x0L, + 0x3ffe0L, 0x0L, 0x0L, }; static final long[] jjtoSpecial = { - 0xd000L, 0x0L, 0x0L, + 0x3f800L, 0x0L, 0x0L, }; static final long[] jjtoMore = { - 0x10e00L, 0x0L, 0x0L, + 0x40000L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; static private final int[] jjrounds = new int[64]; @@ -1906,9 +1870,9 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); - if (jjmatchedPos == 0 && jjmatchedKind > 3) + if (jjmatchedPos == 0 && jjmatchedKind > 5) { - jjmatchedKind = 3; + jjmatchedKind = 5; } break; case 1: @@ -1925,27 +1889,27 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - if (jjmatchedPos == 0 && jjmatchedKind > 16) + if (jjmatchedPos == 0 && jjmatchedKind > 18) { - jjmatchedKind = 16; + jjmatchedKind = 18; } break; case 3: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_3(); - if (jjmatchedPos == 0 && jjmatchedKind > 16) + if (jjmatchedPos == 0 && jjmatchedKind > 18) { - jjmatchedKind = 16; + jjmatchedKind = 18; } break; case 4: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_4(); - if (jjmatchedPos == 0 && jjmatchedKind > 16) + if (jjmatchedPos == 0 && jjmatchedKind > 18) { - jjmatchedKind = 16; + jjmatchedKind = 18; } break; } @@ -1981,7 +1945,7 @@ public static Token getNextToken() curLexState = jjnewLexState[jjmatchedKind]; continue EOFLoop; } - MoreLexicalActions(); + jjimageLen += jjmatchedPos + 1; if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind]; curPos = 0; @@ -2020,24 +1984,14 @@ static void SkipLexicalActions(Token matchedToken) { switch(jjmatchedKind) { - default : - break; - } -} -static void MoreLexicalActions() -{ - jjimageLen += (lengthOfMatch = jjmatchedPos + 1); - switch(jjmatchedKind) - { - case 10 : + case 12 : if (image == null) - image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen))); + image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); else - image.append(new String(input_stream.GetSuffix(jjimageLen))); - jjimageLen = 0; + image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); input_stream.backup(1); break; - default : + default : break; } }