From 6652e3925e57f8b2da09c22577610835aefd9c29 Mon Sep 17 00:00:00 2001 From: kpouer Date: Sat, 28 Jun 2003 08:30:36 +0000 Subject: [PATCH] Fixed a bug in the String regex --- net.sourceforge.phpeclipse/src/test/PHPParser.java | 891 ++++++++++---------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 136 ++-- .../src/test/PHPParserSuperclass.java | 1 - .../src/test/PHPParserTokenManager.java | 72 +- 4 files changed, 564 insertions(+), 536 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 5d05df4..25183f6 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -26,6 +26,7 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; * given with JavaCC. You can get JavaCC at http://www.webgain.com * You can test the parser with the PHPParserTestCase2.java * @author Matthieu Casanova + * @version $Reference: 1.0$ */ public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants { @@ -87,12 +88,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * Add an php node on the stack. * @param node the node that will be added to the stack */ - private static final void pushOnAstNodes(AstNode node) { + private static final void pushOnAstNodes(final AstNode node) { try { nodes[++nodePtr] = node; } catch (IndexOutOfBoundsException e) { - int oldStackLength = nodes.length; - AstNode[] oldStack = nodes; + final int oldStackLength = nodes.length; + final AstNode[] oldStack = nodes; nodes = new AstNode[oldStackLength + AstStackIncrement]; System.arraycopy(oldStack, 0, nodes, 0, oldStackLength); nodePtr = oldStackLength; @@ -458,7 +459,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public PHPEchoBlock phpEchoBlock() throws ParseException { final Expression expr; final int pos = SimpleCharStream.getPosition(); - PHPEchoBlock echoBlock; + final PHPEchoBlock echoBlock; jj_consume_token(PHPECHOSTART); expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -534,8 +535,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public ClassDeclaration ClassDeclaration() throws ParseException { final ClassDeclaration classDeclaration; - final Token className; - Token superclassName = null; + final Token className,superclassName; final int pos; char[] classNameImage = SYNTAX_ERROR_CHAR; char[] superclassNameImage = null; @@ -592,7 +592,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon throw new Error("Missing return statement in function"); } - static final public void ClassBody(ClassDeclaration classDeclaration) throws ParseException { + static final public void ClassBody(final ClassDeclaration classDeclaration) throws ParseException { try { jj_consume_token(LBRACE); } catch (ParseException e) { @@ -629,9 +629,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** * A class can contain only methods and fields. */ - static final public void ClassBodyDeclaration(ClassDeclaration classDeclaration) throws ParseException { - MethodDeclaration method; - FieldDeclaration field; + static final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException { + final MethodDeclaration method; + final FieldDeclaration field; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FUNCTION: method = MethodDeclaration(); @@ -653,7 +653,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon */ static final public FieldDeclaration FieldDeclaration() throws ParseException { VariableDeclaration variableDeclaration; - VariableDeclaration[] list; + final VariableDeclaration[] list; final ArrayList arrayList = new ArrayList(); final int pos = SimpleCharStream.getPosition(); jj_consume_token(VAR); @@ -733,9 +733,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * @return the variable name (with suffix) */ static final public String VariableDeclaratorId() throws ParseException { - String expr; + final String expr; Expression expression = null; - final StringBuffer buff = new StringBuffer(); final int pos = SimpleCharStream.getPosition(); ConstantIdentifier ex; try { @@ -816,7 +815,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon */ static final public String VariableName() throws ParseException { final StringBuffer buff; - String expr = null; + final String expr; Expression expression = null; final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -940,7 +939,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } static final public ArrayVariableDeclaration ArrayVariable() throws ParseException { -Expression expr,expr2; +final Expression expr,expr2; expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAYASSIGN: @@ -1010,7 +1009,7 @@ Expression expr,expr2; ; } jj_consume_token(RPAREN); - ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; + final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; list.toArray(vars); {if (true) return vars;} throw new Error("Missing return statement in function"); @@ -1218,7 +1217,6 @@ Expression expr,expr2; static final public Expression Expression() throws ParseException { final Expression expr; - Token bangToken = null; final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BANG: @@ -1311,7 +1309,7 @@ Expression expr,expr2; * varName (an assign operator) any expression */ static final public VarAssignation varAssignation() throws ParseException { - String varName; + final String varName; final Expression initializer; final int assignOperator; final int pos = SimpleCharStream.getPosition(); @@ -1817,7 +1815,7 @@ Expression expr,expr2; * An unary expression starting with @, & or nothing */ static final public Expression UnaryExpression() throws ParseException { - Expression expr; + final Expression expr; final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: @@ -1854,7 +1852,7 @@ Expression expr,expr2; } static final public Expression AtUnaryExpression() throws ParseException { - Expression expr; + final Expression expr; final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: @@ -1890,8 +1888,8 @@ Expression expr,expr2; } static final public Expression UnaryExpressionNoPrefix() throws ParseException { - Expression expr; - int operator; + final Expression expr; + final int operator; final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -1965,8 +1963,7 @@ final int operator; } static final public Expression UnaryExpressionNotPlusMinus() throws ParseException { - Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Expression expr; if (jj_2_4(2147483647)) { expr = CastExpression(); {if (true) return expr;} @@ -2045,7 +2042,7 @@ final int pos = SimpleCharStream.getPosition(); } static final public Expression PostfixExpression() throws ParseException { - Expression expr; + final Expression expr; int operator = -1; final int pos = SimpleCharStream.getPosition(); expr = PrimaryExpression(); @@ -2236,7 +2233,7 @@ final int pos = SimpleCharStream.getPosition(); throw new Error("Missing return statement in function"); } - static final public AbstractSuffixExpression PrimarySuffix(Expression prefix) throws ParseException { + static final public AbstractSuffixExpression PrimarySuffix(final Expression prefix) throws ParseException { final AbstractSuffixExpression expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: @@ -2256,7 +2253,7 @@ final int pos = SimpleCharStream.getPosition(); throw new Error("Missing return statement in function"); } - static final public AbstractSuffixExpression VariableSuffix(Expression prefix) throws ParseException { + static final public AbstractSuffixExpression VariableSuffix(final Expression prefix) throws ParseException { String expr = null; final int pos = SimpleCharStream.getPosition(); Expression expression = null; @@ -2415,7 +2412,7 @@ final int pos = SimpleCharStream.getPosition(); throw new Error("Missing return statement in function"); } - static final public FunctionCall Arguments(Expression func) throws ParseException { + static final public FunctionCall Arguments(final Expression func) throws ParseException { Expression[] args = null; jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2491,7 +2488,7 @@ final ArrayList list = new ArrayList(); {if (true) throw e;} } } - Expression[] arguments = new Expression[list.size()]; + final Expression[] arguments = new Expression[list.size()]; list.toArray(arguments); {if (true) return arguments;} throw new Error("Missing return statement in function"); @@ -2783,8 +2780,8 @@ final ArrayList list = new ArrayList(); */ static final public HTMLBlock htmlBlock() throws ParseException { final int startIndex = nodePtr; - AstNode[] blockNodes; - int nbNodes; + final AstNode[] blockNodes; + final int nbNodes; jj_consume_token(PHPEND); label_22: while (true) { @@ -2897,8 +2894,8 @@ final ArrayList list = new ArrayList(); static final public ListExpression ListExpression() throws ParseException { String expr = null; - Expression expression = null; - ArrayList list = new ArrayList(); + final Expression expression; + final ArrayList list = new ArrayList(); final int pos = SimpleCharStream.getPosition(); jj_consume_token(LIST); try { @@ -2940,8 +2937,16 @@ final ArrayList list = new ArrayList(); errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } - expr = VariableDeclaratorId(); - list.add(expr); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOLLAR: + case DOLLAR_ID: + expr = VariableDeclaratorId(); + list.add(expr); + break; + default: + jj_la1[79] = jj_gen; + ; + } } try { jj_consume_token(RPAREN); @@ -2956,7 +2961,7 @@ final ArrayList list = new ArrayList(); case ASSIGN: jj_consume_token(ASSIGN); expression = Expression(); - String[] strings = new String[list.size()]; + final String[] strings = new String[list.size()]; list.toArray(strings); {if (true) return new ListExpression(strings, expression, @@ -2964,10 +2969,10 @@ final ArrayList list = new ArrayList(); SimpleCharStream.getPosition());} break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; ; } - String[] strings = new String[list.size()]; + final String[] strings = new String[list.size()]; list.toArray(strings); {if (true) return new ListExpression(strings,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); @@ -2991,7 +2996,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; break label_24; } jj_consume_token(COMMA); @@ -3009,7 +3014,7 @@ final ArrayList list = new ArrayList(); {if (true) throw e;} } } - Expression[] exprs = new Expression[expressions.size()]; + final Expression[] exprs = new Expression[expressions.size()]; expressions.toArray(exprs); {if (true) return new EchoStatement(exprs,pos);} throw new Error("Missing return statement in function"); @@ -3018,8 +3023,8 @@ final ArrayList list = new ArrayList(); static final public GlobalStatement GlobalStatement() throws ParseException { final int pos = SimpleCharStream.getPosition(); String expr; - ArrayList vars = new ArrayList(); - GlobalStatement global; + final ArrayList vars = new ArrayList(); + final GlobalStatement global; jj_consume_token(GLOBAL); expr = VariableDeclaratorId(); vars.add(expr); @@ -3030,7 +3035,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; break label_25; } jj_consume_token(COMMA); @@ -3039,7 +3044,7 @@ final ArrayList list = new ArrayList(); } try { jj_consume_token(SEMICOLON); - String[] strings = new String[vars.size()]; + final String[] strings = new String[vars.size()]; vars.toArray(strings); global = new GlobalStatement(currentSegment, strings, @@ -3071,7 +3076,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; break label_26; } jj_consume_token(COMMA); @@ -3080,7 +3085,7 @@ final ArrayList list = new ArrayList(); } try { jj_consume_token(SEMICOLON); - String[] strings = new String[vars.size()]; + final String[] strings = new String[vars.size()]; vars.toArray(strings); {if (true) return new StaticStatement(strings, pos, @@ -3175,7 +3180,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; break label_27; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3229,7 +3234,7 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3243,7 +3248,7 @@ final ArrayList list = new ArrayList(); errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } - Statement[] statements = new Statement[list.size()]; + final Statement[] statements = new Statement[list.size()]; list.toArray(statements); {if (true) return new Block(statements,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); @@ -3316,7 +3321,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3381,7 +3386,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3400,14 +3405,14 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; break label_28; } jj_consume_token(COMMA); var = LocalVariableDeclarator(); list.add(var); } - VariableDeclaration[] vars = new VariableDeclaration[list.size()]; + final VariableDeclaration[] vars = new VariableDeclaration[list.size()]; list.toArray(vars); {if (true) return vars;} throw new Error("Missing return statement in function"); @@ -3424,7 +3429,7 @@ final ArrayList list = new ArrayList(); initializer = Expression(); break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; ; } if (initializer == null) { @@ -3449,8 +3454,8 @@ final ArrayList list = new ArrayList(); } static final public Expression StatementExpression() throws ParseException { - Expression expr,expr2; - int operator; + final Expression expr,expr2; + final int operator; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS_PLUS: case MINUS_MINUS: @@ -3510,19 +3515,19 @@ final ArrayList list = new ArrayList(); {if (true) return new BinaryExpression(expr,expr2,operator);} break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; ; } {if (true) return expr;} break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3572,7 +3577,7 @@ final ArrayList list = new ArrayList(); cases = switchStatementColon(pos, pos + 6); break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3592,7 +3597,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; break label_29; } cas = switchLabel0(); @@ -3600,7 +3605,7 @@ final ArrayList list = new ArrayList(); } try { jj_consume_token(RBRACE); - AbstractCase[] abcase = new AbstractCase[cases.size()]; + final AbstractCase[] abcase = new AbstractCase[cases.size()]; cases.toArray(abcase); {if (true) return abcase;} } catch (ParseException e) { @@ -3640,7 +3645,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[94] = jj_gen; + jj_la1[95] = jj_gen; break label_30; } cas = switchLabel0(); @@ -3657,7 +3662,7 @@ final ArrayList list = new ArrayList(); } try { jj_consume_token(SEMICOLON); - AbstractCase[] abcase = new AbstractCase[cases.size()]; + final AbstractCase[] abcase = new AbstractCase[cases.size()]; cases.toArray(abcase); {if (true) return abcase;} } catch (ParseException e) { @@ -3724,7 +3729,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; break label_31; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3777,7 +3782,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3788,10 +3793,10 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; ; } - Statement[] stmtsArray = new Statement[stmts.size()]; + 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());} @@ -3846,7 +3851,7 @@ final ArrayList list = new ArrayList(); } break; default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3882,7 +3887,7 @@ final ArrayList list = new ArrayList(); expression = Expression(); break; default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; ; } try { @@ -3900,8 +3905,8 @@ final ArrayList list = new ArrayList(); static final public IfStatement IfStatement() throws ParseException { final int pos = SimpleCharStream.getPosition(); - Expression condition; - IfStatement ifStatement; + final Expression condition; + final IfStatement ifStatement; jj_consume_token(IF); condition = Condition("if"); ifStatement = IfStatement0(condition, pos,pos+2); @@ -3934,17 +3939,17 @@ final ArrayList list = new ArrayList(); throw new Error("Missing return statement in function"); } - static final public IfStatement IfStatement0(Expression condition, final int start,final int end) throws ParseException { + static final public IfStatement IfStatement0(final Expression condition, final int start,final int end) throws ParseException { Statement statement; - Statement stmt; + final Statement stmt; final Statement[] statementsArray; ElseIf elseifStatement; Else elseStatement = null; - ArrayList stmts; + final ArrayList stmts; final ArrayList elseIfList = new ArrayList(); - ElseIf[] elseIfs; + final ElseIf[] elseIfs; int pos = SimpleCharStream.getPosition(); - int endStatements; + final int endStatements; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); @@ -3996,7 +4001,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; break label_32; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4048,7 +4053,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(); } @@ -4061,7 +4066,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[102] = jj_gen; + jj_la1[103] = jj_gen; break label_33; } elseifStatement = ElseIfStatementColon(); @@ -4072,7 +4077,7 @@ final ArrayList list = new ArrayList(); elseStatement = ElseStatementColon(); break; default: - jj_la1[103] = jj_gen; + jj_la1[104] = jj_gen; ; } try { @@ -4211,7 +4216,7 @@ final ArrayList list = new ArrayList(); stmt = htmlBlock(); break; default: - jj_la1[104] = jj_gen; + jj_la1[105] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4222,7 +4227,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[105] = jj_gen; + jj_la1[106] = jj_gen; break label_34; } elseifStatement = ElseIfStatement(); @@ -4247,7 +4252,7 @@ final ArrayList list = new ArrayList(); } break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; ; } elseIfs = new ElseIf[elseIfList.size()]; @@ -4260,7 +4265,7 @@ final ArrayList list = new ArrayList(); SimpleCharStream.getPosition());} break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4268,7 +4273,7 @@ final ArrayList list = new ArrayList(); } static final public ElseIf ElseIfStatementColon() throws ParseException { - Expression condition; + final Expression condition; Statement statement; final ArrayList list = new ArrayList(); final int pos = SimpleCharStream.getPosition(); @@ -4322,7 +4327,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; break label_35; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4374,12 +4379,12 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } - Statement[] stmtsArray = new Statement[list.size()]; + final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); {if (true) return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); @@ -4438,7 +4443,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; break label_36; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4490,27 +4495,27 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[111] = jj_gen; + jj_la1[112] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } - Statement[] stmtsArray = new Statement[list.size()]; + final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); {if (true) return new Else(stmtsArray,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } static final public ElseIf ElseIfStatement() throws ParseException { - Expression condition; - Statement statement; + final Expression condition; + final Statement statement; final ArrayList list = new ArrayList(); final int pos = SimpleCharStream.getPosition(); jj_consume_token(ELSEIF); condition = Condition("elseif"); statement = Statement(); list.add(statement);/*todo:do better*/ - Statement[] stmtsArray = new Statement[list.size()]; + final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); {if (true) return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); @@ -4580,7 +4585,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[112] = jj_gen; + jj_la1[113] = jj_gen; break label_37; } statement = Statement(); @@ -4607,7 +4612,7 @@ final ArrayList list = new ArrayList(); } try { jj_consume_token(SEMICOLON); - Statement[] stmtsArray = new Statement[stmts.size()]; + final Statement[] stmtsArray = new Statement[stmts.size()]; stmts.toArray(stmtsArray); {if (true) return new Block(stmtsArray,pos,SimpleCharStream.getPosition());} } catch (ParseException e) { @@ -4662,7 +4667,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[113] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4789,7 +4794,7 @@ final int startBlock, endBlock; initializations = ForInit(); break; default: - jj_la1[114] = jj_gen; + jj_la1[115] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4818,7 +4823,7 @@ final int startBlock, endBlock; condition = Expression(); break; default: - jj_la1[115] = jj_gen; + jj_la1[116] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4833,7 +4838,7 @@ final int startBlock, endBlock; increments = StatementExpressionList(); break; default: - jj_la1[116] = jj_gen; + jj_la1[117] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4930,7 +4935,7 @@ final int startBlock, endBlock; ; break; default: - jj_la1[117] = jj_gen; + jj_la1[118] = jj_gen; break label_38; } action = Statement(); @@ -4958,7 +4963,7 @@ final int startBlock, endBlock; } try { jj_consume_token(SEMICOLON); - Statement[] stmtsArray = new Statement[list.size()]; + final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); {if (true) return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());} } catch (ParseException e) { @@ -4970,7 +4975,7 @@ final int startBlock, endBlock; } break; default: - jj_la1[118] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4978,7 +4983,7 @@ final int startBlock, endBlock; } static final public Expression[] ForInit() throws ParseException { - Expression[] exprs; + final Expression[] exprs; if (jj_2_11(2147483647)) { exprs = LocalVariableDeclaration(); {if (true) return exprs;} @@ -4995,7 +5000,7 @@ final int startBlock, endBlock; {if (true) return exprs;} break; default: - jj_la1[119] = jj_gen; + jj_la1[120] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5005,7 +5010,7 @@ final int startBlock, endBlock; static final public Expression[] StatementExpressionList() throws ParseException { final ArrayList list = new ArrayList(); - Expression expr; + final Expression expr; expr = StatementExpression(); list.add(expr); label_39: @@ -5015,14 +5020,14 @@ final int startBlock, endBlock; ; break; default: - jj_la1[120] = jj_gen; + jj_la1[121] = jj_gen; break label_39; } jj_consume_token(COMMA); StatementExpression(); list.add(expr); } - Expression[] exprsArray = new Expression[list.size()]; + final Expression[] exprsArray = new Expression[list.size()]; list.toArray(exprsArray); {if (true) return exprsArray;} throw new Error("Missing return statement in function"); @@ -5057,7 +5062,7 @@ final int startBlock, endBlock; expr = Expression(); break; default: - jj_la1[121] = jj_gen; + jj_la1[122] = jj_gen; ; } try { @@ -5102,7 +5107,7 @@ final int startBlock, endBlock; expr = Expression(); break; default: - jj_la1[122] = jj_gen; + jj_la1[123] = jj_gen; ; } try { @@ -5195,35 +5200,58 @@ final int startBlock, endBlock; return retval; } - static final private boolean jj_3R_202() { + static final private boolean jj_3R_97() { + if (jj_3R_103()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_86() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_97()) { + jj_scanpos = xsp; + if (jj_3R_98()) { + jj_scanpos = xsp; + if (jj_3R_99()) { + jj_scanpos = xsp; + if (jj_3R_100()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } 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_203() { 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_201() { + static final private boolean jj_3R_202() { 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_194() { + static final private boolean jj_3R_195() { Token xsp; xsp = jj_scanpos; - if (jj_3R_201()) { + if (jj_3R_202()) { jj_scanpos = xsp; - if (jj_3R_202()) return true; + if (jj_3R_203()) 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_177() { - if (jj_3R_175()) return true; + static final private boolean jj_3R_178() { + if (jj_3R_176()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_194()) jj_scanpos = xsp; + if (jj_3R_195()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5259,37 +5287,37 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_193() { + static final private boolean jj_3R_194() { if (jj_scan_token(ARRAY)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_192() { + static final private boolean jj_3R_193() { if (jj_3R_53()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_176() { + static final private boolean jj_3R_84() { + if (jj_scan_token(OBJECT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_177() { 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_192()) { + if (jj_3R_193()) { jj_scanpos = xsp; - if (jj_3R_193()) return true; + if (jj_3R_194()) 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_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_149()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_84() { - if (jj_scan_token(OBJECT)) return true; + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5300,14 +5328,14 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_43() { - if (jj_3R_53()) return true; + static final private boolean jj_3R_82() { + if (jj_scan_token(INT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_82() { - if (jj_scan_token(INT)) return true; + static final private boolean jj_3R_43() { + if (jj_3R_53()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5336,6 +5364,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_77() { + if (jj_scan_token(BOOL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3_4() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5351,12 +5385,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_77() { - if (jj_scan_token(BOOL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_76() { if (jj_scan_token(STRING)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5403,7 +5431,7 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_174() { + static final private boolean jj_3R_175() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_46()) return true; @@ -5413,6 +5441,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_174() { + if (jj_3R_179()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_173() { if (jj_3R_178()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5425,16 +5459,16 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_168() { + static final private boolean jj_3R_169() { Token xsp; xsp = jj_scanpos; - if (jj_3R_171()) { - jj_scanpos = xsp; if (jj_3R_172()) { jj_scanpos = xsp; if (jj_3R_173()) { jj_scanpos = xsp; - if (jj_3R_174()) return true; + if (jj_3R_174()) { + jj_scanpos = xsp; + if (jj_3R_175()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5443,32 +5477,26 @@ final int startBlock, endBlock; } static final private boolean jj_3R_171() { - if (jj_3R_176()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_170() { 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_169() { + static final private boolean jj_3R_170() { 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_167() { + static final private boolean jj_3R_168() { Token xsp; xsp = jj_scanpos; - if (jj_3R_169()) { + if (jj_3R_170()) { jj_scanpos = xsp; - if (jj_3R_170()) return true; + if (jj_3R_171()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_175()) return true; + if (jj_3R_176()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5479,20 +5507,26 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_163() { + if (jj_3R_169()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_162() { if (jj_3R_168()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_161() { - if (jj_3R_167()) return true; + static final private boolean jj_3R_167() { + 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_166() { - if (jj_scan_token(MINUS)) return true; + if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5507,35 +5541,29 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_165() { - 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_158() { + static final private boolean jj_3R_159() { Token xsp; xsp = jj_scanpos; - if (jj_3R_160()) { - jj_scanpos = xsp; if (jj_3R_161()) { jj_scanpos = xsp; - if (jj_3R_162()) return true; + if (jj_3R_162()) { + jj_scanpos = xsp; + if (jj_3R_163()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_160() { + static final private boolean jj_3R_161() { Token xsp; xsp = jj_scanpos; - if (jj_3R_165()) { + if (jj_3R_166()) { jj_scanpos = xsp; - if (jj_3R_166()) return true; + if (jj_3R_167()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_149()) return true; + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5548,8 +5576,8 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_164() { - if (jj_3R_158()) return true; + static final private boolean jj_3R_165() { + if (jj_3R_159()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5566,153 +5594,145 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_159() { + static final private boolean jj_3R_160() { Token xsp; xsp = jj_scanpos; - if (jj_3R_163()) { + if (jj_3R_164()) { jj_scanpos = xsp; - if (jj_3R_164()) return true; + if (jj_3R_165()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_163() { + static final private boolean jj_3R_164() { if (jj_scan_token(AT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_159()) return true; + if (jj_3R_160()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_154() { - if (jj_3R_159()) return true; + static final private boolean jj_3R_155() { + if (jj_3R_160()) 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_150() { Token xsp; xsp = jj_scanpos; - if (jj_3R_153()) { + if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_154()) return true; + if (jj_3R_155()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_153() { + static final private boolean jj_3R_154() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_158()) return true; + if (jj_3R_159()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_157() { + static final private boolean jj_3R_158() { 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_156() { + static final private boolean jj_3R_157() { 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_155() { + static final private boolean jj_3R_156() { 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_150() { + static final private boolean jj_3R_151() { Token xsp; xsp = jj_scanpos; - if (jj_3R_155()) { - jj_scanpos = xsp; if (jj_3R_156()) { jj_scanpos = xsp; - if (jj_3R_157()) return true; + if (jj_3R_157()) { + jj_scanpos = xsp; + if (jj_3R_158()) 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_149()) return true; + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_144() { - if (jj_3R_149()) return true; + static final private boolean jj_3R_145() { + if (jj_3R_150()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_150()) { jj_scanpos = xsp; break; } + if (jj_3R_151()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3_9() { - if (jj_3R_47()) return true; + static final private boolean jj_3R_153() { + 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_152() { - if (jj_scan_token(MINUS)) return true; + static final private boolean jj_3_9() { + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_151() { + static final private boolean jj_3R_152() { 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_145() { + static final private boolean jj_3R_146() { Token xsp; xsp = jj_scanpos; - if (jj_3R_151()) { + if (jj_3R_152()) { jj_scanpos = xsp; - if (jj_3R_152()) return true; + if (jj_3R_153()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_144()) 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_138() { - if (jj_3R_144()) 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_145()) { 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_3R_204() { + static final private boolean jj_3R_205() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_8() { - if (jj_3R_46()) 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_3_2() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5721,13 +5741,15 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_148() { - if (jj_scan_token(RUNSIGNEDSHIFT)) return true; + static final private boolean jj_3_8() { + if (jj_3R_46()) 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_203() { + static final private boolean jj_3R_204() { if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; @@ -5739,67 +5761,73 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_147() { + static final private boolean jj_3R_149() { + 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_148() { 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_146() { + static final private boolean jj_3R_147() { 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_139() { + static final private boolean jj_3R_140() { Token xsp; xsp = jj_scanpos; - if (jj_3R_146()) { - jj_scanpos = xsp; if (jj_3R_147()) { jj_scanpos = xsp; - if (jj_3R_148()) return true; + if (jj_3R_148()) { + jj_scanpos = xsp; + if (jj_3R_149()) 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_138()) 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_131() { - if (jj_3R_138()) return true; + static final private boolean jj_3R_132() { + 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_139()) { 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_11() { - if (jj_3R_48()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_200() { + static final private boolean jj_3R_201() { 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_203()) jj_scanpos = xsp; + if (jj_3R_204()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; xsp = jj_scanpos; - if (jj_3R_204()) jj_scanpos = xsp; + 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; } + static final private boolean jj_3_11() { + if (jj_3R_48()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_47() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5808,84 +5836,84 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_143() { + static final private boolean jj_3R_144() { 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_142() { + static final private boolean jj_3R_143() { 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_141() { + static final private boolean jj_3R_142() { 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_140() { + static final private boolean jj_3R_141() { 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_106() { - if (jj_scan_token(COMMA)) return true; + 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_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_132() { + static final private boolean jj_3R_133() { Token xsp; xsp = jj_scanpos; - if (jj_3R_140()) { - jj_scanpos = xsp; if (jj_3R_141()) { jj_scanpos = xsp; if (jj_3R_142()) { jj_scanpos = xsp; - if (jj_3R_143()) return true; + if (jj_3R_143()) { + jj_scanpos = xsp; + if (jj_3R_144()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_131()) return true; + if (jj_3R_132()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_205() { - if (jj_scan_token(ARRAYASSIGN)) return true; + static final private boolean jj_3R_106() { + if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_129() { - if (jj_3R_131()) return true; + static final private boolean jj_3R_41() { + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_132()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } + 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_41() { - if (jj_3R_46()) return true; + static final private boolean jj_3R_130() { + if (jj_3R_132()) 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; + while (true) { + xsp = jj_scanpos; + if (jj_3R_133()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } @@ -5907,6 +5935,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_138() { + 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_93() { if (jj_3R_53()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5914,19 +5948,19 @@ final int startBlock, endBlock; } static final private boolean jj_3R_137() { - if (jj_scan_token(TRIPLEEQUAL)) return true; + 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_136() { - if (jj_scan_token(BANGDOUBLEEQUAL)) return true; + 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_135() { - if (jj_scan_token(NOT_EQUAL)) return true; + if (jj_scan_token(DIF)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5944,63 +5978,51 @@ final int startBlock, endBlock; } static final private boolean jj_3R_134() { - if (jj_scan_token(DIF)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_133() { 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_130() { + static final private boolean jj_3R_131() { Token xsp; xsp = jj_scanpos; - if (jj_3R_133()) { - jj_scanpos = xsp; if (jj_3R_134()) { jj_scanpos = xsp; if (jj_3R_135()) { jj_scanpos = xsp; if (jj_3R_136()) { jj_scanpos = xsp; - if (jj_3R_137()) return true; + if (jj_3R_137()) { + jj_scanpos = xsp; + 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; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_129()) return true; + if (jj_3R_130()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_127() { - if (jj_3R_129()) return true; + static final private boolean jj_3R_128() { + 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_130()) { 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_186() { + static final private boolean jj_3R_187() { 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_185() { - 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_109() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6011,14 +6033,14 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_184() { - if (jj_scan_token(TRUE)) return true; + static final private boolean jj_3R_186() { + 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_183() { - if (jj_scan_token(STRING_LITERAL)) return true; + static final private boolean jj_3R_185() { + if (jj_scan_token(TRUE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6029,31 +6051,35 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_182() { + static final private boolean jj_3R_184() { + 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_183() { if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_128() { + static final private boolean jj_3R_129() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_127()) return true; + if (jj_3R_128()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_181() { + static final private boolean jj_3R_182() { 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_178() { + static final private boolean jj_3R_179() { Token xsp; xsp = jj_scanpos; - if (jj_3R_181()) { - jj_scanpos = xsp; if (jj_3R_182()) { jj_scanpos = xsp; if (jj_3R_183()) { @@ -6062,7 +6088,9 @@ final int startBlock, endBlock; jj_scanpos = xsp; if (jj_3R_185()) { jj_scanpos = xsp; - if (jj_3R_186()) return true; + if (jj_3R_186()) { + jj_scanpos = xsp; + if (jj_3R_187()) 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; @@ -6080,13 +6108,13 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_125() { - if (jj_3R_127()) return true; + static final private boolean jj_3R_126() { + if (jj_3R_128()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_128()) { jj_scanpos = xsp; break; } + if (jj_3R_129()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -6109,10 +6137,10 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_126() { + static final private boolean jj_3R_127() { if (jj_scan_token(XOR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_125()) return true; + if (jj_3R_126()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6127,30 +6155,18 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_123() { - if (jj_3R_125()) return true; + static final private boolean jj_3R_124() { + if (jj_3R_126()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_126()) { jj_scanpos = xsp; break; } + if (jj_3R_127()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_50() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_61()) 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_88() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6178,10 +6194,22 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_124() { + static final private boolean jj_3R_50() { + if (jj_scan_token(LBRACKET)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_61()) 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_125() { if (jj_scan_token(BIT_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_123()) return true; + if (jj_3R_124()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6196,13 +6224,13 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_119() { - if (jj_3R_123()) return true; + static final private boolean jj_3R_120() { + if (jj_3R_124()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_124()) { jj_scanpos = xsp; break; } + if (jj_3R_125()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -6235,21 +6263,21 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_120() { + static final private boolean jj_3R_121() { if (jj_scan_token(DOT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_119()) return true; + if (jj_3R_120()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_115() { - if (jj_3R_119()) return true; + static final private boolean jj_3R_116() { + if (jj_3R_120()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_120()) { jj_scanpos = xsp; break; } + if (jj_3R_121()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -6299,33 +6327,27 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_122() { + static final private boolean jj_3R_123() { 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_121() { + static final private boolean jj_3R_122() { 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_116() { + static final private boolean jj_3R_117() { Token xsp; xsp = jj_scanpos; - if (jj_3R_121()) { + if (jj_3R_122()) { jj_scanpos = xsp; - if (jj_3R_122()) return true; + if (jj_3R_123()) 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_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_196() { - if (jj_3R_51()) return true; + if (jj_3R_116()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6342,30 +6364,36 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_197() { + if (jj_3R_51()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_113() { - if (jj_3R_115()) return true; + if (jj_3R_116()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_116()) { jj_scanpos = xsp; break; } + if (jj_3R_117()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_195() { + static final private boolean jj_3R_196() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_187() { + static final private boolean jj_3R_188() { Token xsp; xsp = jj_scanpos; - if (jj_3R_195()) { + if (jj_3R_196()) { jj_scanpos = xsp; - if (jj_3R_196()) return true; + if (jj_3R_197()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6379,13 +6407,13 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_118() { + static final private boolean jj_3R_119() { 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_117() { + static final private boolean jj_3R_118() { if (jj_scan_token(OR_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6394,9 +6422,9 @@ final int startBlock, endBlock; static final private boolean jj_3R_114() { Token xsp; xsp = jj_scanpos; - if (jj_3R_117()) { + if (jj_3R_118()) { jj_scanpos = xsp; - if (jj_3R_118()) return true; + if (jj_3R_119()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_113()) return true; @@ -6404,6 +6432,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_115() { + if (jj_3R_51()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_107() { if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6425,8 +6459,10 @@ final int startBlock, endBlock; static final private boolean jj_3R_111() { if (jj_scan_token(COMMA)) 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; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_115()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6458,34 +6494,34 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_199() { + static final private boolean jj_3R_200() { if (jj_3R_51()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_198() { + static final private boolean jj_3R_199() { if (jj_scan_token(NEW)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_187()) return true; + if (jj_3R_188()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_197() { + static final private boolean jj_3R_198() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_189() { + static final private boolean jj_3R_190() { Token xsp; xsp = jj_scanpos; - if (jj_3R_197()) { - jj_scanpos = xsp; if (jj_3R_198()) { jj_scanpos = xsp; - if (jj_3R_199()) return true; + if (jj_3R_199()) { + jj_scanpos = xsp; + if (jj_3R_200()) 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; @@ -6498,6 +6534,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_74() { + 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_104() { if (jj_scan_token(LIST)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6520,12 +6562,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_74() { - 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_73() { if (jj_scan_token(ORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6574,30 +6610,22 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_191() { - if (jj_scan_token(ARRAY)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_200()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_65() { 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_64() { - if (jj_scan_token(STARASSIGN)) return true; + static final private boolean jj_3R_192() { + if (jj_scan_token(ARRAY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_201()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_103() { - if (jj_scan_token(PRINT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_46()) return true; + static final private boolean jj_3R_64() { + if (jj_scan_token(STARASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6652,14 +6680,22 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_103() { + if (jj_scan_token(PRINT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_46()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3_6() { if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_180() { - if (jj_3R_191()) return true; + static final private boolean jj_3R_181() { + if (jj_3R_192()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6670,25 +6706,25 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_190() { + static final private boolean jj_3R_191() { if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_179() { - if (jj_3R_189()) return true; + static final private boolean jj_3R_180() { + if (jj_3R_190()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_190()) { jj_scanpos = xsp; break; } + if (jj_3R_191()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_188() { + static final private boolean jj_3R_189() { if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6704,37 +6740,37 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_175() { + static final private boolean jj_3_3() { + if (jj_3R_42()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_176() { Token xsp; xsp = jj_scanpos; if (jj_3_7()) { jj_scanpos = xsp; - if (jj_3R_179()) { + if (jj_3R_180()) { jj_scanpos = xsp; - if (jj_3R_180()) return true; + 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; return false; } - static final private boolean jj_3_3() { - if (jj_3R_42()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3_7() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_scan_token(STATICCLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_187()) return true; + if (jj_3R_188()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_188()) { jj_scanpos = xsp; break; } + if (jj_3R_189()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; @@ -6758,29 +6794,6 @@ 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_86() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_97()) { - jj_scanpos = xsp; - if (jj_3R_98()) { - jj_scanpos = xsp; - if (jj_3R_99()) { - jj_scanpos = xsp; - if (jj_3R_100()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static private boolean jj_initialized_once = false; static public PHPParserTokenManager token_source; static SimpleCharStream jj_input_stream; @@ -6791,7 +6804,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[123]; + static final private int[] jj_la1 = new int[124]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -6805,19 +6818,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,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x60000000,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x89000000,0x40000000,0x8000000,0xf9000000,0x8,0x6,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,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x60000000,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x89000000,0x40000000,0x8000000,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,}; } 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,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x30c0000,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,0x30c0000,0x0,0x0,0x0,0x40000,0x40000,0x40000,0x0,0x80,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8455507f,0x0,0x30c0000,0x875d507f,0x0,0x0,0xf,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,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x30c0000,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,0x30c0000,0x0,0x0,0x0,0x40000,0x40000,0x40000,0x0,0x80,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8455507f,0x0,0x30c0000,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,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x13c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x300000,0x0,0x13c1c00,0x0,0x1000000,0x0,0x1000800,0x1000000,0x3fe,0x13c1c00,0x0,0x13c0c00,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x13c0c00,0x3c0c00,0x300000,0x3c0800,0xc0000,0x800,0x3fe,0xc0000,0xc0000,0x800,0x800,0x800,0x800,0x0,0x13c1ffe,0x13c1ffe,0x0,0x0,0x13c1c00,0x0,0x400,0xc0c00,0x0,0x13c0c00,0x13c1c00,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0xc0000,0xc0000,0xc0800,0x8000,0x0,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x0,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0xc0800,0x13c1c00,0xc0800,0x13c1c00,0x13c9c00,0xc0800,0x0,0x13c1c00,0x13c1c00,}; + jj_la1_2 = new int[] {0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x13c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x300000,0x0,0x13c1c00,0x0,0x1000000,0x0,0x1000800,0x1000000,0x3fe,0x13c1c00,0x0,0x13c0c00,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x13c0c00,0x3c0c00,0x300000,0x3c0800,0xc0000,0x800,0x3fe,0xc0000,0xc0000,0x800,0x800,0x800,0x800,0x0,0x13c1ffe,0x13c1ffe,0x0,0x0,0x13c1c00,0x0,0x400,0xc0c00,0x0,0x13c0c00,0x13c1c00,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0xc0000,0xc0000,0xc0800,0x8000,0x0,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x0,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0xc0800,0x13c1c00,0xc0800,0x13c1c00,0x13c9c00,0xc0800,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,0x20000,0x0,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x88a2,0x0,0x88a2,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,0x88a2,0x0,0x0,0x0,0x800,0x800,0x800,0x800,0x88000,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x0,0x88a2,0x2288a2,0x0,0x0,0x0,0x0,0x400000,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,0x20000,0x0,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x88a2,0x0,0x88a2,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,0x88a2,0x0,0x0,0x0,0x800,0x800,0x800,0x800,0x88000,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x0,0x88a2,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,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x4000,0x0,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x2,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x4000,0x0,0x4000,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,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x4000,0x0,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x3ffe,0x3ffe,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,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x4000,0x0,0x4000,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,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x3ffe,0x3ffe,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[11]; static private boolean jj_rescan = false; @@ -6836,7 +6849,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 123; i++) jj_la1[i] = -1; + for (int i = 0; i < 124; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6846,7 +6859,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 123; i++) jj_la1[i] = -1; + for (int i = 0; i < 124; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6863,7 +6876,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 123; i++) jj_la1[i] = -1; + for (int i = 0; i < 124; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6873,7 +6886,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 123; i++) jj_la1[i] = -1; + for (int i = 0; i < 124; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6889,7 +6902,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 123; i++) jj_la1[i] = -1; + for (int i = 0; i < 124; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6898,7 +6911,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 123; i++) jj_la1[i] = -1; + for (int i = 0; i < 124; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7013,7 +7026,7 @@ final int startBlock, endBlock; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 123; i++) { + for (int i = 0; i < 124; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< | | | )> -| -| -| +| +| +| } /* IDENTIFIERS */ @@ -636,7 +637,7 @@ PHPEchoBlock phpEchoBlock() : { final Expression expr; final int pos = SimpleCharStream.getPosition(); - PHPEchoBlock echoBlock; + final PHPEchoBlock echoBlock; } { expr = Expression() [ ] @@ -655,8 +656,7 @@ void Php() : ClassDeclaration ClassDeclaration() : { final ClassDeclaration classDeclaration; - final Token className; - Token superclassName = null; + final Token className,superclassName; final int pos; char[] classNameImage = SYNTAX_ERROR_CHAR; char[] superclassNameImage = null; @@ -711,7 +711,7 @@ ClassDeclaration ClassDeclaration() : return classDeclaration;} } -void ClassBody(ClassDeclaration classDeclaration) : +void ClassBody(final ClassDeclaration classDeclaration) : {} { try { @@ -738,10 +738,10 @@ void ClassBody(ClassDeclaration classDeclaration) : /** * A class can contain only methods and fields. */ -void ClassBodyDeclaration(ClassDeclaration classDeclaration) : +void ClassBodyDeclaration(final ClassDeclaration classDeclaration) : { - MethodDeclaration method; - FieldDeclaration field; + final MethodDeclaration method; + final FieldDeclaration field; } { method = MethodDeclaration() {classDeclaration.addMethod(method);} @@ -754,7 +754,7 @@ void ClassBodyDeclaration(ClassDeclaration classDeclaration) : FieldDeclaration FieldDeclaration() : { VariableDeclaration variableDeclaration; - VariableDeclaration[] list; + final VariableDeclaration[] list; final ArrayList arrayList = new ArrayList(); final int pos = SimpleCharStream.getPosition(); } @@ -824,9 +824,8 @@ VariableDeclaration VariableDeclarator() : */ String VariableDeclaratorId() : { - String expr; + final String expr; Expression expression = null; - final StringBuffer buff = new StringBuffer(); final int pos = SimpleCharStream.getPosition(); ConstantIdentifier ex; } @@ -889,7 +888,7 @@ String Variable(): String VariableName(): { final StringBuffer buff; - String expr = null; + final String expr; Expression expression = null; final Token token; } @@ -955,7 +954,7 @@ Expression VariableInitializer() : ArrayVariableDeclaration ArrayVariable() : { -Expression expr,expr2; +final Expression expr,expr2; } { expr = Expression() @@ -980,7 +979,7 @@ ArrayVariableDeclaration[] ArrayInitializer() : [ {list.add(null);}] { - ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; + final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; list.toArray(vars); return vars;} } @@ -1131,7 +1130,6 @@ ConstantIdentifier Type() : Expression Expression() : { final Expression expr; - Token bangToken = null; final int pos = SimpleCharStream.getPosition(); } { @@ -1157,7 +1155,7 @@ Expression ExpressionNoBang() : */ VarAssignation varAssignation() : { - String varName; + final String varName; final Expression initializer; final int assignOperator; final int pos = SimpleCharStream.getPosition(); @@ -1418,7 +1416,7 @@ Expression MultiplicativeExpression() : */ Expression UnaryExpression() : { - Expression expr; + final Expression expr; final int pos = SimpleCharStream.getPosition(); } { @@ -1430,7 +1428,7 @@ Expression UnaryExpression() : Expression AtUnaryExpression() : { - Expression expr; + final Expression expr; final int pos = SimpleCharStream.getPosition(); } { @@ -1445,8 +1443,8 @@ Expression AtUnaryExpression() : Expression UnaryExpressionNoPrefix() : { - Expression expr; - int operator; + final Expression expr; + final int operator; final int pos = SimpleCharStream.getPosition(); } { @@ -1478,8 +1476,7 @@ final int operator; Expression UnaryExpressionNotPlusMinus() : { - Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Expression expr; } { // expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} @@ -1516,7 +1513,7 @@ final int pos = SimpleCharStream.getPosition(); Expression PostfixExpression() : { - Expression expr; + final Expression expr; int operator = -1; final int pos = SimpleCharStream.getPosition(); } @@ -1632,7 +1629,7 @@ ConstantIdentifier ClassIdentifier(): SimpleCharStream.getPosition());} } -AbstractSuffixExpression PrimarySuffix(Expression prefix) : +AbstractSuffixExpression PrimarySuffix(final Expression prefix) : { final AbstractSuffixExpression expr; } @@ -1641,7 +1638,7 @@ AbstractSuffixExpression PrimarySuffix(Expression prefix) : | expr = VariableSuffix(prefix) {return expr;} } -AbstractSuffixExpression VariableSuffix(Expression prefix) : +AbstractSuffixExpression VariableSuffix(final Expression prefix) : { String expr = null; final int pos = SimpleCharStream.getPosition(); @@ -1695,7 +1692,7 @@ Literal Literal() : return new NullLiteral(pos-4,pos);} } -FunctionCall Arguments(Expression func) : +FunctionCall Arguments(final Expression func) : { Expression[] args = null; } @@ -1739,7 +1736,7 @@ final ArrayList list = new ArrayList(); } )* { - Expression[] arguments = new Expression[list.size()]; + final Expression[] arguments = new Expression[list.size()]; list.toArray(arguments); return arguments;} } @@ -1881,8 +1878,8 @@ Statement Statement() : HTMLBlock htmlBlock() : { final int startIndex = nodePtr; - AstNode[] blockNodes; - int nbNodes; + final AstNode[] blockNodes; + final int nbNodes; } { (phpEchoBlock())* @@ -1960,8 +1957,8 @@ PrintExpression PrintExpression() : ListExpression ListExpression() : { String expr = null; - Expression expression = null; - ArrayList list = new ArrayList(); + final Expression expression; + final ArrayList list = new ArrayList(); final int pos = SimpleCharStream.getPosition(); } { @@ -1990,8 +1987,7 @@ ListExpression ListExpression() : errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - expr = VariableDeclaratorId() - {list.add(expr);} + [expr = VariableDeclaratorId() {list.add(expr);}] )* try { @@ -2004,7 +2000,7 @@ ListExpression ListExpression() : } [ expression = Expression() { - String[] strings = new String[list.size()]; + final String[] strings = new String[list.size()]; list.toArray(strings); return new ListExpression(strings, expression, @@ -2012,7 +2008,7 @@ ListExpression ListExpression() : SimpleCharStream.getPosition());} ] { - String[] strings = new String[list.size()]; + final String[] strings = new String[list.size()]; list.toArray(strings); return new ListExpression(strings,pos,SimpleCharStream.getPosition());} } @@ -2045,7 +2041,7 @@ EchoStatement EchoStatement() : throw e; } } - {Expression[] exprs = new Expression[expressions.size()]; + {final Expression[] exprs = new Expression[expressions.size()]; expressions.toArray(exprs); return new EchoStatement(exprs,pos);} } @@ -2054,8 +2050,8 @@ GlobalStatement GlobalStatement() : { final int pos = SimpleCharStream.getPosition(); String expr; - ArrayList vars = new ArrayList(); - GlobalStatement global; + final ArrayList vars = new ArrayList(); + final GlobalStatement global; } { @@ -2068,7 +2064,7 @@ GlobalStatement GlobalStatement() : try { { - String[] strings = new String[vars.size()]; + final String[] strings = new String[vars.size()]; vars.toArray(strings); global = new GlobalStatement(currentSegment, strings, @@ -2097,7 +2093,7 @@ StaticStatement StaticStatement() : try { { - String[] strings = new String[vars.size()]; + final String[] strings = new String[vars.size()]; vars.toArray(strings); return new StaticStatement(strings, pos, @@ -2157,7 +2153,7 @@ Block Block() : throw e; } { - Statement[] statements = new Statement[list.size()]; + final Statement[] statements = new Statement[list.size()]; list.toArray(statements); return new Block(statements,pos,SimpleCharStream.getPosition());} } @@ -2208,7 +2204,7 @@ VariableDeclaration[] LocalVariableDeclaration() : {list.add(var);} ( var = LocalVariableDeclarator() {list.add(var);})* { - VariableDeclaration[] vars = new VariableDeclaration[list.size()]; + final VariableDeclaration[] vars = new VariableDeclaration[list.size()]; list.toArray(vars); return vars;} } @@ -2247,8 +2243,8 @@ EmptyStatement EmptyStatement() : Expression StatementExpression() : { - Expression expr,expr2; - int operator; + final Expression expr,expr2; + final int operator; } { expr = PreIncDecExpression() {return expr;} @@ -2319,7 +2315,7 @@ AbstractCase[] switchStatementBrace() : try { { - AbstractCase[] abcase = new AbstractCase[cases.size()]; + final AbstractCase[] abcase = new AbstractCase[cases.size()]; cases.toArray(abcase); return abcase;} } catch (ParseException e) { @@ -2365,7 +2361,7 @@ AbstractCase[] switchStatementColon(final int start, final int end) : try { { - AbstractCase[] abcase = new AbstractCase[cases.size()]; + final AbstractCase[] abcase = new AbstractCase[cases.size()]; cases.toArray(abcase); return abcase;} } catch (ParseException e) { @@ -2390,7 +2386,7 @@ AbstractCase switchLabel0() : | statement = htmlBlock() {stmts.add(statement);})* [ statement = BreakStatement() {stmts.add(statement);}] { - Statement[] stmtsArray = new Statement[stmts.size()]; + final Statement[] stmtsArray = new Statement[stmts.size()]; stmts.toArray(stmtsArray); if (expr == null) {//it's a default return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition()); @@ -2466,8 +2462,8 @@ Break BreakStatement() : IfStatement IfStatement() : { final int pos = SimpleCharStream.getPosition(); - Expression condition; - IfStatement ifStatement; + final Expression condition; + final IfStatement ifStatement; } { condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2) @@ -2502,18 +2498,18 @@ Expression Condition(final String keyword) : {return condition;} } -IfStatement IfStatement0(Expression condition, final int start,final int end) : +IfStatement IfStatement0(final Expression condition, final int start,final int end) : { Statement statement; - Statement stmt; + final Statement stmt; final Statement[] statementsArray; ElseIf elseifStatement; Else elseStatement = null; - ArrayList stmts; + final ArrayList stmts; final ArrayList elseIfList = new ArrayList(); - ElseIf[] elseIfs; + final ElseIf[] elseIfs; int pos = SimpleCharStream.getPosition(); - int endStatements; + final int endStatements; } { @@ -2607,7 +2603,7 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) : ElseIf ElseIfStatementColon() : { - Expression condition; + final Expression condition; Statement statement; final ArrayList list = new ArrayList(); final int pos = SimpleCharStream.getPosition(); @@ -2617,7 +2613,7 @@ ElseIf ElseIfStatementColon() : ( statement = Statement() {list.add(statement);} | statement = htmlBlock() {list.add(statement);})* { - Statement[] stmtsArray = new Statement[list.size()]; + final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());} } @@ -2632,22 +2628,22 @@ Else ElseStatementColon() : ( statement = Statement() {list.add(statement);} | statement = htmlBlock() {list.add(statement);})* { - Statement[] stmtsArray = new Statement[list.size()]; + final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); return new Else(stmtsArray,pos,SimpleCharStream.getPosition());} } ElseIf ElseIfStatement() : { - Expression condition; - Statement statement; + final Expression condition; + final Statement statement; final ArrayList list = new ArrayList(); final int pos = SimpleCharStream.getPosition(); } { condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/} { - Statement[] stmtsArray = new Statement[list.size()]; + final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());} } @@ -2695,7 +2691,7 @@ Statement WhileStatement0(final int start, final int end) : try { { - Statement[] stmtsArray = new Statement[stmts.size()]; + final Statement[] stmtsArray = new Statement[stmts.size()]; stmts.toArray(stmtsArray); return new Block(stmtsArray,pos,SimpleCharStream.getPosition());} } catch (ParseException e) { @@ -2859,7 +2855,7 @@ final int startBlock, endBlock; try { { - Statement[] stmtsArray = new Statement[list.size()]; + final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());} } catch (ParseException e) { @@ -2874,7 +2870,7 @@ final int startBlock, endBlock; Expression[] ForInit() : { - Expression[] exprs; + final Expression[] exprs; } { LOOKAHEAD(LocalVariableDeclaration()) @@ -2888,13 +2884,13 @@ Expression[] ForInit() : Expression[] StatementExpressionList() : { final ArrayList list = new ArrayList(); - Expression expr; + final Expression expr; } { expr = StatementExpression() {list.add(expr);} ( StatementExpression() {list.add(expr);})* { - Expression[] exprsArray = new Expression[list.size()]; + final Expression[] exprsArray = new Expression[list.size()]; list.toArray(exprsArray); return exprsArray;} } diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java index c1bf446..3962da9 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java @@ -8,7 +8,6 @@ import org.eclipse.ui.texteditor.MarkerUtilities; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; -import net.sourceforge.phpdt.internal.compiler.parser.Parser; import java.text.MessageFormat; import java.util.Hashtable; diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 8fd6c8f..3374c31 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -1540,7 +1540,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xfffffffbffffffffL & l) != 0L) jjCheckNAddStates(31, 33); break; - case 39: + case 40: if (curChar == 34) jjCheckNAddStates(31, 33); break; @@ -1552,7 +1552,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xfffffffbffffffffL & l) != 0L) jjCheckNAddStates(34, 36); break; - case 43: + case 44: if (curChar == 34) jjCheckNAddStates(34, 36); break; @@ -1568,7 +1568,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xffffff7fffffffffL & l) != 0L) jjCheckNAddStates(37, 39); break; - case 48: + case 49: if (curChar == 39) jjCheckNAddStates(37, 39); break; @@ -1580,7 +1580,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xffffff7fffffffffL & l) != 0L) jjCheckNAddStates(40, 42); break; - case 52: + case 53: if (curChar == 39) jjCheckNAddStates(40, 42); break; @@ -1671,64 +1671,84 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(31, 33); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(31, 33); + break; + case 39: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 40; break; case 40: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 39; + jjCheckNAddStates(31, 33); break; case 42: - jjAddStates(34, 36); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(34, 36); + break; + case 43: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 44; break; case 44: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 43; + jjCheckNAddStates(34, 36); break; case 47: - jjAddStates(37, 39); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(37, 39); + break; + case 48: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 49; break; case 49: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 48; + jjCheckNAddStates(37, 39); break; case 51: - jjAddStates(40, 42); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(40, 42); + break; + case 52: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 53; break; case 53: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 52; + jjCheckNAddStates(40, 42); break; case 55: if (curChar == 96) jjCheckNAddStates(49, 54); break; case 56: - if ((0xfffffffeffffffffL & l) != 0L) + if ((0xfffffffeefffffffL & l) != 0L) jjCheckNAddStates(43, 45); break; case 57: - if (curChar == 96) - jjCheckNAddStates(43, 45); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 58; break; case 58: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 57; + if ((0x110000000L & l) != 0L) + jjCheckNAddStates(43, 45); break; case 59: if (curChar == 96 && kind > 103) kind = 103; break; case 60: - if ((0xfffffffeffffffffL & l) != 0L) + if ((0xfffffffeefffffffL & l) != 0L) jjCheckNAddStates(46, 48); break; case 61: - if (curChar == 96) - jjCheckNAddStates(46, 48); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 62; break; case 62: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 61; + if ((0x110000000L & l) != 0L) + jjCheckNAddStates(46, 48); break; case 63: if (curChar == 96 && kind > 106) @@ -1878,10 +1898,10 @@ static private final int jjMoveStringLiteralDfa3_3(long old0, long active0) return 4; } static final int[] jjnextStates = { - 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, 40, 41, - 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, - 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, 60, 62, - 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, 32, + 19, 20, 25, 26, 29, 30, 12, 47, 48, 50, 51, 52, 54, 38, 39, 41, + 42, 43, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, + 39, 41, 42, 43, 45, 47, 48, 50, 51, 52, 54, 56, 57, 59, 60, 61, + 63, 56, 57, 59, 60, 61, 63, 10, 11, 23, 24, 27, 28, 31, 32, }; public static final String[] jjstrLiteralImages = { "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, -- 1.7.1