X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index bd8c4a3..13544ce 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -30,6 +30,10 @@ import net.sourceforge.phpdt.internal.corext.Assert; */ public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants { +//todo : fix the variables names bug +//todo : handle tilde operator + + /** The current segment. */ private static OutlineableWithChildren currentSegment; @@ -60,7 +64,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** The cursor in expression stack. */ private static int nodePtr; - private static final boolean PARSER_DEBUG = false; + public static final boolean PARSER_DEBUG = false; public final void setFileToParse(final IFile fileToParse) { PHPParser.fileToParse = fileToParse; @@ -163,6 +167,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon return outlineInfo; } + /** + * This function will throw the exception if we are in debug mode + * and process it if we are in production mode. + * this should be fast since the PARSER_DEBUG is static final so the difference will be at compile time + * @param e the exception + * @throws ParseException the thrown exception + */ private static void processParseExceptionDebug(final ParseException e) throws ParseException { if (PARSER_DEBUG) { throw e; @@ -198,14 +209,14 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon e.currentToken.sourceStart, e.currentToken.sourceEnd, errorLevel, - "Line " + e.currentToken.beginLine); + "Line " + e.currentToken.beginLine+", "+e.currentToken.sourceStart+":"+e.currentToken.sourceEnd); } else { setMarker(fileToParse, errorMessage, errorStart, errorEnd, errorLevel, - "Line " + e.currentToken.beginLine); + "Line " + e.currentToken.beginLine+", "+errorStart+":"+errorEnd); errorStart = -1; errorEnd = -1; } @@ -295,8 +306,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * Put a new html block in the stack. */ public static final void createNewHTMLCode() { - final int currentPosition = SimpleCharStream.getPosition(); - if (currentPosition == htmlStart || currentPosition > SimpleCharStream.currentBuffer.length()) { + final int currentPosition = token.sourceStart; + if (currentPosition == htmlStart || + currentPosition > SimpleCharStream.currentBuffer.length()) { return; } final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray(); @@ -305,19 +317,20 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** Create a new task. */ public static final void createNewTask() { - final int currentPosition = SimpleCharStream.getPosition(); + final int currentPosition = token.sourceStart; final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3, SimpleCharStream.currentBuffer.indexOf("\n", currentPosition)-1); - PHPeclipsePlugin.log(1,SimpleCharStream.currentBuffer.toString()); - try { - setMarker(fileToParse, - todo, - SimpleCharStream.getBeginLine(), - TASK, - "Line "+SimpleCharStream.getBeginLine()); - } catch (CoreException e) { - PHPeclipsePlugin.log(e); + if (!PARSER_DEBUG) { + try { + setMarker(fileToParse, + todo, + SimpleCharStream.getBeginLine(), + TASK, + "Line "+SimpleCharStream.getBeginLine()); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } } } @@ -392,8 +405,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon PHPParser.createNewHTMLCode(); } catch (TokenMgrError e) { PHPeclipsePlugin.log(e); - errorStart = SimpleCharStream.getPosition(); - errorEnd = errorStart + 1; + errorStart = SimpleCharStream.beginOffset; + errorEnd = SimpleCharStream.endOffset; errorMessage = e.getMessage(); errorLevel = ERROR; {if (true) throw generateParseException();} @@ -406,8 +419,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * or */ static final public void PhpBlock() throws ParseException { - final int start = SimpleCharStream.getPosition(); final PHPEchoBlock phpEchoBlock; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPECHOSTART: phpEchoBlock = phpEchoBlock(); @@ -466,12 +479,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_consume_token(PHPSTARTLONG); break; case PHPSTARTSHORT: - jj_consume_token(PHPSTARTSHORT); + token = jj_consume_token(PHPSTARTSHORT); try { setMarker(fileToParse, "You should use ' @@ -928,12 +944,12 @@ Variable Variable(): ; } if (variable == null) { - {if (true) return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd);} + {if (true) return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);} } final StringBuffer buff = new StringBuffer(); buff.append(token.image.substring(1)); buff.append(variable.toStringExpression()); - {if (true) return new Variable(buff.toString(),token.sourceStart,variable.sourceEnd);} + {if (true) return new Variable(buff.toString(),token.sourceStart+1,variable.sourceEnd+1);} break; case DOLLAR: token = jj_consume_token(DOLLAR); @@ -967,7 +983,7 @@ Variable Variable(): ; } if (variable == null) { - {if (true) return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd);} + {if (true) return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);} } final StringBuffer buff = new StringBuffer(); buff.append(token.image.substring(1)); @@ -1004,11 +1020,9 @@ Variable Variable(): static final public ConstantIdentifier VariableName() throws ParseException { final StringBuffer buff; String expr; - final Variable var; Expression expression = null; final Token token; Token token2 = null; - int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: token = jj_consume_token(LBRACE); @@ -1019,7 +1033,6 @@ Variable Variable(): buff.append("{"); buff.append(expr); buff.append("}"); - pos = SimpleCharStream.getPosition(); expr = buff.toString(); {if (true) return new ConstantIdentifier(expr, token.sourceStart, @@ -1215,7 +1228,7 @@ final Expression expr,expr2; token = jj_consume_token(FUNCTION); try { functionDeclaration = MethodDeclarator(token.sourceStart); - outlineInfo.addVariable(new String(functionDeclaration.name)); + outlineInfo.addVariable(functionDeclaration.name); } catch (ParseException e) { if (errorMessage != null) {if (true) throw e;} errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; @@ -1242,10 +1255,11 @@ final Expression expr,expr2; Token reference = null; final Hashtable formalParameters = new Hashtable(); String identifierChar = SYNTAX_ERROR_CHAR; - final int end; + int end = start; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: reference = jj_consume_token(BIT_AND); + end = reference.sourceEnd; break; default: jj_la1[25] = jj_gen; @@ -1253,12 +1267,13 @@ final Expression expr,expr2; } try { identifier = jj_consume_token(IDENTIFIER); - identifierChar = identifier.image; + identifierChar = identifier.image; + end = identifier.sourceEnd; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceEnd; + errorEnd = e.currentToken.next.sourceStart; processParseExceptionDebug(e); } end = FormalParameters(formalParameters); @@ -1293,21 +1308,23 @@ final Expression expr,expr2; static final public int FormalParameters(final Hashtable parameters) throws ParseException { VariableDeclaration var; final Token token; - int end; + Token tok = PHPParser.token; + int end = tok.sourceEnd; try { - jj_consume_token(LPAREN); + tok = jj_consume_token(LPAREN); + end = tok.sourceEnd; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.next.sourceStart; + errorEnd = e.currentToken.next.sourceEnd; processParseExceptionDebug(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: case DOLLAR_ID: var = FormalParameter(); - parameters.put(new String(var.name()),var); + parameters.put(var.name(),var);end = var.sourceEnd; label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1320,7 +1337,7 @@ final Expression expr,expr2; } jj_consume_token(COMMA); var = FormalParameter(); - parameters.put(new String(var.name()),var); + parameters.put(var.name(),var);end = var.sourceEnd; } break; default: @@ -1333,10 +1350,9 @@ final Expression expr,expr2; } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.next.sourceStart; + errorEnd = e.currentToken.next.sourceEnd; processParseExceptionDebug(e); - end = e.currentToken.sourceStart; } {if (true) return end;} throw new Error("Missing return statement in function"); @@ -1788,6 +1804,7 @@ final Expression expr,expr2; static final public Expression EqualityExpression() throws ParseException { Expression expr,expr2; int operator; + Token token; expr = RelationalExpression(); label_14: while (true) { @@ -1805,24 +1822,24 @@ final Expression expr,expr2; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EQUAL_EQUAL: - jj_consume_token(EQUAL_EQUAL); - operator = OperatorIds.EQUAL_EQUAL; + token = jj_consume_token(EQUAL_EQUAL); + operator = OperatorIds.EQUAL_EQUAL; break; case DIF: - jj_consume_token(DIF); - operator = OperatorIds.DIF; + token = jj_consume_token(DIF); + operator = OperatorIds.DIF; break; case NOT_EQUAL: - jj_consume_token(NOT_EQUAL); - operator = OperatorIds.DIF; + token = jj_consume_token(NOT_EQUAL); + operator = OperatorIds.DIF; break; case BANGDOUBLEEQUAL: - jj_consume_token(BANGDOUBLEEQUAL); - operator = OperatorIds.BANG_EQUAL_EQUAL; + token = jj_consume_token(BANGDOUBLEEQUAL); + operator = OperatorIds.BANG_EQUAL_EQUAL; break; case TRIPLEEQUAL: - jj_consume_token(TRIPLEEQUAL); - operator = OperatorIds.EQUAL_EQUAL_EQUAL; + token = jj_consume_token(TRIPLEEQUAL); + operator = OperatorIds.EQUAL_EQUAL_EQUAL; break; default: jj_la1[45] = jj_gen; @@ -1837,9 +1854,10 @@ final Expression expr,expr2; } errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = token.sourceEnd +1; + errorEnd = token.sourceEnd +1; + expr2 = new ConstantIdentifier(SYNTAX_ERROR_CHAR,token.sourceEnd +1,token.sourceEnd +1); + processParseExceptionDebug(e); } expr = new BinaryExpression(expr,expr2,operator); } @@ -1979,8 +1997,8 @@ final Expression expr,expr2; if (errorMessage != null) {if (true) throw e;} errorMessage = "unexpected token '"+e.currentToken.next.image+"'"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = PHPParser.token.sourceStart; + errorEnd = PHPParser.token.sourceEnd; {if (true) throw e;} } label_18: @@ -2182,9 +2200,9 @@ final Token token; } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = expr.sourceEnd +1; + errorEnd = expr.sourceEnd +1; + processParseExceptionDebug(e); } {if (true) return expr;} break; @@ -2264,7 +2282,7 @@ final Token token,token1; } static final public Expression PrimaryExpression() throws ParseException { - Expression expr = null; + Expression expr; Token token = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case NEW: @@ -2296,11 +2314,9 @@ final Token token,token1; } static final public Expression refPrimaryExpression(final Token reference) throws ParseException { - Expression expr = null; + Expression expr; Expression expr2 = null; - int assignOperator = -1; final Token identifier; - final String var; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: identifier = jj_consume_token(IDENTIFIER); @@ -2395,14 +2411,15 @@ final Token token,token1; final Token token; token = jj_consume_token(ARRAY); vars = ArrayInitializer(); - {if (true) return new ArrayInitializer(vars,token.sourceStart,SimpleCharStream.getPosition());} + {if (true) return new ArrayInitializer(vars, + token.sourceStart, + PHPParser.token.sourceEnd);} throw new Error("Missing return statement in function"); } static final public Expression ClassIdentifier() throws ParseException { final Expression expr; final Token token; - final ConstantIdentifier type; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: token = jj_consume_token(IDENTIFIER); @@ -2437,27 +2454,42 @@ final Token token,token1; * Used by Variabledeclaratorid and primarysuffix */ static final public AbstractVariable VariableSuffix(final AbstractVariable prefix) throws ParseException { - Variable expr = null; - final int pos = SimpleCharStream.getPosition(); Expression expression = null; + final Token classAccessToken; + Token token; + int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CLASSACCESS: - jj_consume_token(CLASSACCESS); + classAccessToken = jj_consume_token(CLASSACCESS); try { - expression = VariableName(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + case LBRACE: + expression = VariableName(); + break; + case DOLLAR: + case DOLLAR_ID: + expression = Variable(); + break; + default: + jj_la1[69] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = classAccessToken.sourceEnd +1; + errorEnd = classAccessToken.sourceEnd +1; + processParseExceptionDebug(e); } {if (true) return new ClassAccess(prefix, expression, ClassAccess.NORMAL);} break; case LBRACKET: - jj_consume_token(LBRACKET); + token = jj_consume_token(LBRACKET); + pos = token.sourceEnd+1; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -2512,6 +2544,7 @@ final Token token,token1; case LPAREN: case DOLLAR_ID: expression = Expression(); + pos = expression.sourceEnd+1; break; case STRING: case OBJECT: @@ -2523,30 +2556,32 @@ final Token token,token1; case INT: case INTEGER: expression = Type(); + pos = expression.sourceEnd+1; break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[70] = jj_gen; + jj_la1[71] = jj_gen; ; } try { - jj_consume_token(RBRACKET); + token = jj_consume_token(RBRACKET); + pos = token.sourceEnd; } catch (ParseException e) { errorMessage = "']' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } - {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());} + {if (true) return new ArrayDeclarator(prefix,expression,pos);} break; default: - jj_la1[71] = jj_gen; + jj_la1[72] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2581,7 +2616,7 @@ final Token token,token1; {if (true) return new NullLiteral(token);} break; default: - jj_la1[72] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2617,19 +2652,20 @@ final Token token; args = ArgumentList(); break; default: - jj_la1[73] = jj_gen; + jj_la1[74] = jj_gen; ; } try { token = jj_consume_token(RPAREN); + {if (true) return new FunctionCall(func,args,token.sourceEnd);} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = args[args.length-1].sourceEnd+1; + errorEnd = args[args.length-1].sourceEnd+1; + processParseExceptionDebug(e); } - {if (true) return new FunctionCall(func,args,token.sourceEnd);} + {if (true) return new FunctionCall(func,args,args[args.length-1].sourceEnd);} throw new Error("Missing return statement in function"); } @@ -2641,8 +2677,10 @@ final Token token; static final public Expression[] ArgumentList() throws ParseException { Expression arg; final ArrayList list = new ArrayList(); +int pos; +Token token; arg = Expression(); - list.add(arg); + list.add(arg);pos = arg.sourceEnd; label_20: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2650,19 +2688,21 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[74] = jj_gen; + jj_la1[75] = jj_gen; break label_20; } - jj_consume_token(COMMA); + token = jj_consume_token(COMMA); + pos = token.sourceEnd; try { arg = Expression(); list.add(arg); + pos = arg.sourceEnd; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos+1; + errorEnd = pos+1; + processParseException(e); } } final Expression[] arguments = new Expression[list.size()]; @@ -2741,7 +2781,7 @@ final ArrayList list = new ArrayList(); token = jj_consume_token(AT); break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; ; } statement = IncludeStatement(); @@ -2764,7 +2804,7 @@ final ArrayList list = new ArrayList(); currentSegment.add((Outlineable)statement);{if (true) return statement;} break; default: - jj_la1[76] = jj_gen; + jj_la1[77] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2788,9 +2828,9 @@ final ArrayList list = new ArrayList(); if (e.currentToken.next.kind != PHPParserConstants.PHPEND) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = statement.sourceEnd+1; + errorEnd = statement.sourceEnd+1; + processParseExceptionDebug(e); } } {if (true) return statement;} @@ -2798,59 +2838,69 @@ final ArrayList list = new ArrayList(); } static final public Define defineStatement() throws ParseException { - final int start = SimpleCharStream.getPosition(); Expression defineName,defineValue; - jj_consume_token(DEFINE); + final Token defineToken; + Token token; + int pos; + defineToken = jj_consume_token(DEFINE); + pos = defineToken.sourceEnd+1; try { - jj_consume_token(LPAREN); + token = jj_consume_token(LPAREN); + pos = token.sourceEnd+1; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = pos; + errorEnd = pos; processParseExceptionDebug(e); } try { defineName = Expression(); + pos = defineName.sourceEnd+1; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + defineName = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos); } try { - jj_consume_token(COMMA); + token = jj_consume_token(COMMA); + pos = defineName.sourceEnd+1; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = pos; + errorEnd = pos; processParseExceptionDebug(e); } try { defineValue = Expression(); + pos = defineValue.sourceEnd+1; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + defineValue = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos); } try { - jj_consume_token(RPAREN); + token = jj_consume_token(RPAREN); + pos = token.sourceEnd+1; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = pos; + errorEnd = pos; processParseExceptionDebug(e); } {if (true) return new Define(currentSegment, defineName, defineValue, - start, - SimpleCharStream.getPosition());} + defineToken.sourceStart, + pos);} throw new Error("Missing return statement in function"); } @@ -2907,7 +2957,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2929,7 +2979,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; break label_21; } phpEchoBlock(); @@ -2943,7 +2993,7 @@ final ArrayList list = new ArrayList(); jj_consume_token(PHPSTARTSHORT); break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2966,43 +3016,46 @@ final ArrayList list = new ArrayList(); * An include statement. It's "include" an expression; */ static final public InclusionStatement IncludeStatement() throws ParseException { - final Expression expr; + Expression expr; final int keyword; final InclusionStatement inclusionStatement; final Token token, token2; + int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case REQUIRE: token = jj_consume_token(REQUIRE); - keyword = InclusionStatement.REQUIRE; + keyword = InclusionStatement.REQUIRE;pos=token.sourceEnd; break; case REQUIRE_ONCE: token = jj_consume_token(REQUIRE_ONCE); - keyword = InclusionStatement.REQUIRE_ONCE; + keyword = InclusionStatement.REQUIRE_ONCE;pos=token.sourceEnd; break; case INCLUDE: token = jj_consume_token(INCLUDE); - keyword = InclusionStatement.INCLUDE; + keyword = InclusionStatement.INCLUDE;pos=token.sourceEnd; break; case INCLUDE_ONCE: token = jj_consume_token(INCLUDE_ONCE); - keyword = InclusionStatement.INCLUDE_ONCE; + keyword = InclusionStatement.INCLUDE_ONCE;pos=token.sourceEnd; break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } try { expr = Expression(); + pos=expr.sourceEnd; } catch (ParseException e) { if (errorMessage != null) { {if (true) throw e;} } errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos+1; + errorEnd = pos+1; + expr = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos); + processParseExceptionDebug(e); } inclusionStatement = new InclusionStatement(currentSegment, keyword, @@ -3025,10 +3078,10 @@ final ArrayList list = new ArrayList(); static final public PrintExpression PrintExpression() throws ParseException { final Expression expr; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(PRINT); + final Token printToken; + token = jj_consume_token(PRINT); expr = Expression(); - {if (true) return new PrintExpression(expr,pos,SimpleCharStream.getPosition());} + {if (true) return new PrintExpression(expr,token.sourceStart,expr.sourceEnd);} throw new Error("Missing return statement in function"); } @@ -3036,25 +3089,29 @@ final ArrayList list = new ArrayList(); Expression expr = null; final Expression expression; final ArrayList list = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(LIST); + int pos; + final Token listToken, rParen; + Token token; + listToken = jj_consume_token(LIST); + pos = listToken.sourceEnd; try { - jj_consume_token(LPAREN); + token = jj_consume_token(LPAREN); + pos = token.sourceEnd; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = listToken.sourceEnd+1; + errorEnd = listToken.sourceEnd+1; + processParseExceptionDebug(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR: case DOLLAR_ID: expr = VariableDeclaratorId(); - list.add(expr); + list.add(expr);pos = expr.sourceEnd; break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; ; } if (expr == null) list.add(null); @@ -3065,56 +3122,58 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; break label_22; } try { - jj_consume_token(COMMA); + token = jj_consume_token(COMMA); + pos = token.sourceEnd; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR: case DOLLAR_ID: expr = VariableDeclaratorId(); - list.add(expr); + list.add(expr);pos = expr.sourceEnd; break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; ; } } try { - jj_consume_token(RPAREN); + rParen = jj_consume_token(RPAREN); + pos = rParen.sourceEnd; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); expression = Expression(); - final Variable[] vars = new Variable[list.size()]; + final AbstractVariable[] vars = new AbstractVariable[list.size()]; list.toArray(vars); {if (true) return new ListExpression(vars, expression, - pos, - SimpleCharStream.getPosition());} + listToken.sourceStart, + expression.sourceEnd);} break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; ; } - final Variable[] vars = new Variable[list.size()]; + final AbstractVariable[] vars = new AbstractVariable[list.size()]; list.toArray(vars); - {if (true) return new ListExpression(vars,pos,SimpleCharStream.getPosition());} + {if (true) return new ListExpression(vars,listToken.sourceStart,pos);} throw new Error("Missing return statement in function"); } @@ -3137,7 +3196,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; break label_23; } jj_consume_token(COMMA); @@ -3169,9 +3228,10 @@ final ArrayList list = new ArrayList(); final ArrayList vars = new ArrayList(); final GlobalStatement global; final Token token, token2; + int pos; token = jj_consume_token(GLOBAL); expr = Variable(); - vars.add(expr); + vars.add(expr);pos = expr.sourceEnd+1; label_24: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3179,30 +3239,31 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; break label_24; } jj_consume_token(COMMA); expr = Variable(); - vars.add(expr); + vars.add(expr);pos = expr.sourceEnd+1; } try { token2 = jj_consume_token(SEMICOLON); + pos = token2.sourceEnd+1; + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } final Variable[] variables = new Variable[vars.size()]; vars.toArray(variables); global = new GlobalStatement(currentSegment, variables, token.sourceStart, - token2.sourceEnd); + pos); currentSegment.add(global); {if (true) return global;} - } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; - errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} - } throw new Error("Missing return statement in function"); } @@ -3210,9 +3271,10 @@ final ArrayList list = new ArrayList(); final ArrayList vars = new ArrayList(); VariableDeclaration expr; final Token token, token2; + int pos; token = jj_consume_token(STATIC); expr = VariableDeclarator(); - vars.add(expr); + vars.add(expr);pos = expr.sourceEnd+1; label_25: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3220,27 +3282,28 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; break label_25; } jj_consume_token(COMMA); expr = VariableDeclarator(); - vars.add(expr); + vars.add(expr);pos = expr.sourceEnd+1; } try { token2 = jj_consume_token(SEMICOLON); - final VariableDeclaration[] variables = new VariableDeclaration[vars.size()]; - vars.toArray(variables); - {if (true) return new StaticStatement(variables, - token.sourceStart, - token2.sourceEnd);} + pos = token2.sourceEnd+1; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseException(e); } + final VariableDeclaration[] variables = new VariableDeclaration[vars.size()]; + vars.toArray(variables); + {if (true) return new StaticStatement(variables, + token.sourceStart, + pos);} throw new Error("Missing return statement in function"); } @@ -3265,14 +3328,18 @@ final ArrayList list = new ArrayList(); final ArrayList list = new ArrayList(); Statement statement; final Token token, token2; + int pos,start; try { token = jj_consume_token(LBRACE); + pos = token.sourceEnd+1;start=token.sourceStart; } catch (ParseException e) { errorMessage = "'{' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + pos = PHPParser.token.sourceEnd+1; + start=pos; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } label_26: while (true) { @@ -3323,7 +3390,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; break label_26; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3370,30 +3437,31 @@ final ArrayList list = new ArrayList(); case SEMICOLON: case DOLLAR_ID: statement = BlockStatement(); - list.add(statement); + list.add(statement);pos = statement.sourceEnd+1; break; case PHPEND: statement = htmlBlock(); - list.add(statement); + list.add(statement);pos = statement.sourceEnd+1; break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } try { token2 = jj_consume_token(RBRACE); + pos = token2.sourceEnd+1; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } final Statement[] statements = new Statement[list.size()]; list.toArray(statements); - {if (true) return new Block(statements,token.sourceStart,token2.sourceEnd);} + {if (true) return new Block(statements,start,pos);} throw new Error("Missing return statement in function"); } @@ -3464,7 +3532,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3530,7 +3598,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3540,10 +3608,10 @@ final ArrayList list = new ArrayList(); /** * used only by ForInit() */ - static final public VariableDeclaration[] LocalVariableDeclaration() throws ParseException { + static final public Expression[] LocalVariableDeclaration() throws ParseException { final ArrayList list = new ArrayList(); - VariableDeclaration var; - var = LocalVariableDeclarator(); + Expression var; + var = Expression(); list.add(var); label_27: while (true) { @@ -3552,16 +3620,16 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; break label_27; } jj_consume_token(COMMA); - var = LocalVariableDeclarator(); - list.add(var); + var = Expression(); + list.add(var); } - final VariableDeclaration[] vars = new VariableDeclaration[list.size()]; + final Expression[] vars = new Expression[list.size()]; list.toArray(vars); - {if (true) return vars;} + {if (true) return vars;} throw new Error("Missing return statement in function"); } @@ -3578,7 +3646,7 @@ final ArrayList list = new ArrayList(); initializer = Expression(); break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; ; } if (initializer == null) { @@ -3606,8 +3674,8 @@ final ArrayList list = new ArrayList(); * used only by StatementExpressionList() which is used only by ForInit() and ForStatement() */ static final public Expression StatementExpression() throws ParseException { - final Expression expr,expr2; - final int operator; + final Expression expr; + final Token operator; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS_PLUS: case MINUS_MINUS: @@ -3626,31 +3694,31 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS_PLUS: - jj_consume_token(PLUS_PLUS); - {if (true) return new PostfixedUnaryExpression(expr, - OperatorIds.PLUS_PLUS, - SimpleCharStream.getPosition());} + operator = jj_consume_token(PLUS_PLUS); + {if (true) return new PostfixedUnaryExpression(expr, + OperatorIds.PLUS_PLUS, + operator.sourceEnd);} break; case MINUS_MINUS: - jj_consume_token(MINUS_MINUS); - {if (true) return new PostfixedUnaryExpression(expr, - OperatorIds.MINUS_MINUS, - SimpleCharStream.getPosition());} + operator = jj_consume_token(MINUS_MINUS); + {if (true) return new PostfixedUnaryExpression(expr, + OperatorIds.MINUS_MINUS, + operator.sourceEnd);} break; default: - jj_la1[94] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; ; } {if (true) return expr;} break; default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3658,60 +3726,72 @@ final ArrayList list = new ArrayList(); } static final public SwitchStatement SwitchStatement() throws ParseException { - final Expression variable; + Expression variable; final AbstractCase[] cases; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(SWITCH); + final Token switchToken,lparenToken,rparenToken; + int pos; + switchToken = jj_consume_token(SWITCH); + pos = switchToken.sourceEnd+1; try { - jj_consume_token(LPAREN); + lparenToken = jj_consume_token(LPAREN); + pos = lparenToken.sourceEnd+1; } catch (ParseException e) { errorMessage = "'(' expected after 'switch'"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } try { variable = Expression(); + pos = variable.sourceEnd+1; } catch (ParseException e) { if (errorMessage != null) { {if (true) throw e;} } errorMessage = "expression expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + variable = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos); } try { - jj_consume_token(RPAREN); + rparenToken = jj_consume_token(RPAREN); + pos = rparenToken.sourceEnd+1; } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: cases = switchStatementBrace(); break; case COLON: - cases = switchStatementColon(pos, pos + 6); + cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd); break; default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - {if (true) return new SwitchStatement(variable,cases,pos,SimpleCharStream.getPosition());} + {if (true) return new SwitchStatement(variable, + cases, + switchToken.sourceStart, + PHPParser.token.sourceEnd);} throw new Error("Missing return statement in function"); } static final public AbstractCase[] switchStatementBrace() throws ParseException { AbstractCase cas; final ArrayList cases = new ArrayList(); - jj_consume_token(LBRACE); + Token token; + int pos; + token = jj_consume_token(LBRACE); + pos = token.sourceEnd; label_28: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3720,24 +3800,25 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; break label_28; } cas = switchLabel0(); - cases.add(cas); + cases.add(cas);pos = cas.sourceEnd; } try { - jj_consume_token(RBRACE); - final AbstractCase[] abcase = new AbstractCase[cases.size()]; - cases.toArray(abcase); - {if (true) return abcase;} + token = jj_consume_token(RBRACE); + pos = token.sourceEnd; } catch (ParseException e) { errorMessage = "'}' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } + final AbstractCase[] abcase = new AbstractCase[cases.size()]; + cases.toArray(abcase); + {if (true) return abcase;} throw new Error("Missing return statement in function"); } @@ -3749,7 +3830,10 @@ final ArrayList list = new ArrayList(); static final public AbstractCase[] switchStatementColon(final int start, final int end) throws ParseException { AbstractCase cas; final ArrayList cases = new ArrayList(); - jj_consume_token(COLON); + Token token; + int pos; + token = jj_consume_token(COLON); + pos = token.sourceEnd; try { setMarker(fileToParse, "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;", @@ -3768,33 +3852,35 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; break label_29; } cas = switchLabel0(); - cases.add(cas); + cases.add(cas);pos = cas.sourceEnd; } try { - jj_consume_token(ENDSWITCH); + token = jj_consume_token(ENDSWITCH); + pos = token.sourceEnd; } catch (ParseException e) { errorMessage = "'endswitch' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } try { - jj_consume_token(SEMICOLON); - final AbstractCase[] abcase = new AbstractCase[cases.size()]; - cases.toArray(abcase); - {if (true) return abcase;} + token = jj_consume_token(SEMICOLON); + pos = token.sourceEnd; } catch (ParseException e) { errorMessage = "';' expected after 'endswitch' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } + final AbstractCase[] abcase = new AbstractCase[cases.size()]; + cases.toArray(abcase); + {if (true) return abcase;} throw new Error("Missing return statement in function"); } @@ -3802,7 +3888,7 @@ final ArrayList list = new ArrayList(); final Expression expr; Statement statement; final ArrayList stmts = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); + final Token token = PHPParser.token; expr = SwitchLabel(); label_30: while (true) { @@ -3852,7 +3938,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; break label_30; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3905,7 +3991,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[101] = jj_gen; + jj_la1[102] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3916,15 +4002,20 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[102] = jj_gen; + jj_la1[103] = jj_gen; ; } - final Statement[] stmtsArray = new Statement[stmts.size()]; - stmts.toArray(stmtsArray); - if (expr == null) {//it's a default - {if (true) return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition());} - } - {if (true) return new Case(expr,stmtsArray,pos,SimpleCharStream.getPosition());} + final int listSize = stmts.size(); + final Statement[] stmtsArray = new Statement[listSize]; + stmts.toArray(stmtsArray); + if (expr == null) {//it's a default + {if (true) return new DefaultCase(stmtsArray,token.sourceStart,stmtsArray[listSize-1].sourceEnd);} + } + if (listSize != 0) { + {if (true) return new Case(expr,stmtsArray,expr.sourceStart,stmtsArray[listSize-1].sourceEnd);} + } else { + {if (true) return new Case(expr,stmtsArray,expr.sourceStart,expr.sourceEnd);} + } throw new Error("Missing return statement in function"); } @@ -3945,19 +4036,19 @@ final ArrayList list = new ArrayList(); if (errorMessage != null) {if (true) throw e;} errorMessage = "expression expected after 'case' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = token.sourceEnd +1; + errorEnd = token.sourceEnd +1; {if (true) throw e;} } try { - jj_consume_token(COLON); + token = jj_consume_token(COLON); {if (true) return expr;} } catch (ParseException e) { errorMessage = "':' expected after case expression"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = expr.sourceEnd+1; + errorEnd = expr.sourceEnd+1; + processParseExceptionDebug(e); } break; case _DEFAULT: @@ -3968,13 +4059,13 @@ final ArrayList list = new ArrayList(); } catch (ParseException e) { errorMessage = "':' expected after 'default' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = token.sourceEnd+1; + errorEnd = token.sourceEnd+1; + processParseExceptionDebug(e); } break; default: - jj_la1[103] = jj_gen; + jj_la1[104] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3984,7 +4075,9 @@ final ArrayList list = new ArrayList(); static final public Break BreakStatement() throws ParseException { Expression expression = null; final Token token, token2; + int pos; token = jj_consume_token(BREAK); + pos = token.sourceEnd+1; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -4008,33 +4101,33 @@ final ArrayList list = new ArrayList(); case LPAREN: case DOLLAR_ID: expression = Expression(); + pos = expression.sourceEnd+1; break; default: - jj_la1[104] = jj_gen; + jj_la1[105] = jj_gen; ; } try { token2 = jj_consume_token(SEMICOLON); + pos = token2.sourceEnd; } catch (ParseException e) { errorMessage = "';' expected after 'break' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } - {if (true) return new Break(expression, token.sourceStart, token2.sourceEnd);} + {if (true) return new Break(expression, token.sourceStart, pos);} throw new Error("Missing return statement in function"); } static final public IfStatement IfStatement() throws ParseException { - final int pos = SimpleCharStream.getPosition(); final Expression condition; final IfStatement ifStatement; Token token; token = jj_consume_token(IF); condition = Condition("if"); - ifStatement = IfStatement0(condition, - token.sourceStart,token.sourceStart+2); + ifStatement = IfStatement0(condition,token.sourceStart,token.sourceEnd); {if (true) return ifStatement;} throw new Error("Missing return statement in function"); } @@ -4046,8 +4139,8 @@ final ArrayList list = new ArrayList(); } catch (ParseException e) { errorMessage = "'(' expected after " + keyword + " keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length(); - errorEnd = errorStart +1; + errorStart = PHPParser.token.sourceEnd + 1; + errorEnd = PHPParser.token.sourceEnd + 1; processParseExceptionDebug(e); } condition = Expression(); @@ -4056,8 +4149,8 @@ final ArrayList list = new ArrayList(); } catch (ParseException e) { errorMessage = "')' expected after " + keyword + " keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = condition.sourceEnd+1; + errorEnd = condition.sourceEnd+1; processParseExceptionDebug(e); } {if (true) return condition;} @@ -4126,7 +4219,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[105] = jj_gen; + jj_la1[106] = jj_gen; break label_31; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4178,7 +4271,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4191,7 +4284,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; break label_32; } elseifStatement = ElseIfStatementColon(); @@ -4202,7 +4295,7 @@ final ArrayList list = new ArrayList(); elseStatement = ElseStatementColon(); break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; ; } try { @@ -4341,7 +4434,7 @@ final ArrayList list = new ArrayList(); stmt = htmlBlock(); break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4352,7 +4445,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; break label_33; } elseifStatement = ElseIfStatement(); @@ -4377,7 +4470,7 @@ final ArrayList list = new ArrayList(); } break; default: - jj_la1[111] = jj_gen; + jj_la1[112] = jj_gen; ; } elseIfs = new ElseIf[elseIfList.size()]; @@ -4390,7 +4483,7 @@ final ArrayList list = new ArrayList(); SimpleCharStream.getPosition());} break; default: - jj_la1[112] = jj_gen; + jj_la1[113] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4401,8 +4494,8 @@ final ArrayList list = new ArrayList(); final Expression condition; Statement statement; final ArrayList list = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(ELSEIF); + final Token elseifToken; + elseifToken = jj_consume_token(ELSEIF); condition = Condition("elseif"); jj_consume_token(COLON); label_34: @@ -4452,7 +4545,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[113] = jj_gen; + jj_la1[114] = jj_gen; break label_34; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4504,22 +4597,25 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[114] = jj_gen; + jj_la1[115] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } - final Statement[] stmtsArray = new Statement[list.size()]; + final int sizeList = list.size(); + final Statement[] stmtsArray = new Statement[sizeList]; list.toArray(stmtsArray); - {if (true) return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());} + {if (true) return new ElseIf(condition,stmtsArray , + elseifToken.sourceStart, + stmtsArray[sizeList-1].sourceEnd);} throw new Error("Missing return statement in function"); } static final public Else ElseStatementColon() throws ParseException { Statement statement; final ArrayList list = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(ELSE); + final Token elseToken; + elseToken = jj_consume_token(ELSE); jj_consume_token(COLON); label_35: while (true) { @@ -4568,7 +4664,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[115] = jj_gen; + jj_la1[116] = jj_gen; break label_35; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4613,47 +4709,45 @@ final ArrayList list = new ArrayList(); case SEMICOLON: case DOLLAR_ID: statement = Statement(); - list.add(statement); + list.add(statement); break; case PHPEND: statement = htmlBlock(); list.add(statement); break; default: - jj_la1[116] = jj_gen; + jj_la1[117] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } - final Statement[] stmtsArray = new Statement[list.size()]; + final int sizeList = list.size(); + final Statement[] stmtsArray = new Statement[sizeList]; list.toArray(stmtsArray); - {if (true) return new Else(stmtsArray,pos,SimpleCharStream.getPosition());} + {if (true) return new Else(stmtsArray,elseToken.sourceStart,stmtsArray[sizeList-1].sourceEnd);} throw new Error("Missing return statement in function"); } static final public ElseIf ElseIfStatement() throws ParseException { final Expression condition; - final Statement statement; - final ArrayList list = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(ELSEIF); + //final Statement statement; + final Token elseifToken; + final Statement[] statement = new Statement[1]; + elseifToken = jj_consume_token(ELSEIF); condition = Condition("elseif"); - statement = Statement(); - list.add(statement);/*todo:do better*/ - final Statement[] stmtsArray = new Statement[list.size()]; - list.toArray(stmtsArray); - {if (true) return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());} + statement[0] = Statement(); + {if (true) return new ElseIf(condition,statement,elseifToken.sourceStart,statement[0].sourceEnd);} throw new Error("Missing return statement in function"); } static final public WhileStatement WhileStatement() throws ParseException { final Expression condition; final Statement action; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(WHILE); + final Token whileToken; + whileToken = jj_consume_token(WHILE); condition = Condition("while"); - action = WhileStatement0(pos,pos + 5); - {if (true) return new WhileStatement(condition,action,pos,SimpleCharStream.getPosition());} + action = WhileStatement0(whileToken.sourceStart,whileToken.sourceEnd); + {if (true) return new WhileStatement(condition,action,whileToken.sourceStart,action.sourceEnd);} throw new Error("Missing return statement in function"); } @@ -4710,7 +4804,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[117] = jj_gen; + jj_la1[118] = jj_gen; break label_36; } statement = Statement(); @@ -4792,7 +4886,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[118] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4802,125 +4896,157 @@ final ArrayList list = new ArrayList(); static final public DoStatement DoStatement() throws ParseException { final Statement action; final Expression condition; - final Token token, token2; + final Token token; + Token token2 = null; token = jj_consume_token(DO); action = Statement(); jj_consume_token(WHILE); condition = Condition("while"); try { token2 = jj_consume_token(SEMICOLON); - {if (true) return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = condition.sourceEnd+1; + errorEnd = condition.sourceEnd+1; + processParseExceptionDebug(e); } + if (token2 == null) { + {if (true) return new DoStatement(condition,action,token.sourceStart,condition.sourceEnd);} + } + {if (true) return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd);} throw new Error("Missing return statement in function"); } static final public ForeachStatement ForeachStatement() throws ParseException { - Statement statement; - Expression expression; - ArrayVariableDeclaration variable; - Token token; - token = jj_consume_token(FOREACH); + Statement statement = null; + Expression expression = null; + ArrayVariableDeclaration variable = null; + Token foreachToken; + Token lparenToken = null; + Token asToken = null; + Token rparenToken = null; + int pos; + foreachToken = jj_consume_token(FOREACH); try { - jj_consume_token(LPAREN); + lparenToken = jj_consume_token(LPAREN); + pos = lparenToken.sourceEnd+1; } catch (ParseException e) { errorMessage = "'(' expected after 'foreach' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = foreachToken.sourceEnd+1; + errorEnd = foreachToken.sourceEnd+1; + processParseExceptionDebug(e); + {pos = foreachToken.sourceEnd+1;} } try { expression = Expression(); + pos = expression.sourceEnd+1; } catch (ParseException e) { errorMessage = "variable expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } try { - jj_consume_token(AS); + asToken = jj_consume_token(AS); + pos = asToken.sourceEnd+1; } catch (ParseException e) { errorMessage = "'as' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } try { variable = ArrayVariable(); + pos = variable.sourceEnd+1; } catch (ParseException e) { + if (errorMessage != null) {if (true) throw e;} errorMessage = "variable expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } try { - jj_consume_token(RPAREN); + rparenToken = jj_consume_token(RPAREN); + pos = rparenToken.sourceEnd+1; } catch (ParseException e) { errorMessage = "')' expected after 'foreach' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } try { statement = Statement(); + pos = rparenToken.sourceEnd+1; } catch (ParseException e) { if (errorMessage != null) {if (true) throw e;} errorMessage = "statement expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } {if (true) return new ForeachStatement(expression, variable, statement, - token.sourceStart, + foreachToken.sourceStart, statement.sourceEnd);} throw new Error("Missing return statement in function"); } +/** + * a for declaration. + * @return a node representing the for statement + */ static final public ForStatement ForStatement() throws ParseException { -final Token token,token2; -final int pos = SimpleCharStream.getPosition(); +final Token token,tokenEndFor,token2,tokenColon; +int pos; Expression[] initializations = null; Expression condition = null; Expression[] increments = null; Statement action; final ArrayList list = new ArrayList(); -final int startBlock, endBlock; token = jj_consume_token(FOR); try { jj_consume_token(LPAREN); } catch (ParseException e) { errorMessage = "'(' expected after 'for' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = token.sourceEnd; + errorEnd = token.sourceEnd +1; + processParseExceptionDebug(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: + case LIST: + case PRINT: case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: case DOLLAR: + case BANG: case PLUS_PLUS: case MINUS_MINUS: + case PLUS: + case MINUS: case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: case IDENTIFIER: + case LPAREN: case DOLLAR_ID: initializations = ForInit(); break; default: - jj_la1[119] = jj_gen; + jj_la1[120] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4949,23 +5075,36 @@ final int startBlock, endBlock; condition = Expression(); break; default: - jj_la1[120] = jj_gen; + jj_la1[121] = jj_gen; ; } jj_consume_token(SEMICOLON); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: + case LIST: + case PRINT: case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: case DOLLAR: + case BANG: case PLUS_PLUS: case MINUS_MINUS: + case PLUS: + case MINUS: case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: case IDENTIFIER: + case LPAREN: case DOLLAR_ID: increments = StatementExpressionList(); break; default: - jj_la1[121] = jj_gen; + jj_la1[122] = jj_gen; ; } jj_consume_token(RPAREN); @@ -5019,8 +5158,8 @@ final int startBlock, endBlock; action.sourceEnd);} break; case COLON: - jj_consume_token(COLON); - startBlock = SimpleCharStream.getPosition(); + tokenColon = jj_consume_token(COLON); + pos = tokenColon.sourceEnd+1; label_37: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5067,54 +5206,55 @@ final int startBlock, endBlock; ; break; default: - jj_la1[122] = jj_gen; + jj_la1[123] = jj_gen; break label_37; } action = Statement(); - list.add(action); + list.add(action);pos = action.sourceEnd+1; } try { setMarker(fileToParse, "Ugly syntax detected, you should for () {...} instead of for (): ... endfor;", - pos, - pos+token.image.length(), + token.sourceStart, + token.sourceEnd, INFO, "Line " + token.beginLine); } catch (CoreException e) { PHPeclipsePlugin.log(e); } - endBlock = SimpleCharStream.getPosition(); try { - jj_consume_token(ENDFOR); + tokenEndFor = jj_consume_token(ENDFOR); + pos = tokenEndFor.sourceEnd+1; } catch (ParseException e) { errorMessage = "'endfor' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } try { token2 = jj_consume_token(SEMICOLON); - final Statement[] stmtsArray = new Statement[list.size()]; - list.toArray(stmtsArray); - {if (true) return new ForStatement(initializations, - condition, - increments, - new Block(stmtsArray, - stmtsArray[0].sourceStart, - stmtsArray[stmtsArray.length-1].sourceEnd), - token.sourceStart, - token2.sourceEnd);} + pos = token2.sourceEnd+1; } catch (ParseException e) { errorMessage = "';' expected after 'endfor' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } + final Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + {if (true) return new ForStatement(initializations, + condition, + increments, + new Block(stmtsArray, + stmtsArray[0].sourceStart, + stmtsArray[stmtsArray.length-1].sourceEnd), + token.sourceStart, + pos);} break; default: - jj_la1[123] = jj_gen; + jj_la1[124] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5129,18 +5269,31 @@ final int startBlock, endBlock; } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: + case LIST: + case PRINT: case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: case DOLLAR: + case BANG: case PLUS_PLUS: case MINUS_MINUS: + case PLUS: + case MINUS: case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: case IDENTIFIER: + case LPAREN: case DOLLAR_ID: exprs = StatementExpressionList(); {if (true) return exprs;} break; default: - jj_la1[124] = jj_gen; + jj_la1[125] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5151,8 +5304,8 @@ final int startBlock, endBlock; static final public Expression[] StatementExpressionList() throws ParseException { final ArrayList list = new ArrayList(); final Expression expr; - expr = StatementExpression(); - list.add(expr); + expr = Expression(); + list.add(expr); label_38: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5160,12 +5313,12 @@ final int startBlock, endBlock; ; break; default: - jj_la1[125] = jj_gen; + jj_la1[126] = jj_gen; break label_38; } jj_consume_token(COMMA); - StatementExpression(); - list.add(expr); + Expression(); + list.add(expr); } final Expression[] exprsArray = new Expression[list.size()]; list.toArray(exprsArray); @@ -5175,7 +5328,8 @@ final int startBlock, endBlock; static final public Continue ContinueStatement() throws ParseException { Expression expr = null; - final Token token,token2; + final Token token; + Token token2 = null; token = jj_consume_token(CONTINUE); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: @@ -5202,25 +5356,37 @@ final int startBlock, endBlock; expr = Expression(); break; default: - jj_la1[126] = jj_gen; + jj_la1[127] = jj_gen; ; } try { token2 = jj_consume_token(SEMICOLON); - {if (true) return new Continue(expr,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "';' expected after 'continue' statement"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + if (expr == null) { + errorStart = token.sourceEnd+1; + errorEnd = token.sourceEnd+1; + } else { + errorStart = expr.sourceEnd+1; + errorEnd = expr.sourceEnd+1; } + processParseExceptionDebug(e); + } + if (token2 == null) { + if (expr == null) { + {if (true) return new Continue(expr,token.sourceStart,token.sourceEnd);} + } + {if (true) return new Continue(expr,token.sourceStart,expr.sourceEnd);} + } + {if (true) return new Continue(expr,token.sourceStart,token2.sourceEnd);} throw new Error("Missing return statement in function"); } static final public ReturnStatement ReturnStatement() throws ParseException { Expression expr = null; - final Token token,token2; + final Token token; + Token token2 = null; token = jj_consume_token(RETURN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: @@ -5247,19 +5413,30 @@ final int startBlock, endBlock; expr = Expression(); break; default: - jj_la1[127] = jj_gen; + jj_la1[128] = jj_gen; ; } try { token2 = jj_consume_token(SEMICOLON); - {if (true) return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "';' expected after 'return' statement"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + if (expr == null) { + errorStart = token.sourceEnd+1; + errorEnd = token.sourceEnd+1; + } else { + errorStart = expr.sourceEnd+1; + errorEnd = expr.sourceEnd+1; + } + processParseExceptionDebug(e); + } + if (token2 == null) { + if (expr == null) { + {if (true) return new ReturnStatement(expr,token.sourceStart,token.sourceEnd);} + } + {if (true) return new ReturnStatement(expr,token.sourceStart,expr.sourceEnd);} } + {if (true) return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd);} throw new Error("Missing return statement in function"); } @@ -5305,87 +5482,24 @@ final int startBlock, endBlock; return retval; } - static final private boolean jj_3R_46() { - 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_52()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_118() { - if (jj_scan_token(XOR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_117()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_114() { - if (jj_3R_117()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_118()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_45() { - if (jj_scan_token(CLASSACCESS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_51()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_39() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_45()) { - jj_scanpos = xsp; - if (jj_3R_46()) 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_115() { - if (jj_scan_token(BIT_OR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_114()) return true; + static final private boolean jj_3R_112() { + if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_108() { - if (jj_3R_114()) return true; + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_115()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } static final private boolean jj_3R_204() { - if (jj_3R_126()) return true; + if (jj_3R_115()) 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_105() { if (jj_scan_token(DOT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_108()) return true; + if (jj_3R_102()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5416,24 +5530,36 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_101() { - if (jj_3R_108()) return true; + static final private boolean jj_3R_116() { + if (jj_3R_115()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_96() { + if (jj_3R_102()) return true; 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_105()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_113() { + static final private boolean jj_3R_107() { 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_106() { + if (jj_scan_token(AND_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_184() { if (jj_scan_token(ARRAY)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5442,73 +5568,75 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_112() { - if (jj_scan_token(AND_AND)) return true; + static final private boolean jj_3R_111() { + if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_116()) jj_scanpos = xsp; + else 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_99() { Token xsp; xsp = jj_scanpos; - if (jj_3R_112()) { + if (jj_3R_106()) { jj_scanpos = xsp; - if (jj_3R_113()) return true; + if (jj_3R_107()) 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_101()) return true; + if (jj_3R_96()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_123() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; + static final private boolean jj_3R_80() { + if (jj_3R_96()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_99()) { 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(LBRACE)) return true; + static final private boolean jj_3R_78() { + if (jj_scan_token(HOOK)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; + if (jj_scan_token(COLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_68()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_82() { - if (jj_3R_101()) return true; + static final private boolean jj_3R_110() { + if (jj_3R_115()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_104()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_78() { - if (jj_scan_token(HOOK)) return true; + static final private boolean jj_3R_153() { + if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_70()) return true; + if (jj_scan_token(RBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_67() { + static final private boolean jj_3R_72() { 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_116()) jj_scanpos = xsp; + if (jj_3R_153()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5519,36 +5647,54 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_127() { - if (jj_3R_126()) return true; + static final private boolean jj_3R_101() { + 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_106() { - if (jj_scan_token(_ORL)) return true; + static final private boolean jj_3R_100() { + if (jj_scan_token(OR_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_105() { - if (jj_scan_token(OR_OR)) return true; + static final private boolean jj_3R_103() { + if (jj_scan_token(LIST)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_110()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + while (true) { + xsp = jj_scanpos; + if (jj_3R_111()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + if (jj_scan_token(RPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + xsp = jj_scanpos; + if (jj_3R_112()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_51() { + static final private boolean jj_3R_82() { Token xsp; xsp = jj_scanpos; - if (jj_3R_66()) { + if (jj_3R_100()) { jj_scanpos = xsp; - if (jj_3R_67()) return true; + if (jj_3R_101()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_80()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_66() { + static final private boolean jj_3R_71() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -5558,36 +5704,24 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_84() { + static final private boolean jj_3R_64() { Token xsp; xsp = jj_scanpos; - if (jj_3R_105()) { + if (jj_3R_71()) { jj_scanpos = xsp; - if (jj_3R_106()) return true; + if (jj_3R_72()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_82()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_122() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_127()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_75() { - if (jj_3R_82()) return true; + if (jj_3R_80()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_84()) { jj_scanpos = xsp; break; } + if (jj_3R_82()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -5611,14 +5745,8 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_121() { - if (jj_3R_126()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_189() { - if (jj_3R_126()) return true; + if (jj_3R_115()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; @@ -5627,27 +5755,29 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_107() { - if (jj_3R_81()) return true; + static final private boolean jj_3R_104() { + if (jj_scan_token(PRINT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_2() { - if (jj_scan_token(DOLLAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(DOLLAR)) return true; + static final private boolean jj_3R_144() { + if (jj_3R_129()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_100() { - if (jj_3R_51()) return true; + static final private boolean jj_3_2() { + if (jj_scan_token(DOLLAR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_70() { + static final private boolean jj_3R_68() { if (jj_3R_75()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; @@ -5657,32 +5787,16 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_109() { - if (jj_scan_token(LIST)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_121()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - while (true) { - xsp = jj_scanpos; - if (jj_3R_122()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - if (jj_scan_token(RPAREN)) return true; + static final private boolean jj_3R_138() { + if (jj_3R_64()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - 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_99() { + static final private boolean jj_3R_137() { if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_81()) return true; + if (jj_3R_129()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5693,94 +5807,92 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_97() { + static final private boolean jj_3R_95() { if (jj_scan_token(TILDEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_194() { - if (jj_scan_token(STATICCLASSACCESS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_197()) return true; + static final private boolean jj_3R_94() { + 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_96() { - if (jj_scan_token(DOTASSIGN)) return true; + static final private boolean jj_3R_194() { + if (jj_scan_token(STATICCLASSACCESS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_197()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_95() { + static final private boolean jj_3R_93() { 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_94() { + static final private boolean jj_3R_92() { 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_110() { - if (jj_scan_token(PRINT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) 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(DOLLAR_ID)) return true; + static final private boolean jj_3R_91() { + if (jj_scan_token(ANDASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_107()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_81() { + static final private boolean jj_3R_129() { Token xsp; xsp = jj_scanpos; - if (jj_3R_98()) { + if (jj_3R_136()) { jj_scanpos = xsp; - if (jj_3R_99()) { + if (jj_3R_137()) { jj_scanpos = xsp; - if (jj_3R_100()) 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; return false; } - static final private boolean jj_3R_93() { - if (jj_scan_token(ANDASSIGN)) return true; + static final private boolean jj_3R_136() { + 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_144()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_92() { + static final private boolean jj_3R_90() { 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_91() { + static final private boolean jj_3R_89() { 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_90() { + static final private boolean jj_3R_88() { 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_87() { + 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_188() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5810,37 +5922,31 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_80() { - if (jj_3R_81()) 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(PLUSASSIGN)) return true; + static final private boolean jj_3R_128() { + if (jj_3R_129()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_88() { + static final private boolean jj_3R_86() { 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_87() { + static final private boolean jj_3R_85() { if (jj_scan_token(SLASHASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_86() { + static final private boolean jj_3R_84() { 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_85() { + static final private boolean jj_3R_83() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -5849,6 +5955,10 @@ final int startBlock, endBlock; static final private boolean jj_3R_79() { Token xsp; xsp = jj_scanpos; + if (jj_3R_83()) { + jj_scanpos = xsp; + if (jj_3R_84()) { + jj_scanpos = xsp; if (jj_3R_85()) { jj_scanpos = xsp; if (jj_3R_86()) { @@ -5869,11 +5979,7 @@ final int startBlock, endBlock; jj_scanpos = xsp; if (jj_3R_94()) { jj_scanpos = xsp; - if (jj_3R_95()) { - jj_scanpos = xsp; - if (jj_3R_96()) { - jj_scanpos = xsp; - if (jj_3R_97()) return true; + if (jj_3R_95()) 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; @@ -5893,7 +5999,7 @@ final int startBlock, endBlock; static final private boolean jj_3R_74() { if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_81()) return true; + if (jj_3R_129()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5904,32 +6010,15 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_103() { - if (jj_3R_110()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_182() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_102() { - if (jj_3R_109()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_83() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_102()) { - jj_scanpos = xsp; - if (jj_3R_103()) return true; + static final private boolean jj_3R_98() { + if (jj_3R_104()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5954,17 +6043,34 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_97() { + if (jj_3R_103()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_81() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_97()) { + jj_scanpos = xsp; + if (jj_3R_98()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_73() { 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_80()) jj_scanpos = xsp; + if (jj_3R_128()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_64() { + static final private boolean jj_3R_65() { Token xsp; xsp = jj_scanpos; if (jj_3R_73()) { @@ -5976,7 +6082,7 @@ final int startBlock, endBlock; } static final private boolean jj_3R_77() { - if (jj_3R_83()) return true; + if (jj_3R_81()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5984,12 +6090,12 @@ final int startBlock, endBlock; static final private boolean jj_3R_76() { if (jj_scan_token(BANG)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_71()) return true; + if (jj_3R_69()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_71() { + static final private boolean jj_3R_69() { Token xsp; xsp = jj_scanpos; if (jj_3R_76()) { @@ -6024,7 +6130,7 @@ final int startBlock, endBlock; } static final private boolean jj_3R_54() { - if (jj_3R_71()) return true; + if (jj_3R_69()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6069,7 +6175,7 @@ final int startBlock, endBlock; } 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; - if (jj_3R_146()) return true; + if (jj_3R_145()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6080,7 +6186,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_72() { + static final private boolean jj_3R_70() { if (jj_3R_79()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -6115,11 +6221,11 @@ final int startBlock, endBlock; } static final private boolean jj_3R_53() { - if (jj_3R_70()) return true; + if (jj_3R_68()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_72()) jj_scanpos = xsp; + if (jj_3R_70()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6146,12 +6252,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3_1() { - if (jj_3R_39()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_163() { Token xsp; xsp = jj_scanpos; @@ -6175,10 +6275,8 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_65() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; + static final private boolean jj_3_1() { + if (jj_3R_39()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6189,6 +6287,14 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_49() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_62() { if (jj_scan_token(INTEGER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6201,8 +6307,20 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_126() { - if (jj_3R_64()) return true; + static final private boolean jj_3R_60() { + 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_165() { + if (jj_scan_token(MINUS_MINUS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_115() { + if (jj_3R_65()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { @@ -6213,21 +6331,21 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_60() { - 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_59() { if (jj_scan_token(DOUBLE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_165() { - if (jj_scan_token(MINUS_MINUS)) return true; + static final private boolean jj_3R_44() { + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_49()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } @@ -6237,14 +6355,14 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_57() { - if (jj_scan_token(BOOLEAN)) return true; + static final private boolean jj_3R_164() { + if (jj_scan_token(PLUS_PLUS)) 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(PLUS_PLUS)) return true; + static final private boolean jj_3R_57() { + if (jj_scan_token(BOOLEAN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6306,18 +6424,14 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_49() { - if (jj_3R_64()) return true; + static final private boolean jj_3R_161() { + if (jj_3R_163()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_65()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_161() { - if (jj_3R_163()) return true; + 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; } @@ -6331,7 +6445,7 @@ final int startBlock, endBlock; static final private boolean jj_3R_159() { if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_150()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6356,28 +6470,8 @@ final int startBlock, endBlock; static final private boolean jj_3R_158() { if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_150()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_50() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_49()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_44() { - if (jj_3R_49()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_50()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } @@ -6390,12 +6484,12 @@ final int startBlock, endBlock; static final private boolean jj_3R_155() { if (jj_scan_token(BANG)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_150()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_150() { + static final private boolean jj_3R_149() { Token xsp; xsp = jj_scanpos; if (jj_3R_154()) { @@ -6412,238 +6506,238 @@ final int startBlock, endBlock; static final private boolean jj_3R_154() { if (jj_scan_token(AT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_150()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_146() { - if (jj_3R_150()) return true; + static final private boolean jj_3R_145() { + if (jj_3R_149()) 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(REMAINDER)) return true; + static final private boolean jj_3R_43() { + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + 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_152() { - if (jj_scan_token(SLASH)) return true; + if (jj_scan_token(REMAINDER)) 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(STAR)) return true; + 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_43() { - if (jj_3R_47()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(SEMICOLON)) return true; + static final private boolean jj_3R_150() { + 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_147() { + static final private boolean jj_3R_146() { Token xsp; xsp = jj_scanpos; - if (jj_3R_151()) { + if (jj_3R_150()) { jj_scanpos = xsp; - if (jj_3R_152()) { + if (jj_3R_151()) { jj_scanpos = xsp; - if (jj_3R_153()) return true; + if (jj_3R_152()) 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_146()) return true; + if (jj_3R_145()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_141() { - if (jj_3R_146()) return true; + static final private boolean jj_3R_139() { + if (jj_3R_145()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_147()) { jj_scanpos = xsp; break; } + if (jj_3R_146()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3_6() { - if (jj_3R_44()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_149() { + static final private boolean jj_3R_148() { if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_148() { + static final private boolean jj_3R_147() { 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_142() { + static final private boolean jj_3R_140() { Token xsp; xsp = jj_scanpos; - if (jj_3R_148()) { + if (jj_3R_147()) { jj_scanpos = xsp; - if (jj_3R_149()) return true; + if (jj_3R_148()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_141()) 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_135() { - if (jj_3R_141()) return true; + static final private boolean jj_3_5() { + if (jj_3R_43()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_130() { + if (jj_3R_139()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_142()) { 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_3_5() { - if (jj_3R_43()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_145() { + static final private boolean jj_3R_143() { 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_144() { + static final private boolean jj_3R_142() { 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_143() { + static final private boolean jj_3R_141() { 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_136() { + static final private boolean jj_3R_131() { Token xsp; xsp = jj_scanpos; - if (jj_3R_143()) { + if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_144()) { + if (jj_3R_142()) { jj_scanpos = xsp; - if (jj_3R_145()) return true; + if (jj_3R_143()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_135()) 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_128() { - if (jj_3R_135()) return true; + static final private boolean jj_3R_121() { + 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_136()) { 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_3R_140() { - if (jj_scan_token(GE)) return true; + static final private boolean jj_3R_208() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) 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(LE)) return true; + static final private boolean jj_3R_135() { + 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_208() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + static final private boolean jj_3R_207() { if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_208()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_138() { + static final private boolean jj_3R_134() { + 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_133() { 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_137() { + static final private boolean jj_3R_132() { 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_129() { + static final private boolean jj_3R_122() { Token xsp; xsp = jj_scanpos; - if (jj_3R_137()) { + if (jj_3R_132()) { jj_scanpos = xsp; - if (jj_3R_138()) { + if (jj_3R_133()) { jj_scanpos = xsp; - if (jj_3R_139()) { + if (jj_3R_134()) { jj_scanpos = xsp; - if (jj_3R_140()) 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; } 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_128()) return true; + if (jj_3R_121()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_207() { - if (jj_3R_47()) return true; + static final private boolean jj_3R_119() { + if (jj_3R_121()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_208()) { jj_scanpos = xsp; break; } + if (jj_3R_122()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_124() { - if (jj_3R_128()) return true; + static final private boolean jj_3R_205() { + if (jj_3R_207()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_129()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } @@ -6661,14 +6755,14 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_205() { - if (jj_3R_207()) return true; + static final private boolean jj_3R_201() { + if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_69() { - if (jj_3R_48()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_205()) 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; } @@ -6685,6 +6779,24 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_127() { + if (jj_scan_token(TRIPLEEQUAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_126() { + 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_125() { + if (jj_scan_token(NOT_EQUAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_193() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6700,191 +6812,255 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_201() { - if (jj_scan_token(LPAREN)) return true; + static final private boolean jj_3R_124() { + if (jj_scan_token(DIF)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_205()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; + return false; + } + + static final private boolean jj_3R_123() { + if (jj_scan_token(EQUAL_EQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_134() { - if (jj_scan_token(TRIPLEEQUAL)) return true; + static final private boolean jj_3R_181() { + 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_133() { - if (jj_scan_token(BANGDOUBLEEQUAL)) return true; + static final private boolean jj_3R_180() { + 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_132() { - if (jj_scan_token(NOT_EQUAL)) return true; + static final private boolean jj_3R_179() { + 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_131() { - if (jj_scan_token(DIF)) return true; + static final private boolean jj_3R_120() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_123()) { + jj_scanpos = xsp; + if (jj_3R_124()) { + jj_scanpos = xsp; + if (jj_3R_125()) { + jj_scanpos = xsp; + if (jj_3R_126()) { + jj_scanpos = xsp; + if (jj_3R_127()) return true; + if (jj_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_119()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_130() { - if (jj_scan_token(EQUAL_EQUAL)) return true; + static final private boolean jj_3R_178() { + 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_206() { - if (jj_scan_token(ARRAYASSIGN)) return true; + static final private boolean jj_3R_177() { + if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; + return false; + } + + static final private boolean jj_3R_117() { + 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_125() { + static final private boolean jj_3R_51() { + if (jj_3R_65()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_176() { + if (jj_scan_token(INTEGER_LITERAL)) 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_130()) { + if (jj_3R_176()) { jj_scanpos = xsp; - if (jj_3R_131()) { + if (jj_3R_177()) { jj_scanpos = xsp; - if (jj_3R_132()) { + if (jj_3R_178()) { jj_scanpos = xsp; - if (jj_3R_133()) { + if (jj_3R_179()) { jj_scanpos = xsp; - if (jj_3R_134()) return true; + if (jj_3R_180()) { + jj_scanpos = xsp; + if (jj_3R_181()) 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_124()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_206() { + if (jj_scan_token(ARRAYASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_181() { - if (jj_scan_token(NULL)) return true; + static final private boolean jj_3R_40() { + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_206()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_180() { - if (jj_scan_token(FALSE)) return true; + static final private boolean jj_3R_118() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_117()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_119() { - if (jj_3R_124()) return true; + static final private boolean jj_3R_113() { + if (jj_3R_117()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_125()) { jj_scanpos = xsp; break; } + if (jj_3R_118()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_179() { - if (jj_scan_token(TRUE)) return true; + static final private boolean jj_3R_67() { + if (jj_3R_48()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_178() { - if (jj_scan_token(STRING_LITERAL)) return true; + static final private boolean jj_3R_52() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_66()) { + jj_scanpos = xsp; + if (jj_3R_67()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_40() { + static final private boolean jj_3R_66() { if (jj_3R_47()) 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(LBRACKET)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_206()) jj_scanpos = xsp; + if (jj_3R_52()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RBRACKET)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_177() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + static final private boolean jj_3R_114() { + if (jj_scan_token(XOR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_176() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + static final private boolean jj_3R_108() { + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_114()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_173() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_176()) { - jj_scanpos = xsp; - if (jj_3R_177()) { - jj_scanpos = xsp; - if (jj_3R_178()) { - jj_scanpos = xsp; - if (jj_3R_179()) { - jj_scanpos = xsp; - if (jj_3R_180()) { - jj_scanpos = xsp; - if (jj_3R_181()) return true; + static final private boolean jj_3R_50() { + if (jj_3R_64()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } 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_68() { - if (jj_3R_47()) return true; + static final private boolean jj_3R_45() { + if (jj_scan_token(CLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_50()) { + jj_scanpos = xsp; + if (jj_3R_51()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_52() { + static final private boolean jj_3R_39() { Token xsp; xsp = jj_scanpos; - if (jj_3R_68()) { + if (jj_3R_45()) { jj_scanpos = xsp; - if (jj_3R_69()) return true; + if (jj_3R_46()) 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_120() { - if (jj_scan_token(BIT_AND)) return true; + static final private boolean jj_3R_109() { + if (jj_scan_token(BIT_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_119()) return true; + if (jj_3R_108()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_117() { - if (jj_3R_119()) return true; + static final private boolean jj_3R_102() { + 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_120()) { jj_scanpos = xsp; break; } + if (jj_3R_109()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -6900,7 +7076,7 @@ final int startBlock, endBlock; static public boolean lookingAhead = false; static private boolean jj_semLA; static private int jj_gen; - static final private int[] jj_la1 = new int[128]; + static final private int[] jj_la1 = new int[129]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -6914,19 +7090,19 @@ final int startBlock, endBlock; jj_la1_4(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0xf960001e,0x6,0x6,0xf960001e,0x0,0xf9600000,0x0,0xc00000,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x81000000,0xf9000000,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf9600010,0xf9600010,0xf9600000,0xe9600000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9600010,0xe9600010,0x10000000,0x0,0x68000000,0xf9000010,0xf9000010,0x2000000,0x4000000,0xf9000010,0x2000000,0x4000000,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000000,0xf9000000,0x8000000,0x68000000,0x8000000,0xf9000000,0xf9000000,0x8000000,0x0,0x68000000,0x68000000,}; + jj_la1_0 = new int[] {0xf960001e,0x6,0x6,0xf960001e,0x0,0xf9600000,0x0,0xc00000,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x81000000,0xf9000000,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf9600010,0xf9600010,0xf9600000,0xe9600000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9600010,0xe9600010,0x10000000,0x0,0x68000000,0xf9000010,0xf9000010,0x2000000,0x4000000,0xf9000010,0x2000000,0x4000000,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000000,0xf9000000,0x68000000,0x68000000,0x68000000,0xf9000000,0xf9000000,0x68000000,0x0,0x68000000,0x68000000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x875d507f,0x0,0x0,0x875d507f,0x0,0x875d507f,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x30c0000,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x40000,0x100,0x0,0x0,0x0,0x40000,0x0,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8451507f,0x875d507f,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x0,0x0,0x0,0x0,0x40000,0x0,0x2400,0x2400,0x875d507f,0x875d507f,0x0,0x2400,0x30c0000,0x875d507f,0x875d507f,0x0,0x0,0x875d507f,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x40000,0x30c0000,0x40000,0x875d507f,0x875d507f,0x40000,0x0,0x30c0000,0x30c0000,}; + jj_la1_1 = new int[] {0x875d507f,0x0,0x0,0x875d507f,0x0,0x875d507f,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x30c0000,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x40000,0x100,0x0,0x0,0x0,0x40000,0x0,0x0,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8451507f,0x875d507f,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x0,0x0,0x0,0x0,0x40000,0x0,0x2400,0x2400,0x875d507f,0x875d507f,0x0,0x2400,0x30c0000,0x875d507f,0x875d507f,0x0,0x0,0x875d507f,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x30c0000,0x30c0000,0x30c0000,0x875d507f,0x875d507f,0x30c0000,0x0,0x30c0000,0x30c0000,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x13c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x300000,0x0,0x13c1c00,0x0,0x1000000,0x0,0x1000000,0x1000000,0x3fe,0x0,0x13c1c00,0x1000,0x0,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x13c1c00,0x13c0800,0xc0000,0x1000800,0x3fe,0xc0000,0xc0000,0x1000000,0x1000800,0x0,0x0,0x0,0x0,0x800,0xbfe,0x13c1ffe,0x13c1ffe,0x0,0x0,0x13c1c00,0x0,0x400,0x400,0x13c1c00,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0xc0000,0xc0000,0x10c0800,0x8000,0x0,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x0,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0x10c0800,0x13c1c00,0x10c0800,0x13c1c00,0x13c9c00,0x10c0800,0x0,0x13c1c00,0x13c1c00,}; + jj_la1_2 = new int[] {0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x13c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x300000,0x0,0x13c1c00,0x0,0x1000000,0x0,0x1000000,0x1000000,0x3fe,0x0,0x13c1c00,0x1000,0x0,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x13c1c00,0x13c0800,0xc0000,0x1000800,0x3fe,0xc0000,0xc0000,0x1000000,0x1000800,0x0,0x0,0x0,0x0,0x800,0xbfe,0x800,0x13c1ffe,0x13c1ffe,0x0,0x0,0x13c1c00,0x0,0x400,0x400,0x13c1c00,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0xc0000,0xc0000,0x10c0800,0x8000,0x0,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x0,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0x13c1c00,0x0,0x13c1c00,0x13c1c00,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x2288a2,0x0,0x0,0x2288a2,0x200000,0x2288a2,0x0,0x0,0x0,0x400000,0x0,0x0,0x20800,0x0,0x20800,0x0,0x20800,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x88a2,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x800000,0x0,0x0,0x0,0xe4000000,0xe4000000,0x1b000000,0x1b000000,0x0,0x0,0x0,0x0,0x0,0x0,0x88a2,0x88a2,0x0,0x88a2,0x0,0x0,0x0,0x0,0x800,0x0,0x8000,0x8000,0x8000,0x800,0x800,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x2288a2,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x400000,0x400000,0x400000,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x400000,0x0,0x0,0x0,0x800,0x20000,0x0,0x0,0x2288a2,0x2288a2,0x0,0x0,0x88a2,0x2288a2,0x2288a2,0x0,0x0,0x2288a2,0x0,0x0,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x800,0x88a2,0x800,0x2288a2,0x2288a2,0x800,0x400000,0x88a2,0x88a2,}; + jj_la1_3 = new int[] {0x2288a2,0x0,0x0,0x2288a2,0x200000,0x2288a2,0x0,0x0,0x0,0x400000,0x0,0x0,0x20800,0x0,0x20800,0x0,0x20800,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x88a2,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x800000,0x0,0x0,0x0,0xe4000000,0xe4000000,0x1b000000,0x1b000000,0x0,0x0,0x0,0x0,0x0,0x0,0x88a2,0x88a2,0x0,0x88a2,0x0,0x0,0x0,0x0,0x800,0x0,0x8000,0x8000,0x8000,0x800,0x800,0x20800,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x2288a2,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x400000,0x400000,0x400000,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x400000,0x0,0x0,0x0,0x800,0x20000,0x0,0x0,0x2288a2,0x2288a2,0x0,0x0,0x88a2,0x2288a2,0x2288a2,0x0,0x0,0x2288a2,0x0,0x0,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x88a2,0x88a2,0x88a2,0x2288a2,0x2288a2,0x88a2,0x400000,0x88a2,0x88a2,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x4000,0x0,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x2,0x2,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x3ffe,0x4000,0x0,0x0,0x3ffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,}; + jj_la1_4 = new int[] {0x4000,0x0,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x2,0x2,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x3ffe,0x4000,0x0,0x0,0x3ffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[6]; static private boolean jj_rescan = false; @@ -6945,7 +7121,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 128; i++) jj_la1[i] = -1; + for (int i = 0; i < 129; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6955,7 +7131,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 128; i++) jj_la1[i] = -1; + for (int i = 0; i < 129; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6972,7 +7148,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 128; i++) jj_la1[i] = -1; + for (int i = 0; i < 129; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6982,7 +7158,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 128; i++) jj_la1[i] = -1; + for (int i = 0; i < 129; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6998,7 +7174,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 128; i++) jj_la1[i] = -1; + for (int i = 0; i < 129; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7007,7 +7183,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 128; i++) jj_la1[i] = -1; + for (int i = 0; i < 129; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7122,7 +7298,7 @@ final int startBlock, endBlock; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 128; i++) { + for (int i = 0; i < 129; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<