From 7a9dfd709fd04e7e876d3a3337dcee5a6982adef Mon Sep 17 00:00:00 2001 From: kpouer Date: Sun, 10 Aug 2003 15:47:40 +0000 Subject: [PATCH] lot of fixes code analysis works better --- net.sourceforge.phpeclipse/src/test/PHPParser.java | 2316 +++++++++++--------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 526 +++-- .../src/test/TokenMgrError.java | 2 +- 3 files changed, 1574 insertions(+), 1270 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 41f6cd4..712dbc0 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -46,7 +46,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon private static int errorEnd = -1; private static PHPDocument phpDocument; - private static final char[] SYNTAX_ERROR_CHAR = {'s','y','n','t','a','x',' ','e','r','r','o','r'}; + private static final String SYNTAX_ERROR_CHAR = "syntax error"; /** * The point where html starts. * It will be used by the token manager to create HTMLCode objects @@ -195,8 +195,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon if (errorStart == -1) { setMarker(fileToParse, errorMessage, - SimpleCharStream.tokenBegin, - SimpleCharStream.tokenBegin + e.currentToken.image.length(), + e.currentToken.sourceStart, + e.currentToken.sourceEnd, errorLevel, "Line " + e.currentToken.beginLine); } else { @@ -372,6 +372,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -448,6 +449,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -506,9 +508,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public PHPEchoBlock phpEchoBlock() throws ParseException { final Expression expr; - final int pos = SimpleCharStream.getPosition(); final PHPEchoBlock echoBlock; - jj_consume_token(PHPECHOSTART); + final Token token, token2; + token = jj_consume_token(PHPECHOSTART); expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: @@ -518,8 +520,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_la1[4] = jj_gen; ; } - jj_consume_token(PHPEND); - echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition()); + token2 = jj_consume_token(PHPEND); + echoBlock = new PHPEchoBlock(expr,token.sourceStart,token.sourceEnd); pushOnAstNodes(echoBlock); {if (true) return echoBlock;} throw new Error("Missing return statement in function"); @@ -562,6 +564,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -582,15 +585,14 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public ClassDeclaration ClassDeclaration() throws ParseException { final ClassDeclaration classDeclaration; - final Token className,superclassName; - final int pos; - char[] classNameImage = SYNTAX_ERROR_CHAR; - char[] superclassNameImage = null; - jj_consume_token(CLASS); - pos = SimpleCharStream.getPosition(); + Token className = null; + final Token superclassName, token; + String classNameImage = SYNTAX_ERROR_CHAR; + String superclassNameImage = null; + token = jj_consume_token(CLASS); try { className = jj_consume_token(IDENTIFIER); - classNameImage = className.image.toCharArray(); + classNameImage = className.image; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; @@ -603,7 +605,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_consume_token(EXTENDS); try { superclassName = jj_consume_token(IDENTIFIER); - superclassNameImage = superclassName.image.toCharArray(); + superclassNameImage = superclassName.image; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; @@ -617,17 +619,26 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_la1[6] = jj_gen; ; } + int start, end; + if (className == null) { + start = token.sourceStart; + end = token.sourceEnd; + } else { + start = className.sourceStart; + end = className.sourceEnd; + } if (superclassNameImage == null) { + classDeclaration = new ClassDeclaration(currentSegment, classNameImage, - pos, - 0); + start, + end); } else { classDeclaration = new ClassDeclaration(currentSegment, classNameImage, superclassNameImage, - pos, - 0); + start, + end); } currentSegment.add(classDeclaration); currentSegment = classDeclaration; @@ -705,10 +716,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon final VariableDeclaration[] list; final ArrayList arrayList = new ArrayList(); final int pos = SimpleCharStream.getPosition(); - jj_consume_token(VAR); + final Token token; + Token token2 = null; + token = jj_consume_token(VAR); variableDeclaration = VariableDeclaratorNoSuffix(); arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name())); + outlineInfo.addVariable(variableDeclaration.name()); label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -722,10 +735,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_consume_token(COMMA); variableDeclaration = VariableDeclaratorNoSuffix(); arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name())); + outlineInfo.addVariable(variableDeclaration.name()); } try { - jj_consume_token(SEMICOLON); + token2 = jj_consume_token(SEMICOLON); } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration"; errorLevel = ERROR; @@ -735,9 +748,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } list = new VariableDeclaration[arrayList.size()]; arrayList.toArray(list); + int end; + if (token2 == null) { + end = list[list.length-1].sourceEnd; + } else { + end = token2.sourceEnd; + } {if (true) return new FieldDeclaration(list, - pos, - SimpleCharStream.getPosition(), + token.sourceStart, + end, currentSegment);} throw new Error("Missing return statement in function"); } @@ -750,7 +769,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon final Token varName; Expression initializer = null; varName = jj_consume_token(DOLLAR_ID); - final int pos = SimpleCharStream.getPosition()-varName.image.length(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); @@ -773,8 +791,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon new Variable(varName.image.substring(1), varName.sourceStart, varName.sourceEnd), - pos, - SimpleCharStream.getPosition());} + varName.sourceStart, + varName.sourceEnd);} } {if (true) return new VariableDeclaration(currentSegment, new Variable(varName.image.substring(1), @@ -782,7 +800,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon varName.sourceEnd), initializer, VariableDeclaration.EQUAL, - pos);} + varName.sourceStart);} throw new Error("Missing return statement in function"); } @@ -792,7 +810,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public VariableDeclaration VariableDeclarator() throws ParseException { final AbstractVariable variable; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); variable = VariableDeclaratorId(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: @@ -814,14 +831,14 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon if (initializer == null) { {if (true) return new VariableDeclaration(currentSegment, variable, - pos, - SimpleCharStream.getPosition());} + variable.sourceStart, + variable.sourceEnd);} } {if (true) return new VariableDeclaration(currentSegment, variable, initializer, VariableDeclaration.EQUAL, - pos);} + variable.sourceStart);} throw new Error("Missing return statement in function"); } @@ -861,43 +878,67 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** * Return a variablename without the $. * @return a variable name - */ - static final public Variable Variable() throws ParseException { + *//* +Variable Variable(): +{ final StringBuffer buff; Expression expression = null; final Token token; Variable expr; final int pos; +} +{ + token = + [ expression = Expression() ] + { + if (expression == null) { + return new Variable(token.image.substring(1), + token.sourceStart, + token.sourceEnd); + } + String s = expression.toStringExpression(); + buff = new StringBuffer(token.image.length()+s.length()+2); + buff.append(token.image); + buff.append("{"); + buff.append(s); + buff.append("}"); + s = buff.toString(); + return new Variable(s,token.sourceStart,token.sourceEnd); + } +| + token = + expr = VariableName() + {return new Variable(expr,token.sourceStart,expr.sourceEnd);} +} */ + static final public Variable Variable() throws ParseException { + Variable variable = null; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR_ID: token = jj_consume_token(DOLLAR_ID); - pos = SimpleCharStream.getPosition()-token.image.length(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOLLAR: + case IDENTIFIER: case LBRACE: - jj_consume_token(LBRACE); - expression = Expression(); - jj_consume_token(RBRACE); + case DOLLAR_ID: + variable = Var(token); break; default: jj_la1[12] = jj_gen; ; } - if (expression == null) { + if (variable == null) { {if (true) return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd);} } - String s = expression.toStringExpression(); - buff = new StringBuffer(token.image.length()+s.length()+2); - buff.append(token.image); - buff.append("{"); - buff.append(s); - buff.append("}"); - s = buff.toString(); - {if (true) return new Variable(s,token.sourceStart,token.sourceEnd);} + final StringBuffer buff = new StringBuffer(); + buff.append(token.image.substring(1)); + buff.append(variable.toStringExpression()); + {if (true) return new Variable(buff.toString(),token.sourceStart,variable.sourceEnd);} break; case DOLLAR: token = jj_consume_token(DOLLAR); - expr = VariableName(); - {if (true) return new Variable(expr,token.sourceStart,expr.sourceEnd);} + variable = Var(token); + {if (true) return new Variable(variable,token.sourceStart,variable.sourceEnd);} break; default: jj_la1[13] = jj_gen; @@ -907,11 +948,42 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon throw new Error("Missing return statement in function"); } + static final public Variable Var(final Token dollar) throws ParseException { + Variable variable; + final Token token; + ConstantIdentifier constant; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOLLAR_ID: + token = jj_consume_token(DOLLAR_ID); + variable = Var(token); + final StringBuffer buff = new StringBuffer(); + buff.append(token.image.substring(1)); + buff.append(variable.toStringExpression()); + {if (true) return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd);} + break; + case DOLLAR: + token = jj_consume_token(DOLLAR); + variable = Var(token); + {if (true) return new Variable(variable,dollar.sourceStart,variable.sourceEnd);} + break; + case IDENTIFIER: + case LBRACE: + constant = VariableName(); + {if (true) return new Variable(constant.name,dollar.sourceStart,constant.sourceEnd);} + break; + default: + jj_la1[14] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + throw new Error("Missing return statement in function"); + } + /** * A Variable name (without the $) * @return a variable name String */ - static final public Variable VariableName() throws ParseException { + static final public ConstantIdentifier VariableName() throws ParseException { final StringBuffer buff; String expr; final Variable var; @@ -922,7 +994,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: token = jj_consume_token(LBRACE); - pos = SimpleCharStream.getPosition()-1; expression = Expression(); token2 = jj_consume_token(RBRACE); expr = expression.toStringExpression(); @@ -932,13 +1003,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon buff.append("}"); pos = SimpleCharStream.getPosition(); expr = buff.toString(); - {if (true) return new Variable(expr, - token.sourceStart, - token2.sourceEnd);} + {if (true) return new ConstantIdentifier(expr, + token.sourceStart, + token2.sourceEnd);} break; case IDENTIFIER: token = jj_consume_token(IDENTIFIER); - pos = SimpleCharStream.getPosition() - token.image.length(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: jj_consume_token(LBRACE); @@ -946,13 +1016,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon token2 = jj_consume_token(RBRACE); break; default: - jj_la1[14] = jj_gen; + jj_la1[15] = jj_gen; ; } if (expression == null) { - {if (true) return new Variable(token.image, - token.sourceStart, - token.sourceEnd);} + {if (true) return new ConstantIdentifier(token.image, + token.sourceStart, + token.sourceEnd);} } expr = expression.toStringExpression(); buff = new StringBuffer(token.image.length()+expr.length()+2); @@ -961,25 +1031,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon buff.append(expr); buff.append("}"); expr = buff.toString(); - {if (true) return new Variable(expr, - token.sourceStart, - token2.sourceEnd);} - break; - case DOLLAR: - jj_consume_token(DOLLAR); - var = VariableName(); - {if (true) return new Variable(var, - var.sourceStart-1, - var.sourceEnd);} - break; - case DOLLAR_ID: - token = jj_consume_token(DOLLAR_ID); - {if (true) return new Variable(token.image, - token.sourceStart, - token.sourceEnd);} + {if (true) return new ConstantIdentifier(expr, + token.sourceStart, + token2.sourceEnd);} break; default: - jj_la1[15] = jj_gen; + jj_la1[16] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1009,7 +1066,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[16] = jj_gen; + jj_la1[17] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1027,7 +1084,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[17] = jj_gen; + jj_la1[18] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1044,7 +1101,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[18] = jj_gen; + jj_la1[19] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1061,7 +1118,7 @@ final Expression expr,expr2; {if (true) return new ArrayVariableDeclaration(expr,expr2);} break; default: - jj_la1[19] = jj_gen; + jj_la1[20] = jj_gen; ; } {if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());} @@ -1087,6 +1144,7 @@ final Expression expr,expr2; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1108,7 +1166,7 @@ final Expression expr,expr2; } break; default: - jj_la1[20] = jj_gen; + jj_la1[21] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1117,7 +1175,7 @@ final Expression expr,expr2; list.add(null); break; default: - jj_la1[21] = jj_gen; + jj_la1[22] = jj_gen; ; } jj_consume_token(RPAREN); @@ -1135,9 +1193,10 @@ final Expression expr,expr2; final MethodDeclaration functionDeclaration; final Block block; final OutlineableWithChildren seg = currentSegment; - jj_consume_token(FUNCTION); + final Token token; + token = jj_consume_token(FUNCTION); try { - functionDeclaration = MethodDeclarator(); + functionDeclaration = MethodDeclarator(token.sourceStart); outlineInfo.addVariable(new String(functionDeclaration.name)); } catch (ParseException e) { if (errorMessage != null) {if (true) throw e;} @@ -1160,23 +1219,23 @@ final Expression expr,expr2; * [&] IDENTIFIER(parameters ...). * @return a function description for the outline */ - static final public MethodDeclaration MethodDeclarator() throws ParseException { - final Token identifier; + static final public MethodDeclaration MethodDeclarator(final int start) throws ParseException { + Token identifier = null; Token reference = null; - final Hashtable formalParameters; - final int pos = SimpleCharStream.getPosition(); - char[] identifierChar = SYNTAX_ERROR_CHAR; + final Hashtable formalParameters = new Hashtable(); + String identifierChar = SYNTAX_ERROR_CHAR; + final int end; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: reference = jj_consume_token(BIT_AND); break; default: - jj_la1[22] = jj_gen; + jj_la1[23] = jj_gen; ; } try { identifier = jj_consume_token(IDENTIFIER); - identifierChar = identifier.image.toCharArray(); + identifierChar = identifier.image; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; errorLevel = ERROR; @@ -1184,14 +1243,28 @@ final Expression expr,expr2; errorEnd = SimpleCharStream.getPosition() + 1; processParseExceptionDebug(e); } - formalParameters = FormalParameters(); - MethodDeclaration method = new MethodDeclaration(currentSegment, - identifierChar, - formalParameters, - reference != null, - pos, - SimpleCharStream.getPosition()); - {if (true) return method;} + end = FormalParameters(formalParameters); + int nameStart, nameEnd; + if (identifier == null) { + if (reference == null) { + nameStart = start + 9; + nameEnd = start + 10; + } else { + nameStart = reference.sourceEnd + 1; + nameEnd = reference.sourceEnd + 2; + } + } else { + nameStart = identifier.sourceStart; + nameEnd = identifier.sourceEnd; + } + {if (true) return new MethodDeclaration(currentSegment, + identifierChar, + formalParameters, + reference != null, + nameStart, + nameEnd, + start, + end);} throw new Error("Missing return statement in function"); } @@ -1199,9 +1272,10 @@ final Expression expr,expr2; * FormalParameters follows method identifier. * (FormalParameter()) */ - static final public Hashtable FormalParameters() throws ParseException { + static final public int FormalParameters(final Hashtable parameters) throws ParseException { VariableDeclaration var; - final Hashtable parameters = new Hashtable(); + final Token token; + int end; try { jj_consume_token(LPAREN); } catch (ParseException e) { @@ -1223,7 +1297,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[23] = jj_gen; + jj_la1[24] = jj_gen; break label_7; } jj_consume_token(COMMA); @@ -1232,19 +1306,21 @@ final Expression expr,expr2; } break; default: - jj_la1[24] = jj_gen; + jj_la1[25] = jj_gen; ; } try { - jj_consume_token(RPAREN); + token = jj_consume_token(RPAREN); + end = token.sourceEnd; } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; processParseExceptionDebug(e); + end = e.currentToken.sourceStart; } - {if (true) return parameters;} + {if (true) return end;} throw new Error("Missing return statement in function"); } @@ -1260,7 +1336,7 @@ final Expression expr,expr2; token = jj_consume_token(BIT_AND); break; default: - jj_la1[25] = jj_gen; + jj_la1[26] = jj_gen; ; } variableDeclaration = VariableDeclaratorNoSuffix(); @@ -1311,7 +1387,7 @@ final Expression expr,expr2; {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[26] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1321,7 +1397,6 @@ final Expression expr,expr2; static final public Expression Expression() throws ParseException { final Expression expr; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); int assignOperator = -1; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: @@ -1336,6 +1411,7 @@ final Expression expr,expr2; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1371,7 +1447,7 @@ final Expression expr,expr2; } break; default: - jj_la1[27] = jj_gen; + jj_la1[28] = jj_gen; ; } if (assignOperator != -1) {// todo : change this, very very bad :( @@ -1398,7 +1474,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[28] = jj_gen; + jj_la1[29] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1407,12 +1483,12 @@ final Expression expr,expr2; static final public Expression ExpressionWBang() throws ParseException { final Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BANG: - jj_consume_token(BANG); + token = jj_consume_token(BANG); expr = ExpressionWBang(); - {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} break; case LIST: case PRINT: @@ -1420,7 +1496,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[29] = jj_gen; + jj_la1[30] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1439,7 +1515,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[30] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1505,7 +1581,7 @@ final Expression expr,expr2; {if (true) return VariableDeclaration.TILDE_EQUAL;} break; default: - jj_la1[31] = jj_gen; + jj_la1[32] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1525,7 +1601,7 @@ final Expression expr,expr2; expr3 = ConditionalExpression(); break; default: - jj_la1[32] = jj_gen; + jj_la1[33] = jj_gen; ; } if (expr3 == null) { @@ -1547,7 +1623,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[33] = jj_gen; + jj_la1[34] = jj_gen; break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1560,7 +1636,7 @@ final Expression expr,expr2; operator = OperatorIds.ORL; break; default: - jj_la1[34] = jj_gen; + jj_la1[35] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1583,7 +1659,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[35] = jj_gen; + jj_la1[36] = jj_gen; break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1596,7 +1672,7 @@ final Expression expr,expr2; operator = OperatorIds.ANDL; break; default: - jj_la1[36] = jj_gen; + jj_la1[37] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1617,7 +1693,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[37] = jj_gen; + jj_la1[38] = jj_gen; break label_10; } jj_consume_token(DOT); @@ -1638,7 +1714,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[38] = jj_gen; + jj_la1[39] = jj_gen; break label_11; } jj_consume_token(BIT_OR); @@ -1659,7 +1735,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[39] = jj_gen; + jj_la1[40] = jj_gen; break label_12; } jj_consume_token(XOR); @@ -1680,7 +1756,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[40] = jj_gen; + jj_la1[41] = jj_gen; break label_13; } jj_consume_token(BIT_AND); @@ -1706,7 +1782,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[41] = jj_gen; + jj_la1[42] = jj_gen; break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1731,7 +1807,7 @@ final Expression expr,expr2; operator = OperatorIds.EQUAL_EQUAL_EQUAL; break; default: - jj_la1[42] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1767,7 +1843,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[43] = jj_gen; + jj_la1[44] = jj_gen; break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1788,7 +1864,7 @@ final Expression expr,expr2; operator = OperatorIds.GREATER_EQUAL; break; default: - jj_la1[44] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1812,7 +1888,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1829,7 +1905,7 @@ final Expression expr,expr2; operator = OperatorIds.UNSIGNED_RIGHT_SHIFT; break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1852,7 +1928,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1865,7 +1941,7 @@ final Expression expr,expr2; operator = OperatorIds.MINUS; break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1898,7 +1974,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1915,7 +1991,7 @@ final Expression expr,expr2; operator = OperatorIds.REMAINDER; break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1931,7 +2007,6 @@ final Expression expr,expr2; */ static final public Expression UnaryExpression() throws ParseException { final Expression expr; - final int pos = SimpleCharStream.getPosition(); /* expr = UnaryExpressionNoPrefix() //why did I had that ? {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} | */ @@ -1946,17 +2021,17 @@ final Expression expr,expr2; */ static final public Expression AtNotUnaryExpression() throws ParseException { final Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: - jj_consume_token(AT); + token = jj_consume_token(AT); expr = AtNotUnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);} + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);} break; case BANG: - jj_consume_token(BANG); + token = jj_consume_token(BANG); expr = AtNotUnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} break; case ARRAY: case NEW: @@ -1968,6 +2043,7 @@ final Expression expr,expr2; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1978,7 +2054,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[51] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1987,17 +2063,21 @@ final Expression expr,expr2; static final public Expression UnaryExpressionNoPrefix() throws ParseException { final Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: - jj_consume_token(PLUS); + token = jj_consume_token(PLUS); expr = AtNotUnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.PLUS,pos);} + {if (true) return new PrefixedUnaryExpression(expr, + OperatorIds.PLUS, + token.sourceStart);} break; case MINUS: - jj_consume_token(MINUS); + token = jj_consume_token(MINUS); expr = AtNotUnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.MINUS,pos);} + {if (true) return new PrefixedUnaryExpression(expr, + OperatorIds.MINUS, + token.sourceStart);} break; case PLUS_PLUS: case MINUS_MINUS: @@ -2010,6 +2090,7 @@ final Expression expr,expr2; case TRUE: case FALSE: case DOLLAR: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -2020,7 +2101,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2030,29 +2111,28 @@ final Expression expr,expr2; static final public Expression PreIncDecExpression() throws ParseException { final Expression expr; final int operator; - final int pos = SimpleCharStream.getPosition(); +final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS_PLUS: - jj_consume_token(PLUS_PLUS); - operator = OperatorIds.PLUS_PLUS; + token = jj_consume_token(PLUS_PLUS); + operator = OperatorIds.PLUS_PLUS; break; case MINUS_MINUS: - jj_consume_token(MINUS_MINUS); - operator = OperatorIds.MINUS_MINUS; + token = jj_consume_token(MINUS_MINUS); + operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } expr = PrimaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr,operator,pos);} + {if (true) return new PrefixedUnaryExpression(expr,operator,token.sourceStart);} throw new Error("Missing return statement in function"); } static final public Expression UnaryExpressionNotPlusMinus() throws ParseException { final Expression expr; - final int pos = SimpleCharStream.getPosition(); if (jj_2_3(2147483647)) { expr = CastExpression(); {if (true) return expr;} @@ -2061,6 +2141,7 @@ final int operator; case ARRAY: case NEW: case DOLLAR: + case BIT_AND: case IDENTIFIER: case DOLLAR_ID: expr = PostfixExpression(); @@ -2090,7 +2171,7 @@ final int operator; {if (true) return expr;} break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2120,7 +2201,7 @@ final Token token,token1; type = new ConstantIdentifier(token); break; default: - jj_la1[55] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2148,13 +2229,13 @@ final Token token,token1; operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[56] = jj_gen; + jj_la1[57] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[57] = jj_gen; + jj_la1[58] = jj_gen; ; } if (operator == -1) { @@ -2166,15 +2247,46 @@ final Token token,token1; static final public Expression PrimaryExpression() throws ParseException { Expression expr = null; - Expression expr2; + Token token = null; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case NEW: + case DOLLAR: + case BIT_AND: + case IDENTIFIER: + case DOLLAR_ID: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BIT_AND: + token = jj_consume_token(BIT_AND); + break; + default: + jj_la1[59] = jj_gen; + ; + } + expr = refPrimaryExpression(token); + {if (true) return expr;} + break; + case ARRAY: + expr = ArrayDeclarator(); + {if (true) return expr;} + break; + default: + jj_la1[60] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + throw new Error("Missing return statement in function"); + } + + static final public Expression refPrimaryExpression(final Token reference) throws ParseException { + Expression expr = null; + Expression expr2 = null; int assignOperator = -1; final Token identifier; final String var; - final int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: - token = jj_consume_token(IDENTIFIER); - expr = new ConstantIdentifier(token); + identifier = jj_consume_token(IDENTIFIER); + expr = new ConstantIdentifier(identifier); label_19: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2182,7 +2294,7 @@ final Token token,token1; ; break; default: - jj_la1[58] = jj_gen; + jj_la1[61] = jj_gen; break label_19; } jj_consume_token(STATICCLASSACCESS); @@ -2193,13 +2305,24 @@ final Token token,token1; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: - expr = Arguments(expr); + expr2 = Arguments(expr); break; default: - jj_la1[59] = jj_gen; + jj_la1[62] = jj_gen; ; } - {if (true) return expr;} + if (expr2 == null) { + if (reference != null) { + ParseException e = generateParseException(); + errorMessage = "you cannot use a constant by reference"; + errorLevel = ERROR; + errorStart = reference.sourceStart; + errorEnd = reference.sourceEnd; + processParseExceptionDebug(e); + } + {if (true) return expr;} + } + {if (true) return expr2;} break; case DOLLAR: case DOLLAR_ID: @@ -2209,7 +2332,7 @@ final Token token,token1; expr = Arguments(expr); break; default: - jj_la1[60] = jj_gen; + jj_la1[63] = jj_gen; ; } {if (true) return expr;} @@ -2217,25 +2340,27 @@ final Token token,token1; case NEW: token = jj_consume_token(NEW); expr = ClassIdentifier(); - expr = new PrefixedUnaryExpression(expr, - OperatorIds.NEW, - token.sourceStart); + int start; + if (reference == null) { + start = token.sourceStart; + } else { + start = reference.sourceStart; + } + expr = new ClassInstantiation(expr, + reference != null, + start); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: expr = Arguments(expr); break; default: - jj_la1[61] = jj_gen; + jj_la1[64] = jj_gen; ; } {if (true) return expr;} break; - case ARRAY: - expr = ArrayDeclarator(); - {if (true) return expr;} - break; default: - jj_la1[62] = jj_gen; + jj_la1[65] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2249,41 +2374,10 @@ final Token token,token1; */ static final public ArrayInitializer ArrayDeclarator() throws ParseException { final ArrayVariableDeclaration[] vars; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(ARRAY); - vars = ArrayInitializer(); - {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());} - throw new Error("Missing return statement in function"); - } - - static final public PrefixedUnaryExpression classInstantiation() throws ParseException { - Expression expr; - final StringBuffer buff; - final int pos; final Token token; - token = jj_consume_token(NEW); - expr = ClassIdentifier(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case NEW: - case DOLLAR: - case IDENTIFIER: - case DOLLAR_ID: - pos = expr.sourceStart; - buff = new StringBuffer(expr.toStringExpression()); - expr = PrimaryExpression(); - buff.append(expr.toStringExpression()); - expr = new ConstantIdentifier(buff.toString(), - expr.sourceStart, - expr.sourceEnd); - break; - default: - jj_la1[63] = jj_gen; - ; - } - {if (true) return new PrefixedUnaryExpression(expr, - OperatorIds.NEW, - token.sourceStart);} + token = jj_consume_token(ARRAY); + vars = ArrayInitializer(); + {if (true) return new ArrayInitializer(vars,token.sourceStart,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } @@ -2314,7 +2408,7 @@ final Token token,token1; {if (true) return expr;} break; default: - jj_la1[64] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2332,7 +2426,7 @@ final Token token,token1; case CLASSACCESS: jj_consume_token(CLASSACCESS); try { - expr = VariableName(); + expression = VariableName(); } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; errorLevel = ERROR; @@ -2341,7 +2435,7 @@ final Token token,token1; {if (true) throw e;} } {if (true) return new ClassAccess(prefix, - expr, + expression, ClassAccess.NORMAL);} break; case LBRACKET: @@ -2370,6 +2464,7 @@ final Token token,token1; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -2391,6 +2486,7 @@ final Token token,token1; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -2411,13 +2507,13 @@ final Token token,token1; expression = Type(); break; default: - jj_la1[65] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[66] = jj_gen; + jj_la1[68] = jj_gen; ; } try { @@ -2432,7 +2528,7 @@ final Token token,token1; {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());} break; default: - jj_la1[67] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2467,7 +2563,7 @@ final Token token,token1; {if (true) return new NullLiteral(token);} break; default: - jj_la1[68] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2476,6 +2572,7 @@ final Token token,token1; static final public FunctionCall Arguments(final Expression func) throws ParseException { Expression[] args = null; +final Token token; jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: @@ -2492,6 +2589,7 @@ Expression[] args = null; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -2501,11 +2599,11 @@ Expression[] args = null; args = ArgumentList(); break; default: - jj_la1[69] = jj_gen; + jj_la1[71] = jj_gen; ; } try { - jj_consume_token(RPAREN); + token = jj_consume_token(RPAREN); } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; errorLevel = ERROR; @@ -2513,7 +2611,7 @@ Expression[] args = null; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } - {if (true) return new FunctionCall(func,args,SimpleCharStream.getPosition());} + {if (true) return new FunctionCall(func,args,token.sourceEnd);} throw new Error("Missing return statement in function"); } @@ -2534,7 +2632,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[70] = jj_gen; + jj_la1[72] = jj_gen; break label_20; } jj_consume_token(COMMA); @@ -2625,12 +2723,13 @@ final ArrayList list = new ArrayList(); token = jj_consume_token(AT); break; default: - jj_la1[71] = jj_gen; + jj_la1[73] = jj_gen; ; } statement = IncludeStatement(); if (token != null) { ((InclusionStatement)statement).silent = true; + statement.sourceStart = token.sourceStart; } {if (true) return statement;} break; @@ -2647,7 +2746,7 @@ final ArrayList list = new ArrayList(); currentSegment.add((Outlineable)statement);{if (true) return statement;} break; default: - jj_la1[72] = jj_gen; + jj_la1[74] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2662,9 +2761,11 @@ final ArrayList list = new ArrayList(); */ static final public Statement expressionStatement() throws ParseException { final Statement statement; + final Token token; statement = Expression(); try { - jj_consume_token(SEMICOLON); + token = jj_consume_token(SEMICOLON); + statement.sourceEnd = token.sourceEnd; } catch (ParseException e) { if (e.currentToken.next.kind != PHPParserConstants.PHPEND) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; @@ -2771,6 +2872,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -2787,7 +2889,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[73] = jj_gen; + jj_la1[75] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2809,7 +2911,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[74] = jj_gen; + jj_la1[76] = jj_gen; break label_21; } phpEchoBlock(); @@ -2823,7 +2925,7 @@ final ArrayList list = new ArrayList(); jj_consume_token(PHPSTARTSHORT); break; default: - jj_la1[75] = jj_gen; + jj_la1[77] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2848,27 +2950,27 @@ final ArrayList list = new ArrayList(); static final public InclusionStatement IncludeStatement() throws ParseException { final Expression expr; final int keyword; - final int pos = SimpleCharStream.getPosition(); final InclusionStatement inclusionStatement; + final Token token, token2; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case REQUIRE: - jj_consume_token(REQUIRE); - keyword = InclusionStatement.REQUIRE; + token = jj_consume_token(REQUIRE); + keyword = InclusionStatement.REQUIRE; break; case REQUIRE_ONCE: - jj_consume_token(REQUIRE_ONCE); - keyword = InclusionStatement.REQUIRE_ONCE; + token = jj_consume_token(REQUIRE_ONCE); + keyword = InclusionStatement.REQUIRE_ONCE; break; case INCLUDE: - jj_consume_token(INCLUDE); - keyword = InclusionStatement.INCLUDE; + token = jj_consume_token(INCLUDE); + keyword = InclusionStatement.INCLUDE; break; case INCLUDE_ONCE: - jj_consume_token(INCLUDE_ONCE); - keyword = InclusionStatement.INCLUDE_ONCE; + token = jj_consume_token(INCLUDE_ONCE); + keyword = InclusionStatement.INCLUDE_ONCE; break; default: - jj_la1[76] = jj_gen; + jj_la1[78] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2887,10 +2989,10 @@ final ArrayList list = new ArrayList(); inclusionStatement = new InclusionStatement(currentSegment, keyword, expr, - pos); + token.sourceStart); currentSegment.add(inclusionStatement); try { - jj_consume_token(SEMICOLON); + token2 = jj_consume_token(SEMICOLON); } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; @@ -2898,7 +3000,8 @@ final ArrayList list = new ArrayList(); errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } - {if (true) return inclusionStatement;} + inclusionStatement.sourceEnd = token2.sourceEnd; + {if (true) return inclusionStatement;} throw new Error("Missing return statement in function"); } @@ -2933,7 +3036,7 @@ final ArrayList list = new ArrayList(); list.add(expr); break; default: - jj_la1[77] = jj_gen; + jj_la1[79] = jj_gen; ; } if (expr == null) list.add(null); @@ -2944,7 +3047,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[78] = jj_gen; + jj_la1[80] = jj_gen; break label_22; } try { @@ -2963,7 +3066,7 @@ final ArrayList list = new ArrayList(); list.add(expr); break; default: - jj_la1[79] = jj_gen; + jj_la1[81] = jj_gen; ; } } @@ -2988,7 +3091,7 @@ final ArrayList list = new ArrayList(); SimpleCharStream.getPosition());} break; default: - jj_la1[80] = jj_gen; + jj_la1[82] = jj_gen; ; } final Variable[] vars = new Variable[list.size()]; @@ -3004,8 +3107,9 @@ final ArrayList list = new ArrayList(); static final public EchoStatement EchoStatement() throws ParseException { final ArrayList expressions = new ArrayList(); Expression expr; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(ECHO); + Token token; + Token token2 = null; + token = jj_consume_token(ECHO); expr = Expression(); expressions.add(expr); label_23: @@ -3015,7 +3119,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[81] = jj_gen; + jj_la1[83] = jj_gen; break label_23; } jj_consume_token(COMMA); @@ -3023,28 +3127,31 @@ final ArrayList list = new ArrayList(); expressions.add(expr); } try { - jj_consume_token(SEMICOLON); + token2 = jj_consume_token(SEMICOLON); } catch (ParseException e) { if (e.currentToken.next.kind != 4) { errorMessage = "';' expected after 'echo' statement"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + errorStart = e.currentToken.sourceEnd; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } } final Expression[] exprs = new Expression[expressions.size()]; expressions.toArray(exprs); - {if (true) return new EchoStatement(exprs,pos);} + if (token2 == null) { + {if (true) return new EchoStatement(exprs,token.sourceStart, exprs[exprs.length-1].sourceEnd);} + } + {if (true) return new EchoStatement(exprs,token.sourceStart, token2.sourceEnd);} throw new Error("Missing return statement in function"); } static final public GlobalStatement GlobalStatement() throws ParseException { - final int pos = SimpleCharStream.getPosition(); Variable expr; final ArrayList vars = new ArrayList(); final GlobalStatement global; - jj_consume_token(GLOBAL); + final Token token, token2; + token = jj_consume_token(GLOBAL); expr = Variable(); vars.add(expr); label_24: @@ -3054,7 +3161,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[82] = jj_gen; + jj_la1[84] = jj_gen; break label_24; } jj_consume_token(COMMA); @@ -3062,13 +3169,13 @@ final ArrayList list = new ArrayList(); vars.add(expr); } try { - jj_consume_token(SEMICOLON); + token2 = jj_consume_token(SEMICOLON); final Variable[] variables = new Variable[vars.size()]; vars.toArray(variables); global = new GlobalStatement(currentSegment, variables, - pos, - SimpleCharStream.getPosition()); + token.sourceStart, + token2.sourceEnd); currentSegment.add(global); {if (true) return global;} } catch (ParseException e) { @@ -3082,12 +3189,12 @@ final ArrayList list = new ArrayList(); } static final public StaticStatement StaticStatement() throws ParseException { - final int pos = SimpleCharStream.getPosition(); final ArrayList vars = new ArrayList(); VariableDeclaration expr; - jj_consume_token(STATIC); + final Token token, token2; + token = jj_consume_token(STATIC); expr = VariableDeclarator(); - vars.add(expr); + vars.add(expr); label_25: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3095,7 +3202,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[83] = jj_gen; + jj_la1[85] = jj_gen; break label_25; } jj_consume_token(COMMA); @@ -3103,12 +3210,12 @@ final ArrayList list = new ArrayList(); vars.add(expr); } try { - jj_consume_token(SEMICOLON); + token2 = jj_consume_token(SEMICOLON); final VariableDeclaration[] variables = new VariableDeclaration[vars.size()]; vars.toArray(variables); {if (true) return new StaticStatement(variables, - pos, - SimpleCharStream.getPosition());} + token.sourceStart, + token2.sourceEnd);} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; errorLevel = ERROR; @@ -3120,13 +3227,12 @@ final ArrayList list = new ArrayList(); } static final public LabeledStatement LabeledStatement() throws ParseException { - final int pos = SimpleCharStream.getPosition(); final Token label; final Statement statement; label = jj_consume_token(IDENTIFIER); jj_consume_token(COLON); statement = Statement(); - {if (true) return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());} + {if (true) return new LabeledStatement(label.image,statement,label.sourceStart,statement.sourceEnd);} throw new Error("Missing return statement in function"); } @@ -3138,11 +3244,11 @@ final ArrayList list = new ArrayList(); * @return a block */ static final public Block Block() throws ParseException { - final int pos = SimpleCharStream.getPosition(); final ArrayList list = new ArrayList(); Statement statement; + final Token token, token2; try { - jj_consume_token(LBRACE); + token = jj_consume_token(LBRACE); } catch (ParseException e) { errorMessage = "'{' expected"; errorLevel = ERROR; @@ -3187,6 +3293,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3198,7 +3305,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[84] = jj_gen; + jj_la1[86] = jj_gen; break label_26; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3235,6 +3342,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3251,13 +3359,13 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[85] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } try { - jj_consume_token(RBRACE); + token2 = jj_consume_token(RBRACE); } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected"; errorLevel = ERROR; @@ -3267,7 +3375,7 @@ final ArrayList list = new ArrayList(); } final Statement[] statements = new Statement[list.size()]; list.toArray(statements); - {if (true) return new Block(statements,pos,SimpleCharStream.getPosition());} + {if (true) return new Block(statements,token.sourceStart,token2.sourceEnd);} throw new Error("Missing return statement in function"); } @@ -3305,6 +3413,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3313,9 +3422,17 @@ final ArrayList list = new ArrayList(); case LBRACE: case SEMICOLON: case DOLLAR_ID: - statement = Statement(); - if (phpDocument == currentSegment) pushOnAstNodes(statement); - {if (true) return statement;} + try { + statement = Statement(); + if (phpDocument == currentSegment) pushOnAstNodes(statement); + {if (true) return statement;} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.image +"', a statement was expected"; + errorLevel = ERROR; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + {if (true) throw e;} + } break; case CLASS: statement = ClassDeclaration(); @@ -3329,7 +3446,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[86] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3372,6 +3489,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3394,7 +3512,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[87] = jj_gen; + jj_la1[89] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3416,7 +3534,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[88] = jj_gen; + jj_la1[90] = jj_gen; break label_27; } jj_consume_token(COMMA); @@ -3435,7 +3553,6 @@ final ArrayList list = new ArrayList(); static final public VariableDeclaration LocalVariableDeclarator() throws ParseException { final Variable varName; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); varName = Variable(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: @@ -3443,28 +3560,27 @@ final ArrayList list = new ArrayList(); initializer = Expression(); break; default: - jj_la1[89] = jj_gen; + jj_la1[91] = jj_gen; ; } if (initializer == null) { {if (true) return new VariableDeclaration(currentSegment, varName, - pos, - SimpleCharStream.getPosition());} + varName.sourceStart, + varName.sourceEnd);} } {if (true) return new VariableDeclaration(currentSegment, varName, initializer, VariableDeclaration.EQUAL, - pos);} + varName.sourceStart);} throw new Error("Missing return statement in function"); } static final public EmptyStatement EmptyStatement() throws ParseException { - final int pos; - jj_consume_token(SEMICOLON); - pos = SimpleCharStream.getPosition(); - {if (true) return new EmptyStatement(pos-1,pos);} + final Token token; + token = jj_consume_token(SEMICOLON); + {if (true) return new EmptyStatement(token.sourceStart,token.sourceEnd);} throw new Error("Missing return statement in function"); } @@ -3483,6 +3599,7 @@ final ArrayList list = new ArrayList(); case ARRAY: case NEW: case DOLLAR: + case BIT_AND: case IDENTIFIER: case DOLLAR_ID: expr = PrimaryExpression(); @@ -3493,29 +3610,29 @@ final ArrayList list = new ArrayList(); case PLUS_PLUS: jj_consume_token(PLUS_PLUS); {if (true) return new PostfixedUnaryExpression(expr, - OperatorIds.PLUS_PLUS, - SimpleCharStream.getPosition());} + OperatorIds.PLUS_PLUS, + SimpleCharStream.getPosition());} break; case MINUS_MINUS: jj_consume_token(MINUS_MINUS); {if (true) return new PostfixedUnaryExpression(expr, - OperatorIds.MINUS_MINUS, - SimpleCharStream.getPosition());} + OperatorIds.MINUS_MINUS, + SimpleCharStream.getPosition());} break; default: - jj_la1[90] = jj_gen; + jj_la1[92] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[91] = jj_gen; + jj_la1[93] = jj_gen; ; } {if (true) return expr;} break; default: - jj_la1[92] = jj_gen; + jj_la1[94] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3565,7 +3682,7 @@ final ArrayList list = new ArrayList(); cases = switchStatementColon(pos, pos + 6); break; default: - jj_la1[93] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3585,7 +3702,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[94] = jj_gen; + jj_la1[96] = jj_gen; break label_28; } cas = switchLabel0(); @@ -3633,7 +3750,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[95] = jj_gen; + jj_la1[97] = jj_gen; break label_29; } cas = switchLabel0(); @@ -3705,6 +3822,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3716,7 +3834,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[96] = jj_gen; + jj_la1[98] = jj_gen; break label_30; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3752,6 +3870,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3768,7 +3887,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[97] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3779,7 +3898,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[98] = jj_gen; + jj_la1[100] = jj_gen; ; } final Statement[] stmtsArray = new Statement[stmts.size()]; @@ -3837,7 +3956,7 @@ final ArrayList list = new ArrayList(); } break; default: - jj_la1[99] = jj_gen; + jj_la1[101] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3846,8 +3965,8 @@ final ArrayList list = new ArrayList(); static final public Break BreakStatement() throws ParseException { Expression expression = null; - final int start = SimpleCharStream.getPosition(); - jj_consume_token(BREAK); + final Token token, token2; + token = jj_consume_token(BREAK); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -3863,6 +3982,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3872,11 +3992,11 @@ final ArrayList list = new ArrayList(); expression = Expression(); break; default: - jj_la1[100] = jj_gen; + jj_la1[102] = jj_gen; ; } try { - jj_consume_token(SEMICOLON); + token2 = jj_consume_token(SEMICOLON); } catch (ParseException e) { errorMessage = "';' expected after 'break' keyword"; errorLevel = ERROR; @@ -3884,7 +4004,7 @@ final ArrayList list = new ArrayList(); errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } - {if (true) return new Break(expression, start, SimpleCharStream.getPosition());} + {if (true) return new Break(expression, token.sourceStart, token2.sourceEnd);} throw new Error("Missing return statement in function"); } @@ -3892,9 +4012,11 @@ final ArrayList list = new ArrayList(); final int pos = SimpleCharStream.getPosition(); final Expression condition; final IfStatement ifStatement; - jj_consume_token(IF); + Token token; + token = jj_consume_token(IF); condition = Condition("if"); - ifStatement = IfStatement0(condition, pos,pos+2); + ifStatement = IfStatement0(condition, + token.sourceStart,token.sourceStart+2); {if (true) return ifStatement;} throw new Error("Missing return statement in function"); } @@ -3974,6 +4096,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -3985,7 +4108,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[101] = jj_gen; + jj_la1[103] = jj_gen; break label_31; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4020,6 +4143,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4036,7 +4160,7 @@ final ArrayList list = new ArrayList(); stmts.add(statement); break; default: - jj_la1[102] = jj_gen; + jj_la1[104] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4049,7 +4173,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[103] = jj_gen; + jj_la1[105] = jj_gen; break label_32; } elseifStatement = ElseIfStatementColon(); @@ -4060,7 +4184,7 @@ final ArrayList list = new ArrayList(); elseStatement = ElseStatementColon(); break; default: - jj_la1[104] = jj_gen; + jj_la1[106] = jj_gen; ; } try { @@ -4143,6 +4267,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4183,6 +4308,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4197,7 +4323,7 @@ final ArrayList list = new ArrayList(); stmt = htmlBlock(); break; default: - jj_la1[105] = jj_gen; + jj_la1[107] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4208,7 +4334,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[106] = jj_gen; + jj_la1[108] = jj_gen; break label_33; } elseifStatement = ElseIfStatement(); @@ -4233,7 +4359,7 @@ final ArrayList list = new ArrayList(); } break; default: - jj_la1[107] = jj_gen; + jj_la1[109] = jj_gen; ; } elseIfs = new ElseIf[elseIfList.size()]; @@ -4246,7 +4372,7 @@ final ArrayList list = new ArrayList(); SimpleCharStream.getPosition());} break; default: - jj_la1[108] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4296,6 +4422,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4307,7 +4434,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[109] = jj_gen; + jj_la1[111] = jj_gen; break label_34; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4342,6 +4469,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4358,7 +4486,7 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[110] = jj_gen; + jj_la1[112] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4410,6 +4538,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4421,7 +4550,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[111] = jj_gen; + jj_la1[113] = jj_gen; break label_35; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4456,6 +4585,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4472,7 +4602,7 @@ final ArrayList list = new ArrayList(); list.add(statement); break; default: - jj_la1[112] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4550,6 +4680,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4561,7 +4692,7 @@ final ArrayList list = new ArrayList(); ; break; default: - jj_la1[113] = jj_gen; + jj_la1[115] = jj_gen; break label_36; } statement = Statement(); @@ -4630,6 +4761,7 @@ final ArrayList list = new ArrayList(); case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4642,7 +4774,7 @@ final ArrayList list = new ArrayList(); {if (true) return statement;} break; default: - jj_la1[114] = jj_gen; + jj_la1[116] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4652,14 +4784,14 @@ final ArrayList list = new ArrayList(); static final public DoStatement DoStatement() throws ParseException { final Statement action; final Expression condition; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(DO); + final Token token, token2; + token = jj_consume_token(DO); action = Statement(); jj_consume_token(WHILE); condition = Condition("while"); try { - jj_consume_token(SEMICOLON); - {if (true) return new DoStatement(condition,action,pos,SimpleCharStream.getPosition());} + token2 = jj_consume_token(SEMICOLON); + {if (true) return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; @@ -4673,9 +4805,9 @@ final ArrayList list = new ArrayList(); static final public ForeachStatement ForeachStatement() throws ParseException { Statement statement; Expression expression; - final int pos = SimpleCharStream.getPosition(); ArrayVariableDeclaration variable; - jj_consume_token(FOREACH); + Token token; + token = jj_consume_token(FOREACH); try { jj_consume_token(LPAREN); } catch (ParseException e) { @@ -4734,13 +4866,13 @@ final ArrayList list = new ArrayList(); {if (true) return new ForeachStatement(expression, variable, statement, - pos, - SimpleCharStream.getPosition());} + token.sourceStart, + statement.sourceEnd);} throw new Error("Missing return statement in function"); } static final public ForStatement ForStatement() throws ParseException { -final Token token; +final Token token,token2; final int pos = SimpleCharStream.getPosition(); Expression[] initializations = null; Expression condition = null; @@ -4764,12 +4896,13 @@ final int startBlock, endBlock; case DOLLAR: case PLUS_PLUS: case MINUS_MINUS: + case BIT_AND: case IDENTIFIER: case DOLLAR_ID: initializations = ForInit(); break; default: - jj_la1[115] = jj_gen; + jj_la1[117] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4788,6 +4921,7 @@ final int startBlock, endBlock; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4797,7 +4931,7 @@ final int startBlock, endBlock; condition = Expression(); break; default: - jj_la1[116] = jj_gen; + jj_la1[118] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -4807,12 +4941,13 @@ final int startBlock, endBlock; case DOLLAR: case PLUS_PLUS: case MINUS_MINUS: + case BIT_AND: case IDENTIFIER: case DOLLAR_ID: increments = StatementExpressionList(); break; default: - jj_la1[117] = jj_gen; + jj_la1[119] = jj_gen; ; } jj_consume_token(RPAREN); @@ -4848,6 +4983,7 @@ final int startBlock, endBlock; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4857,7 +4993,12 @@ final int startBlock, endBlock; case SEMICOLON: case DOLLAR_ID: action = Statement(); - {if (true) return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());} + {if (true) return new ForStatement(initializations, + condition, + increments, + action, + token.sourceStart, + action.sourceEnd);} break; case COLON: jj_consume_token(COLON); @@ -4896,6 +5037,7 @@ final int startBlock, endBlock; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -4907,7 +5049,7 @@ final int startBlock, endBlock; ; break; default: - jj_la1[118] = jj_gen; + jj_la1[120] = jj_gen; break label_37; } action = Statement(); @@ -4934,10 +5076,17 @@ final int startBlock, endBlock; {if (true) throw e;} } try { - jj_consume_token(SEMICOLON); + token2 = jj_consume_token(SEMICOLON); final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); - {if (true) return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());} + {if (true) return new ForStatement(initializations, + condition, + increments, + new Block(stmtsArray, + stmtsArray[0].sourceStart, + stmtsArray[stmtsArray.length-1].sourceEnd), + token.sourceStart, + token2.sourceEnd);} } catch (ParseException e) { errorMessage = "';' expected after 'endfor' keyword"; errorLevel = ERROR; @@ -4947,7 +5096,7 @@ final int startBlock, endBlock; } break; default: - jj_la1[119] = jj_gen; + jj_la1[121] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4966,13 +5115,14 @@ final int startBlock, endBlock; case DOLLAR: case PLUS_PLUS: case MINUS_MINUS: + case BIT_AND: case IDENTIFIER: case DOLLAR_ID: exprs = StatementExpressionList(); {if (true) return exprs;} break; default: - jj_la1[120] = jj_gen; + jj_la1[122] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4992,23 +5142,23 @@ final int startBlock, endBlock; ; break; default: - jj_la1[121] = jj_gen; + jj_la1[123] = jj_gen; break label_38; } jj_consume_token(COMMA); StatementExpression(); list.add(expr); } - final Expression[] exprsArray = new Expression[list.size()]; - list.toArray(exprsArray); - {if (true) return exprsArray;} + final Expression[] exprsArray = new Expression[list.size()]; + list.toArray(exprsArray); + {if (true) return exprsArray;} throw new Error("Missing return statement in function"); } static final public Continue ContinueStatement() throws ParseException { Expression expr = null; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(CONTINUE); + final Token token,token2; + token = jj_consume_token(CONTINUE); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -5024,6 +5174,7 @@ final int startBlock, endBlock; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -5033,12 +5184,12 @@ final int startBlock, endBlock; expr = Expression(); break; default: - jj_la1[122] = jj_gen; + jj_la1[124] = jj_gen; ; } try { - jj_consume_token(SEMICOLON); - {if (true) return new Continue(expr,pos,SimpleCharStream.getPosition());} + token2 = jj_consume_token(SEMICOLON); + {if (true) return new Continue(expr,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "';' expected after 'continue' statement"; errorLevel = ERROR; @@ -5051,8 +5202,8 @@ final int startBlock, endBlock; static final public ReturnStatement ReturnStatement() throws ParseException { Expression expr = null; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(RETURN); + final Token token,token2; + token = jj_consume_token(RETURN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -5068,6 +5219,7 @@ final int startBlock, endBlock; case MINUS_MINUS: case PLUS: case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -5077,12 +5229,12 @@ final int startBlock, endBlock; expr = Expression(); break; default: - jj_la1[123] = jj_gen; + jj_la1[125] = jj_gen; ; } try { - jj_consume_token(SEMICOLON); - {if (true) return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());} + token2 = jj_consume_token(SEMICOLON); + {if (true) return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "';' expected after 'return' statement"; errorLevel = ERROR; @@ -5128,468 +5280,262 @@ final int startBlock, endBlock; return retval; } - static final private boolean jj_3R_142() { - 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_141() { - 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_140() { - if (jj_scan_token(LSHIFT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3_4() { - if (jj_3R_43()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - 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()) 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_132()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_125() { - if (jj_3R_132()) return true; + static final private boolean jj_3R_116() { + if (jj_3R_118()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_133()) { jj_scanpos = xsp; break; } + if (jj_3R_119()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_199() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3_2() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_40()) return true; + static final private boolean jj_3R_46() { + if (jj_scan_token(LBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3_5() { - if (jj_3R_44()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_52()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_137() { - if (jj_scan_token(GE)) return true; + static final private boolean jj_3R_117() { + if (jj_scan_token(XOR)) 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(LE)) return true; + if (jj_3R_116()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_198() { - if (jj_3R_40()) return true; + static final private boolean jj_3R_113() { + if (jj_3R_116()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_2()) { 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_135() { - if (jj_scan_token(GT)) return true; + static final private boolean jj_3R_45() { + if (jj_scan_token(CLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_134() { - if (jj_scan_token(LT)) return true; + if (jj_3R_51()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_126() { + static final private boolean jj_3R_39() { Token xsp; xsp = jj_scanpos; - if (jj_3R_134()) { - jj_scanpos = xsp; - if (jj_3R_135()) { - jj_scanpos = xsp; - if (jj_3R_136()) { + if (jj_3R_45()) { jj_scanpos = xsp; - if (jj_3R_137()) return true; + if (jj_3R_46()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } 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_125()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_121() { - if (jj_3R_125()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_126()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_196() { - 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_198()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - xsp = jj_scanpos; - if (jj_3R_199()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_201() { - if (jj_scan_token(COMMA)) return true; + static final private boolean jj_3R_114() { + if (jj_scan_token(BIT_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_200() { - if (jj_3R_47()) return true; + static final private boolean jj_3R_107() { + if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_201()) { jj_scanpos = xsp; break; } + if (jj_3R_114()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_202() { - if (jj_scan_token(ARRAYASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; + static final private boolean jj_3R_203() { + if (jj_3R_125()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_40() { - if (jj_3R_47()) return true; + static final private boolean jj_3R_110() { + if (jj_scan_token(DOT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_202()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_197() { - if (jj_3R_200()) return true; + if (jj_3R_107()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_71() { + static final private boolean jj_3R_202() { if (jj_3R_48()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_131() { - if (jj_scan_token(TRIPLEEQUAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_130() { - if (jj_scan_token(BANGDOUBLEEQUAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_129() { - if (jj_scan_token(NOT_EQUAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_128() { - if (jj_scan_token(DIF)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_127() { - if (jj_scan_token(EQUAL_EQUAL)) return true; + static final private boolean jj_3R_201() { + 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_122() { + static final private boolean jj_3R_196() { Token xsp; xsp = jj_scanpos; - if (jj_3R_127()) { - jj_scanpos = xsp; - if (jj_3R_128()) { + if (jj_3R_201()) { jj_scanpos = xsp; - if (jj_3R_129()) { - jj_scanpos = xsp; - if (jj_3R_130()) { + if (jj_3R_202()) { jj_scanpos = xsp; - if (jj_3R_131()) 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; } 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_121()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_192() { - 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_197()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_116() { - if (jj_3R_121()) return true; + static final private boolean jj_3R_101() { + if (jj_3R_107()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_122()) { jj_scanpos = xsp; break; } + if (jj_3R_110()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_180() { - 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_179() { - 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_178() { - if (jj_scan_token(TRUE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_177() { - if (jj_scan_token(STRING_LITERAL)) return true; + static final private boolean jj_3R_112() { + 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_117() { - if (jj_scan_token(BIT_AND)) return true; + static final private boolean jj_3R_183() { + if (jj_scan_token(ARRAY)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_116()) return true; + if (jj_3R_192()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_176() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; + static final private boolean jj_3R_111() { + 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_170() { + static final private boolean jj_3R_104() { Token xsp; xsp = jj_scanpos; - if (jj_3R_175()) { - jj_scanpos = xsp; - if (jj_3R_176()) { - jj_scanpos = xsp; - if (jj_3R_177()) { - jj_scanpos = xsp; - if (jj_3R_178()) { - jj_scanpos = xsp; - if (jj_3R_179()) { + if (jj_3R_111()) { jj_scanpos = xsp; - if (jj_3R_180()) return true; + if (jj_3R_112()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_175() { - if (jj_scan_token(INTEGER_LITERAL)) return true; + if (jj_3R_101()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_114() { - if (jj_3R_116()) return true; + static final private boolean jj_3R_122() { + if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_117()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_70() { if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_52() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_70()) { - jj_scanpos = xsp; - if (jj_3R_71()) 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_69() { - if (jj_scan_token(DOLLAR_ID)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_115() { - if (jj_scan_token(XOR)) return true; + if (jj_scan_token(LBRACE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_114()) return true; + if (jj_scan_token(RBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_112() { - if (jj_3R_114()) return true; + static final private boolean jj_3R_82() { + if (jj_3R_101()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_115()) { jj_scanpos = xsp; break; } + if (jj_3R_104()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_68() { - if (jj_scan_token(DOLLAR)) return true; + static final private boolean jj_3R_78() { + if (jj_scan_token(HOOK)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_51()) return true; + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(COLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_70()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_46() { - if (jj_scan_token(LBRACKET)) return true; + static final private boolean jj_3R_67() { + if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_52()) jj_scanpos = xsp; + if (jj_3R_115()) 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_113() { - if (jj_scan_token(BIT_OR)) return true; + static final private boolean jj_3R_197() { + if (jj_3R_200()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_112()) return true; + return false; + } + + static final private boolean jj_3R_126() { + if (jj_3R_125()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_106() { - if (jj_3R_112()) return true; + if (jj_scan_token(_ORL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_113()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_45() { - if (jj_scan_token(CLASSACCESS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_51()) return true; + static final private boolean jj_3R_105() { + if (jj_scan_token(OR_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_39() { + static final private boolean jj_3R_51() { Token xsp; xsp = jj_scanpos; - if (jj_3R_45()) { + if (jj_3R_66()) { jj_scanpos = xsp; - if (jj_3R_46()) return true; + if (jj_3R_67()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_105() { + static final private boolean jj_3R_66() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -5599,417 +5545,283 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_109() { - if (jj_scan_token(DOT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + static final private boolean jj_3R_84() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_105()) { + jj_scanpos = xsp; if (jj_3R_106()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_82()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_67() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_121() { + if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_105()) jj_scanpos = xsp; + if (jj_3R_126()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_99() { - if (jj_3R_106()) return true; + static final private boolean jj_3R_75() { + if (jj_3R_82()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_109()) { jj_scanpos = xsp; break; } + if (jj_3R_84()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_195() { - if (jj_3R_123()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_194() { - if (jj_3R_48()) return true; + static final private boolean jj_3R_189() { + if (jj_scan_token(NEW)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_193() { - if (jj_scan_token(IDENTIFIER)) return true; + if (jj_3R_196()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_190() { Token xsp; xsp = jj_scanpos; - if (jj_3R_193()) { - jj_scanpos = xsp; - if (jj_3R_194()) { - jj_scanpos = xsp; - if (jj_3R_195()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_197()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_111() { - if (jj_scan_token(_ANDL)) return true; + static final private boolean jj_3R_195() { + if (jj_3R_200()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_110() { - if (jj_scan_token(AND_AND)) return true; + static final private boolean jj_3R_120() { + if (jj_3R_125()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_102() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_110()) { - jj_scanpos = xsp; - if (jj_3R_111()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_99()) return true; + static final private boolean jj_3R_188() { + if (jj_3R_125()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_51() { Token xsp; xsp = jj_scanpos; - if (jj_3R_66()) { - jj_scanpos = xsp; - if (jj_3R_67()) { - jj_scanpos = xsp; - if (jj_3R_68()) { - jj_scanpos = xsp; - if (jj_3R_69()) 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_66() { - if (jj_scan_token(LBRACE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_83() { - if (jj_3R_99()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_102()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_80() { - if (jj_scan_token(HOOK)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_72()) 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(_ORL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_195()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_103() { - if (jj_scan_token(OR_OR)) return true; + static final private boolean jj_3R_100() { + if (jj_3R_51()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_120() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; + static final private boolean jj_3R_70() { + if (jj_3R_75()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_85() { Token xsp; xsp = jj_scanpos; - if (jj_3R_103()) { - jj_scanpos = xsp; - if (jj_3R_104()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_83()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_78()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_76() { - if (jj_scan_token(DOLLAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_51()) return true; + static final private boolean jj_3R_108() { + if (jj_scan_token(LIST)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_77() { - if (jj_3R_83()) return true; + 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_120()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; while (true) { xsp = jj_scanpos; - if (jj_3R_85()) { jj_scanpos = xsp; break; } + if (jj_3R_121()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } - return false; - } - - static final private boolean jj_3R_124() { - if (jj_3R_123()) return true; + if (jj_scan_token(RPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + xsp = jj_scanpos; + if (jj_3R_122()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_181() { - if (jj_scan_token(ARRAY)) return true; + static final private boolean jj_3R_99() { + if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_196()) return true; + if (jj_3R_81()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_119() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_124()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_82() { - if (jj_scan_token(LBRACE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACE)) return true; + static final private boolean jj_3R_194() { + if (jj_3R_200()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_75() { + static final private boolean jj_3R_98() { if (jj_scan_token(DOLLAR_ID)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_82()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_81()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_64() { + static final private boolean jj_3R_81() { Token xsp; xsp = jj_scanpos; - if (jj_3R_75()) { + if (jj_3R_98()) { + jj_scanpos = xsp; + if (jj_3R_99()) { jj_scanpos = xsp; - if (jj_3R_76()) return true; + 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; return false; } - static final private boolean jj_3R_72() { - if (jj_3R_77()) return true; + static final private boolean jj_3R_97() { + if (jj_scan_token(TILDEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_80()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_118() { - if (jj_3R_123()) return true; + static final private boolean jj_3R_193() { + if (jj_scan_token(STATICCLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_174() { - if (jj_3R_181()) return true; + if (jj_3R_196()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_191() { - if (jj_3R_192()) return true; + static final private boolean jj_3R_96() { + 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_98() { - if (jj_scan_token(TILDEEQUAL)) return true; + static final private boolean jj_3R_95() { + if (jj_scan_token(ORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_97() { - if (jj_scan_token(DOTASSIGN)) return true; + static final private boolean jj_3R_94() { + if (jj_scan_token(XORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_96() { - if (jj_scan_token(ORASSIGN)) return true; + static final private boolean jj_3R_109() { + if (jj_scan_token(PRINT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_95() { - if (jj_scan_token(XORASSIGN)) return true; + static final private boolean jj_3R_80() { + if (jj_3R_81()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_94() { + static final private boolean jj_3R_93() { if (jj_scan_token(ANDASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_93() { + static final private boolean jj_3R_92() { if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_173() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_190()) return true; + static final private boolean jj_3R_91() { + if (jj_scan_token(LSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_191()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_107() { - if (jj_scan_token(LIST)) return true; + static final private boolean jj_3R_90() { + if (jj_scan_token(MINUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(LPAREN)) return true; + return false; + } + + static final private boolean jj_3R_187() { + if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - xsp = jj_scanpos; - if (jj_3R_118()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; while (true) { xsp = jj_scanpos; - if (jj_3R_119()) { jj_scanpos = xsp; break; } + if (jj_3R_193()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; xsp = jj_scanpos; - if (jj_3R_120()) jj_scanpos = xsp; + if (jj_3R_194()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_189() { - if (jj_3R_192()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_92() { - if (jj_scan_token(LSHIFTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_91() { - if (jj_scan_token(MINUSASSIGN)) return true; + static final private boolean jj_3R_182() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_187()) { + jj_scanpos = xsp; + if (jj_3R_188()) { + jj_scanpos = xsp; + if (jj_3R_189()) 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_90() { + static final private boolean jj_3R_89() { if (jj_scan_token(PLUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_89() { + static final private boolean jj_3R_88() { if (jj_scan_token(REMASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_172() { - if (jj_3R_123()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_189()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_188() { - if (jj_3R_192()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_88() { + static final private boolean jj_3R_87() { 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_87() { + static final private boolean jj_3R_86() { if (jj_scan_token(STARASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_86() { + static final private boolean jj_3R_85() { if (jj_scan_token(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_81() { + static final private boolean jj_3R_79() { Token xsp; xsp = jj_scanpos; + if (jj_3R_85()) { + jj_scanpos = xsp; if (jj_3R_86()) { jj_scanpos = xsp; if (jj_3R_87()) { @@ -6032,9 +5844,7 @@ final int startBlock, endBlock; jj_scanpos = xsp; if (jj_3R_96()) { jj_scanpos = xsp; - if (jj_3R_97()) { - jj_scanpos = xsp; - if (jj_3R_98()) return true; + if (jj_3R_97()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6051,166 +5861,162 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_187() { - if (jj_scan_token(STATICCLASSACCESS)) return true; + static final private boolean jj_3R_74() { + if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_190()) return true; + if (jj_3R_81()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_108() { - if (jj_scan_token(PRINT)) return true; + static final private boolean jj_3R_174() { + if (jj_3R_183()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; + return false; + } + + static final private boolean jj_3R_103() { + if (jj_3R_109()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3_1() { - if (jj_3R_39()) return true; + static final private boolean jj_3R_181() { + if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_101() { + static final private boolean jj_3R_102() { if (jj_3R_108()) 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_83() { Token xsp; xsp = jj_scanpos; - if (jj_3R_171()) { - jj_scanpos = xsp; - if (jj_3R_172()) { + if (jj_3R_102()) { jj_scanpos = xsp; + if (jj_3R_103()) 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_169() { + Token xsp; + xsp = jj_scanpos; if (jj_3R_173()) { jj_scanpos = xsp; if (jj_3R_174()) 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_171() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + static final private boolean jj_3R_173() { Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_187()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } xsp = jj_scanpos; - if (jj_3R_188()) jj_scanpos = xsp; + if (jj_3R_181()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_123() { - if (jj_3R_64()) return true; + if (jj_3R_182()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_1()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_100() { - if (jj_3R_107()) return true; + static final private boolean jj_3R_73() { + if (jj_scan_token(DOLLAR_ID)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_80()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_84() { + static final private boolean jj_3R_64() { Token xsp; xsp = jj_scanpos; - if (jj_3R_100()) { + if (jj_3R_73()) { jj_scanpos = xsp; - if (jj_3R_101()) return true; + if (jj_3R_74()) 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_79() { - if (jj_3R_84()) return true; + static final private boolean jj_3R_77() { + if (jj_3R_83()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_78() { + static final private boolean jj_3R_76() { if (jj_scan_token(BANG)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_73()) return true; + if (jj_3R_71()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_73() { + static final private boolean jj_3R_71() { Token xsp; xsp = jj_scanpos; - if (jj_3R_78()) { + if (jj_3R_76()) { jj_scanpos = xsp; - if (jj_3R_79()) return true; + if (jj_3R_77()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_186() { + static final private boolean jj_3R_191() { 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_185() { + static final private boolean jj_3R_190() { 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_184() { + static final private boolean jj_3R_186() { Token xsp; xsp = jj_scanpos; - if (jj_3R_185()) { + if (jj_3R_190()) { jj_scanpos = xsp; - if (jj_3R_186()) return true; + if (jj_3R_191()) 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_54() { - if (jj_3R_73()) return true; + if (jj_3R_71()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_169() { - if (jj_3R_167()) return true; + static final private boolean jj_3R_171() { + if (jj_3R_169()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_184()) jj_scanpos = xsp; + if (jj_3R_186()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_183() { + static final private boolean jj_3R_185() { 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_182() { + static final private boolean jj_3R_184() { if (jj_3R_48()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -6222,19 +6028,19 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_168() { + static final private boolean jj_3R_170() { 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_182()) { + if (jj_3R_184()) { jj_scanpos = xsp; - if (jj_3R_183()) return true; + if (jj_3R_185()) 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_143()) return true; + if (jj_3R_145()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6245,8 +6051,8 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_74() { - if (jj_3R_81()) return true; + static final private boolean jj_3R_72() { + if (jj_3R_79()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6280,16 +6086,22 @@ final int startBlock, endBlock; } static final private boolean jj_3R_53() { - if (jj_3R_72()) return true; + if (jj_3R_70()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; xsp = jj_scanpos; - if (jj_3R_74()) jj_scanpos = xsp; + if (jj_3R_72()) jj_scanpos = xsp; else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_166() { + static final private boolean jj_3_1() { + if (jj_3R_39()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_168() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_47()) return true; @@ -6299,28 +6111,28 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_165() { - if (jj_3R_170()) return true; + static final private boolean jj_3R_167() { + if (jj_3R_172()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_164() { - if (jj_3R_169()) return true; + static final private boolean jj_3R_166() { + if (jj_3R_171()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_160() { + static final private boolean jj_3R_162() { Token xsp; xsp = jj_scanpos; - if (jj_3R_163()) { + if (jj_3R_165()) { jj_scanpos = xsp; - if (jj_3R_164()) { + if (jj_3R_166()) { jj_scanpos = xsp; - if (jj_3R_165()) { + if (jj_3R_167()) { jj_scanpos = xsp; - if (jj_3R_166()) return true; + if (jj_3R_168()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6328,12 +6140,32 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_163() { - if (jj_3R_168()) return true; + static final private boolean jj_3R_165() { + if (jj_3R_170()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } + static final private boolean jj_3R_65() { + if (jj_scan_token(ASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_125() { + if (jj_3R_64()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_1()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + static final private boolean jj_3R_63() { if (jj_scan_token(OBJECT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6364,6 +6196,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_164() { + 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_58() { if (jj_scan_token(REAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6376,14 +6214,14 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_56() { - if (jj_scan_token(BOOL)) return true; + static final private boolean jj_3R_163() { + 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_162() { - if (jj_scan_token(MINUS_MINUS)) return true; + static final private boolean jj_3R_56() { + if (jj_scan_token(BOOL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6427,62 +6265,58 @@ final int startBlock, endBlock; } static final private boolean jj_3R_161() { - 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_159() { Token xsp; xsp = jj_scanpos; - if (jj_3R_161()) { + if (jj_3R_163()) { jj_scanpos = xsp; - if (jj_3R_162()) return true; + if (jj_3R_164()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_167()) return true; + if (jj_3R_169()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_65() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_47()) return true; + static final private boolean jj_3R_49() { + if (jj_3R_64()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_65()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_158() { - if (jj_3R_160()) return true; + static final private boolean jj_3R_160() { + if (jj_3R_162()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_157() { - if (jj_3R_159()) return true; + static final private boolean jj_3R_159() { + if (jj_3R_161()) 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_158() { if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_147()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_154() { + static final private boolean jj_3R_156() { Token xsp; xsp = jj_scanpos; - if (jj_3R_155()) { + if (jj_3R_157()) { jj_scanpos = xsp; - if (jj_3R_156()) { + if (jj_3R_158()) { jj_scanpos = xsp; - if (jj_3R_157()) { + if (jj_3R_159()) { jj_scanpos = xsp; - if (jj_3R_158()) return true; + if (jj_3R_160()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6490,177 +6324,531 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_155() { + static final private boolean jj_3R_157() { if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_147()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_153() { - if (jj_3R_154()) return true; + static final private boolean jj_3R_50() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_49()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_49() { - if (jj_3R_64()) return true; + static final private boolean jj_3R_44() { + if (jj_3R_49()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - xsp = jj_scanpos; - if (jj_3R_65()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + while (true) { + xsp = jj_scanpos; + if (jj_3R_50()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_152() { + static final private boolean jj_3R_155() { + if (jj_3R_156()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_154() { if (jj_scan_token(BANG)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_147()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_147() { + static final private boolean jj_3R_149() { Token xsp; xsp = jj_scanpos; - if (jj_3R_151()) { + if (jj_3R_153()) { jj_scanpos = xsp; - if (jj_3R_152()) { + if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_153()) return true; + if (jj_3R_155()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_151() { + static final private boolean jj_3R_153() { if (jj_scan_token(AT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_147()) return true; + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_50() { - if (jj_scan_token(COMMA)) return true; + static final private boolean jj_3R_145() { + if (jj_3R_149()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_49()) return true; + return false; + } + + static final private boolean jj_3R_152() { + 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_44() { - if (jj_3R_49()) return true; + static final private boolean jj_3R_151() { + if (jj_scan_token(SLASH)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_150() { + 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_43() { + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SEMICOLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_146() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_150()) { + jj_scanpos = xsp; + if (jj_3R_151()) { + jj_scanpos = xsp; + if (jj_3R_152()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_145()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_140() { + 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_50()) { 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_143() { - if (jj_3R_147()) return true; + static final private boolean jj_3_5() { + if (jj_3R_44()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_150() { - if (jj_scan_token(REMAINDER)) return true; + static final private boolean jj_3R_148() { + if (jj_scan_token(MINUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_149() { - if (jj_scan_token(SLASH)) return true; + static final private boolean jj_3R_147() { + if (jj_scan_token(PLUS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_148() { - if (jj_scan_token(STAR)) return true; + static final private boolean jj_3R_141() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_147()) { + jj_scanpos = xsp; + if (jj_3R_148()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_140()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_134() { + if (jj_3R_140()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_141()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + static final private boolean jj_3_4() { + if (jj_3R_43()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } static final private boolean jj_3R_144() { + if (jj_scan_token(RUNSIGNEDSHIFT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_143() { + if (jj_scan_token(RSIGNEDSHIFT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_142() { + if (jj_scan_token(LSHIFT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_135() { Token xsp; xsp = jj_scanpos; - if (jj_3R_148()) { + if (jj_3R_142()) { jj_scanpos = xsp; - if (jj_3R_149()) { + if (jj_3R_143()) { jj_scanpos = xsp; - if (jj_3R_150()) return true; + if (jj_3R_144()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_143()) return true; + if (jj_3R_134()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_43() { - if (jj_3R_47()) return true; + static final private boolean jj_3R_127() { + if (jj_3R_134()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(SEMICOLON)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_135()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + static final private boolean jj_3R_139() { + 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_138() { - if (jj_3R_143()) return true; + 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_207() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_137() { + 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_136() { + 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_128() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_136()) { + jj_scanpos = xsp; + if (jj_3R_137()) { + jj_scanpos = xsp; + if (jj_3R_138()) { + jj_scanpos = xsp; + if (jj_3R_139()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_127()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_206() { + if (jj_3R_47()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_144()) { jj_scanpos = xsp; break; } + if (jj_3R_207()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_146() { - if (jj_scan_token(MINUS)) return true; + static final private boolean jj_3R_123() { + if (jj_3R_127()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_128()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_145() { - if (jj_scan_token(PLUS)) return true; + static final private boolean jj_3R_199() { + if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_139() { + static final private boolean jj_3_2() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_40()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_204() { + if (jj_3R_206()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_69() { + if (jj_3R_48()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_198() { + if (jj_3R_40()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_2()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } + return false; + } + + static final private boolean jj_3R_192() { + 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_198()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + xsp = jj_scanpos; + if (jj_3R_199()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_200() { + 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_145()) { + if (jj_3R_204()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RPAREN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_133() { + 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_132() { + if (jj_scan_token(BANGDOUBLEEQUAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_131() { + if (jj_scan_token(NOT_EQUAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_130() { + if (jj_scan_token(DIF)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_129() { + if (jj_scan_token(EQUAL_EQUAL)) 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; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_124() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_129()) { jj_scanpos = xsp; - if (jj_3R_146()) return true; + if (jj_3R_130()) { + jj_scanpos = xsp; + if (jj_3R_131()) { + jj_scanpos = xsp; + if (jj_3R_132()) { + jj_scanpos = xsp; + if (jj_3R_133()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_138()) return true; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_123()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_132() { - if (jj_3R_138()) return true; + static final private boolean jj_3R_180() { + 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_179() { + 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_118() { + if (jj_3R_123()) 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_124()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } + static final private boolean jj_3R_178() { + if (jj_scan_token(TRUE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_177() { + 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_40() { + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_205()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_176() { + 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_172() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_175()) { + jj_scanpos = xsp; + if (jj_3R_176()) { + jj_scanpos = xsp; + if (jj_3R_177()) { + jj_scanpos = xsp; + if (jj_3R_178()) { + jj_scanpos = xsp; + if (jj_3R_179()) { + jj_scanpos = xsp; + if (jj_3R_180()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_175() { + 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_52() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_68()) { + jj_scanpos = xsp; + if (jj_3R_69()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_68() { + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_119() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_118()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static private boolean jj_initialized_once = false; static public PHPParserTokenManager token_source; static SimpleCharStream jj_input_stream; @@ -6671,7 +6859,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[124]; + static final private int[] jj_la1 = new int[126]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -6685,19 +6873,19 @@ final int startBlock, endBlock; jj_la1_4(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0xf960001e,0x6,0x6,0xf960001e,0x0,0xf9600000,0x0,0xc00000,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x81000000,0xf9000000,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf9600010,0xf9600010,0xf9600000,0xe9600000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9600010,0xe9600010,0x10000000,0x0,0x68000000,0xf9000010,0xf9000010,0x2000000,0x4000000,0xf9000010,0x2000000,0x4000000,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000000,0xf9000000,0x8000000,0x68000000,0x8000000,0xf9000000,0xf9000000,0x8000000,0x0,0x68000000,0x68000000,}; + jj_la1_0 = new int[] {0xf960001e,0x6,0x6,0xf960001e,0x0,0xf9600000,0x0,0xc00000,0xc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x68000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x68000000,0x68000000,0x0,0x0,0x68000000,0x0,0x0,0x81000000,0xf9000000,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf9600010,0xf9600010,0xf9600000,0xe9600000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9600010,0xe9600010,0x10000000,0x0,0x68000000,0xf9000010,0xf9000010,0x2000000,0x4000000,0xf9000010,0x2000000,0x4000000,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000010,0xf9000000,0xf9000000,0x8000000,0x68000000,0x8000000,0xf9000000,0xf9000000,0x8000000,0x0,0x68000000,0x68000000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x875d507f,0x0,0x0,0x875d507f,0x0,0x875d507f,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x30c0000,0x0,0x30c0000,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x40000,0x40000,0x0,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8451507f,0x875d507f,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x0,0x0,0x0,0x0,0x40000,0x0,0x2400,0x2400,0x875d507f,0x875d507f,0x0,0x2400,0x30c0000,0x875d507f,0x875d507f,0x0,0x0,0x875d507f,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x40000,0x30c0000,0x40000,0x875d507f,0x875d507f,0x40000,0x0,0x30c0000,0x30c0000,}; + jj_la1_1 = new int[] {0x875d507f,0x0,0x0,0x875d507f,0x0,0x875d507f,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3080000,0x200,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0000,0x30c0000,0x0,0x30c0000,0x0,0x0,0x0,0x0,0x40000,0x100,0x0,0x0,0x0,0x40000,0x0,0x30c0000,0x30c0000,0x80,0x3080000,0x30c0000,0x0,0x0,0x8451507f,0x875d507f,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x0,0x0,0x0,0x0,0x40000,0x0,0x2400,0x2400,0x875d507f,0x875d507f,0x0,0x2400,0x30c0000,0x875d507f,0x875d507f,0x0,0x0,0x875d507f,0x0,0x0,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x875d507f,0x40000,0x30c0000,0x40000,0x875d507f,0x875d507f,0x40000,0x0,0x30c0000,0x30c0000,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x3c1c00,0x0,0x0,0x3c1c00,0x0,0x3c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x300000,0x0,0x3c1c00,0x0,0x1000000,0x0,0x1000000,0x1000000,0x3fe,0x0,0x3c1c00,0x1000,0x0,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x3c1c00,0x3c0800,0xc0000,0x800,0x3fe,0xc0000,0xc0000,0x0,0x0,0x0,0x0,0x800,0x800,0xbfe,0x3c1ffe,0x3c1ffe,0x0,0x0,0x3c1c00,0x0,0x400,0x400,0x3c1c00,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x3c1c00,0x3c1c00,0x3c1c00,0x3c1c00,0x0,0x0,0xc0000,0xc0000,0xc0800,0x8000,0x0,0x0,0x3c1c00,0x3c1c00,0x0,0x0,0x3c1c00,0x3c1c00,0x3c1c00,0x0,0x0,0x3c1c00,0x0,0x0,0x3c9c00,0x3c1c00,0x3c1c00,0x3c1c00,0x3c1c00,0x3c1c00,0x3c9c00,0xc0800,0x3c1c00,0xc0800,0x3c1c00,0x3c9c00,0xc0800,0x0,0x3c1c00,0x3c1c00,}; + jj_la1_2 = new int[] {0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x13c1c00,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x0,0x0,0x0,0x300000,0x0,0x13c1c00,0x0,0x1000000,0x0,0x1000000,0x1000000,0x3fe,0x0,0x13c1c00,0x1000,0x0,0x0,0x4000,0x80010000,0x80010000,0x20000,0x20000,0x0,0x2000000,0x4000000,0x1000000,0x0,0x0,0x0,0x0,0x70000000,0x70000000,0x300000,0x300000,0x8c00000,0x8c00000,0x13c1c00,0x13c0800,0xc0000,0x1000800,0x3fe,0xc0000,0xc0000,0x1000000,0x1000800,0x0,0x0,0x0,0x0,0x800,0xbfe,0x13c1ffe,0x13c1ffe,0x0,0x0,0x13c1c00,0x0,0x400,0x400,0x13c1c00,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0xc0000,0xc0000,0x10c0800,0x8000,0x0,0x0,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x13c1c00,0x13c1c00,0x0,0x0,0x13c1c00,0x0,0x0,0x13c9c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c1c00,0x13c9c00,0x10c0800,0x13c1c00,0x10c0800,0x13c1c00,0x13c9c00,0x10c0800,0x0,0x13c1c00,0x13c1c00,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x2288a2,0x0,0x0,0x2288a2,0x200000,0x2288a2,0x0,0x0,0x0,0x400000,0x0,0x0,0x20000,0x0,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x88a2,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x800000,0x0,0x0,0x0,0xe4000000,0xe4000000,0x1b000000,0x1b000000,0x0,0x0,0x0,0x0,0x0,0x0,0x88a2,0x88a2,0x0,0x88a2,0x0,0x0,0x0,0x0,0x8000,0x8000,0x8000,0x800,0x800,0x800,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x2288a2,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x400000,0x400000,0x400000,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x400000,0x0,0x0,0x0,0x800,0x20000,0x0,0x0,0x2288a2,0x2288a2,0x0,0x0,0x88a2,0x2288a2,0x2288a2,0x0,0x0,0x2288a2,0x0,0x0,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x800,0x88a2,0x800,0x2288a2,0x2288a2,0x800,0x400000,0x88a2,0x88a2,}; + jj_la1_3 = new int[] {0x2288a2,0x0,0x0,0x2288a2,0x200000,0x2288a2,0x0,0x0,0x0,0x400000,0x0,0x0,0x20800,0x0,0x20800,0x20000,0x20800,0x22,0x22,0x8a2,0x0,0x88a2,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x88a2,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x800000,0x0,0x0,0x0,0xe4000000,0xe4000000,0x1b000000,0x1b000000,0x0,0x0,0x0,0x0,0x0,0x0,0x88a2,0x88a2,0x0,0x88a2,0x0,0x0,0x0,0x0,0x800,0x0,0x8000,0x8000,0x8000,0x800,0x800,0x88a2,0x88a2,0x80000,0xa2,0x88a2,0x400000,0x0,0x220800,0x2288a2,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x400000,0x400000,0x400000,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x400000,0x0,0x0,0x0,0x800,0x20000,0x0,0x0,0x2288a2,0x2288a2,0x0,0x0,0x88a2,0x2288a2,0x2288a2,0x0,0x0,0x2288a2,0x0,0x0,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x2288a2,0x800,0x88a2,0x800,0x2288a2,0x2288a2,0x800,0x400000,0x88a2,0x88a2,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x4000,0x0,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x3ffe,0x4000,0x0,0x0,0x3ffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,}; + jj_la1_4 = new int[] {0x4000,0x0,0x0,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x2,0x2,0x4000,0x4000,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x3ffe,0x4000,0x0,0x0,0x3ffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x2,0x0,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x0,0x2,0x0,0x0,0x4000,0x0,0x0,0x0,0x4000,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x0,0x0,0x4000,0x0,0x0,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x0,0x4000,0x4000,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[5]; static private boolean jj_rescan = false; @@ -6716,7 +6904,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 124; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6726,7 +6914,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 124; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6743,7 +6931,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 124; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6753,7 +6941,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 124; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6769,7 +6957,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 124; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6778,7 +6966,7 @@ final int startBlock, endBlock; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 124; i++) jj_la1[i] = -1; + for (int i = 0; i < 126; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6893,7 +7081,7 @@ final int startBlock, endBlock; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 124; i++) { + for (int i = 0; i < 126; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< expr = Expression() [ ] + token = expr = Expression() [ ] token2 = { - echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition()); + echoBlock = new PHPEchoBlock(expr,token.sourceStart,token.sourceEnd); pushOnAstNodes(echoBlock); return echoBlock;} } @@ -721,17 +721,16 @@ void Php() : ClassDeclaration ClassDeclaration() : { final ClassDeclaration classDeclaration; - final Token className,superclassName; - final int pos; - char[] classNameImage = SYNTAX_ERROR_CHAR; - char[] superclassNameImage = null; + Token className = null; + final Token superclassName, token; + String classNameImage = SYNTAX_ERROR_CHAR; + String superclassNameImage = null; } { - - {pos = SimpleCharStream.getPosition();} + token = try { className = - {classNameImage = className.image.toCharArray();} + {classNameImage = className.image;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; @@ -743,7 +742,7 @@ ClassDeclaration ClassDeclaration() : try { superclassName = - {superclassNameImage = superclassName.image.toCharArray();} + {superclassNameImage = superclassName.image;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; @@ -754,17 +753,26 @@ ClassDeclaration ClassDeclaration() : } ] { + int start, end; + if (className == null) { + start = token.sourceStart; + end = token.sourceEnd; + } else { + start = className.sourceStart; + end = className.sourceEnd; + } if (superclassNameImage == null) { + classDeclaration = new ClassDeclaration(currentSegment, classNameImage, - pos, - 0); + start, + end); } else { classDeclaration = new ClassDeclaration(currentSegment, classNameImage, superclassNameImage, - pos, - 0); + start, + end); } currentSegment.add(classDeclaration); currentSegment = classDeclaration; @@ -824,18 +832,20 @@ FieldDeclaration FieldDeclaration() : final VariableDeclaration[] list; final ArrayList arrayList = new ArrayList(); final int pos = SimpleCharStream.getPosition(); + final Token token; + Token token2 = null; } { - variableDeclaration = VariableDeclaratorNoSuffix() + token = variableDeclaration = VariableDeclaratorNoSuffix() {arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name()));} + outlineInfo.addVariable(variableDeclaration.name());} ( variableDeclaration = VariableDeclaratorNoSuffix() {arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name()));} + outlineInfo.addVariable(variableDeclaration.name());} )* try { - + token2 = } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration"; errorLevel = ERROR; @@ -846,9 +856,15 @@ FieldDeclaration FieldDeclaration() : {list = new VariableDeclaration[arrayList.size()]; arrayList.toArray(list); + int end; + if (token2 == null) { + end = list[list.length-1].sourceEnd; + } else { + end = token2.sourceEnd; + } return new FieldDeclaration(list, - pos, - SimpleCharStream.getPosition(), + token.sourceStart, + end, currentSegment);} } @@ -863,7 +879,6 @@ VariableDeclaration VariableDeclaratorNoSuffix() : } { varName = - {final int pos = SimpleCharStream.getPosition()-varName.image.length();} [ try { @@ -882,8 +897,8 @@ VariableDeclaration VariableDeclaratorNoSuffix() : new Variable(varName.image.substring(1), varName.sourceStart, varName.sourceEnd), - pos, - SimpleCharStream.getPosition()); + varName.sourceStart, + varName.sourceEnd); } return new VariableDeclaration(currentSegment, new Variable(varName.image.substring(1), @@ -891,7 +906,7 @@ VariableDeclaration VariableDeclaratorNoSuffix() : varName.sourceEnd), initializer, VariableDeclaration.EQUAL, - pos); + varName.sourceStart); } } @@ -902,7 +917,6 @@ VariableDeclaration VariableDeclarator() : { final AbstractVariable variable; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); } { variable = VariableDeclaratorId() @@ -922,14 +936,14 @@ VariableDeclaration VariableDeclarator() : if (initializer == null) { return new VariableDeclaration(currentSegment, variable, - pos, - SimpleCharStream.getPosition()); + variable.sourceStart, + variable.sourceEnd); } return new VariableDeclaration(currentSegment, variable, initializer, VariableDeclaration.EQUAL, - pos); + variable.sourceStart); } } @@ -968,7 +982,7 @@ AbstractVariable VariableDeclaratorId() : /** * Return a variablename without the $. * @return a variable name - */ + *//* Variable Variable(): { final StringBuffer buff; @@ -978,11 +992,13 @@ Variable Variable(): final int pos; } { - token = {pos = SimpleCharStream.getPosition()-token.image.length();} + token = [ expression = Expression() ] { if (expression == null) { - return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd); + return new Variable(token.image.substring(1), + token.sourceStart, + token.sourceEnd); } String s = expression.toStringExpression(); buff = new StringBuffer(token.image.length()+s.length()+2); @@ -997,13 +1013,57 @@ Variable Variable(): token = expr = VariableName() {return new Variable(expr,token.sourceStart,expr.sourceEnd);} +} */ + +Variable Variable() : +{ + Variable variable = null; + final Token token; +} +{ + token = [variable = Var(token)] + { + if (variable == null) { + return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd); + } + final StringBuffer buff = new StringBuffer(); + buff.append(token.image.substring(1)); + buff.append(variable.toStringExpression()); + return new Variable(buff.toString(),token.sourceStart,variable.sourceEnd); + } +| + token = variable = Var(token) + { + return new Variable(variable,token.sourceStart,variable.sourceEnd); + } +} + +Variable Var(final Token dollar) : +{ + Variable variable; + final Token token; + ConstantIdentifier constant; +} +{ + token = variable = Var(token) + {final StringBuffer buff = new StringBuffer(); + buff.append(token.image.substring(1)); + buff.append(variable.toStringExpression()); + return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd); + } +| + token = variable = Var(token) + {return new Variable(variable,dollar.sourceStart,variable.sourceEnd);} +| + constant = VariableName() + {return new Variable(constant.name,dollar.sourceStart,constant.sourceEnd);} } /** * A Variable name (without the $) * @return a variable name String */ -Variable VariableName(): +ConstantIdentifier VariableName(): { final StringBuffer buff; String expr; @@ -1014,9 +1074,7 @@ Variable VariableName(): int pos; } { - token = - {pos = SimpleCharStream.getPosition()-1;} - expression = Expression() token2 = + token = expression = Expression() token2 = {expr = expression.toStringExpression(); buff = new StringBuffer(expr.length()+2); buff.append("{"); @@ -1024,20 +1082,19 @@ Variable VariableName(): buff.append("}"); pos = SimpleCharStream.getPosition(); expr = buff.toString(); - return new Variable(expr, - token.sourceStart, - token2.sourceEnd); + return new ConstantIdentifier(expr, + token.sourceStart, + token2.sourceEnd); } | token = - {pos = SimpleCharStream.getPosition() - token.image.length();} [ expression = Expression() token2 = ] { if (expression == null) { - return new Variable(token.image, - token.sourceStart, - token.sourceEnd); + return new ConstantIdentifier(token.image, + token.sourceStart, + token.sourceEnd); } expr = expression.toStringExpression(); buff = new StringBuffer(token.image.length()+expr.length()+2); @@ -1046,11 +1103,11 @@ Variable VariableName(): buff.append(expr); buff.append("}"); expr = buff.toString(); - return new Variable(expr, - token.sourceStart, - token2.sourceEnd); + return new ConstantIdentifier(expr, + token.sourceStart, + token2.sourceEnd); } -| +/*| var = VariableName() { @@ -1064,7 +1121,7 @@ Variable VariableName(): return new Variable(token.image, token.sourceStart, token.sourceEnd); - } + } */ } Expression VariableInitializer() : @@ -1139,11 +1196,12 @@ MethodDeclaration MethodDeclaration() : final MethodDeclaration functionDeclaration; final Block block; final OutlineableWithChildren seg = currentSegment; + final Token token; } { - + token = try { - functionDeclaration = MethodDeclarator() + functionDeclaration = MethodDeclarator(token.sourceStart) {outlineInfo.addVariable(new String(functionDeclaration.name));} } catch (ParseException e) { if (errorMessage != null) throw e; @@ -1165,19 +1223,19 @@ MethodDeclaration MethodDeclaration() : * [&] IDENTIFIER(parameters ...). * @return a function description for the outline */ -MethodDeclaration MethodDeclarator() : +MethodDeclaration MethodDeclarator(final int start) : { - final Token identifier; + Token identifier = null; Token reference = null; - final Hashtable formalParameters; - final int pos = SimpleCharStream.getPosition(); - char[] identifierChar = SYNTAX_ERROR_CHAR; + final Hashtable formalParameters = new Hashtable(); + String identifierChar = SYNTAX_ERROR_CHAR; + final int end; } { [reference = ] try { identifier = - {identifierChar = identifier.image.toCharArray();} + {identifierChar = identifier.image;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; errorLevel = ERROR; @@ -1185,24 +1243,41 @@ MethodDeclaration MethodDeclarator() : errorEnd = SimpleCharStream.getPosition() + 1; processParseExceptionDebug(e); } - formalParameters = FormalParameters() - {MethodDeclaration method = new MethodDeclaration(currentSegment, - identifierChar, - formalParameters, - reference != null, - pos, - SimpleCharStream.getPosition()); - return method;} + end = FormalParameters(formalParameters) + { + int nameStart, nameEnd; + if (identifier == null) { + if (reference == null) { + nameStart = start + 9; + nameEnd = start + 10; + } else { + nameStart = reference.sourceEnd + 1; + nameEnd = reference.sourceEnd + 2; + } + } else { + nameStart = identifier.sourceStart; + nameEnd = identifier.sourceEnd; + } + return new MethodDeclaration(currentSegment, + identifierChar, + formalParameters, + reference != null, + nameStart, + nameEnd, + start, + end); + } } /** * FormalParameters follows method identifier. * (FormalParameter()) */ -Hashtable FormalParameters() : +int FormalParameters(final Hashtable parameters) : { VariableDeclaration var; - final Hashtable parameters = new Hashtable(); + final Token token; + int end; } { try { @@ -1223,15 +1298,17 @@ Hashtable FormalParameters() : )* ] try { - + token = + {end = token.sourceEnd;} } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; processParseExceptionDebug(e); + end = e.currentToken.sourceStart; } - {return parameters;} + {return end;} } /** @@ -1270,7 +1347,6 @@ Expression Expression() : { final Expression expr; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); int assignOperator = -1; } { @@ -1315,10 +1391,11 @@ Expression Expression() : Expression ExpressionWBang() : { final Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Token token; } { - expr = ExpressionWBang() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} + token = expr = ExpressionWBang() + {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} | expr = ExpressionNoBang() {return expr;} } @@ -1575,7 +1652,6 @@ Expression MultiplicativeExpression() : Expression UnaryExpression() : { final Expression expr; - final int pos = SimpleCharStream.getPosition(); } { /* expr = UnaryExpressionNoPrefix() //why did I had that ? @@ -1591,16 +1667,16 @@ Expression UnaryExpression() : Expression AtNotUnaryExpression() : { final Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Token token; } { - + token = expr = AtNotUnaryExpression() - {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);} + {return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);} | - + token = expr = AtNotUnaryExpression() - {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} + {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} | expr = UnaryExpressionNoPrefix() {return expr;} @@ -1610,12 +1686,16 @@ Expression AtNotUnaryExpression() : Expression UnaryExpressionNoPrefix() : { final Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Token token; } { - expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.PLUS,pos);} + token = expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr, + OperatorIds.PLUS, + token.sourceStart);} | - expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.MINUS,pos);} + token = expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr, + OperatorIds.MINUS, + token.sourceStart);} | expr = PreIncDecExpression() {return expr;} @@ -1629,22 +1709,21 @@ Expression PreIncDecExpression() : { final Expression expr; final int operator; - final int pos = SimpleCharStream.getPosition(); +final Token token; } { ( - {operator = OperatorIds.PLUS_PLUS;} + token = {operator = OperatorIds.PLUS_PLUS;} | - {operator = OperatorIds.MINUS_MINUS;} + token = {operator = OperatorIds.MINUS_MINUS;} ) expr = PrimaryExpression() - {return new PrefixedUnaryExpression(expr,operator,pos);} + {return new PrefixedUnaryExpression(expr,operator,token.sourceStart);} } Expression UnaryExpressionNotPlusMinus() : { final Expression expr; - final int pos = SimpleCharStream.getPosition(); } { LOOKAHEAD( (Type() | ) ) @@ -1705,16 +1784,28 @@ Expression PostfixExpression() : Expression PrimaryExpression() : { Expression expr = null; - Expression expr2; + Token token = null; +} +{ + [token = ] expr = refPrimaryExpression(token) + {return expr;} +| + expr = ArrayDeclarator() + {return expr;} +} + +Expression refPrimaryExpression(final Token reference) : +{ + Expression expr = null; + Expression expr2 = null; int assignOperator = -1; final Token identifier; final String var; - final int pos; } { - token = + identifier = { - expr = new ConstantIdentifier(token); + expr = new ConstantIdentifier(identifier); } ( expr2 = ClassIdentifier() @@ -1722,24 +1813,41 @@ Expression PrimaryExpression() : expr2, ClassAccess.STATIC);} )* - [ expr = Arguments(expr) ] - {return expr;} + [ expr2 = Arguments(expr) ] + { + if (expr2 == null) { + if (reference != null) { + ParseException e = generateParseException(); + errorMessage = "you cannot use a constant by reference"; + errorLevel = ERROR; + errorStart = reference.sourceStart; + errorEnd = reference.sourceEnd; + processParseExceptionDebug(e); + } + return expr; + } + return expr2; + } | - expr = VariableDeclaratorId() + expr = VariableDeclaratorId() //todo use the reference parameter ... [ expr = Arguments(expr) ] {return expr;} | token = expr = ClassIdentifier() - {expr = new PrefixedUnaryExpression(expr, - OperatorIds.NEW, - token.sourceStart); + { + int start; + if (reference == null) { + start = token.sourceStart; + } else { + start = reference.sourceStart; + } + expr = new ClassInstantiation(expr, + reference != null, + start); } [ expr = Arguments(expr) ] {return expr;} -| - expr = ArrayDeclarator() - {return expr;} } /** @@ -1750,34 +1858,11 @@ Expression PrimaryExpression() : ArrayInitializer ArrayDeclarator() : { final ArrayVariableDeclaration[] vars; - final int pos = SimpleCharStream.getPosition(); -} -{ - vars = ArrayInitializer() - {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());} -} - -PrefixedUnaryExpression classInstantiation() : -{ - Expression expr; - final StringBuffer buff; - final int pos; final Token token; } { - token = expr = ClassIdentifier() - [ - {pos = expr.sourceStart; - buff = new StringBuffer(expr.toStringExpression());} - expr = PrimaryExpression() - {buff.append(expr.toStringExpression()); - expr = new ConstantIdentifier(buff.toString(), - expr.sourceStart, - expr.sourceEnd);} - ] - {return new PrefixedUnaryExpression(expr, - OperatorIds.NEW, - token.sourceStart);} + token = vars = ArrayInitializer() + {return new ArrayInitializer(vars,token.sourceStart,SimpleCharStream.getPosition());} } Expression ClassIdentifier(): @@ -1804,7 +1889,7 @@ AbstractVariable VariableSuffix(final AbstractVariable prefix) : { try { - expr = VariableName() + expression = VariableName() } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; errorLevel = ERROR; @@ -1813,7 +1898,7 @@ AbstractVariable VariableSuffix(final AbstractVariable prefix) : throw e; } {return new ClassAccess(prefix, - expr, + expression, ClassAccess.NORMAL);} | [ expression = Expression() | expression = Type() ] //Not good @@ -1845,11 +1930,12 @@ Literal Literal() : FunctionCall Arguments(final Expression func) : { Expression[] args = null; +final Token token; } { [ args = ArgumentList() ] try { - + token = } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; errorLevel = ERROR; @@ -1857,7 +1943,7 @@ Expression[] args = null; errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - {return new FunctionCall(func,args,SimpleCharStream.getPosition());} + {return new FunctionCall(func,args,token.sourceEnd);} } /** @@ -1919,6 +2005,7 @@ Statement StatementNoBreak() : | [token=] statement = IncludeStatement() {if (token != null) { ((InclusionStatement)statement).silent = true; + statement.sourceStart = token.sourceStart; } return statement;} | statement = StaticStatement() {return statement;} @@ -1934,11 +2021,13 @@ Statement StatementNoBreak() : Statement expressionStatement() : { final Statement statement; + final Token token; } { statement = Expression() try { - + token = + {statement.sourceEnd = token.sourceEnd;} } catch (ParseException e) { if (e.currentToken.next.kind != PHPParserConstants.PHPEND) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; @@ -2057,14 +2146,14 @@ InclusionStatement IncludeStatement() : { final Expression expr; final int keyword; - final int pos = SimpleCharStream.getPosition(); final InclusionStatement inclusionStatement; + final Token token, token2; } { - ( {keyword = InclusionStatement.REQUIRE;} - | {keyword = InclusionStatement.REQUIRE_ONCE;} - | {keyword = InclusionStatement.INCLUDE;} - | {keyword = InclusionStatement.INCLUDE_ONCE;}) + ( token = {keyword = InclusionStatement.REQUIRE;} + | token = {keyword = InclusionStatement.REQUIRE_ONCE;} + | token = {keyword = InclusionStatement.INCLUDE;} + | token = {keyword = InclusionStatement.INCLUDE_ONCE;}) try { expr = Expression() } catch (ParseException e) { @@ -2080,11 +2169,11 @@ InclusionStatement IncludeStatement() : {inclusionStatement = new InclusionStatement(currentSegment, keyword, expr, - pos); + token.sourceStart); currentSegment.add(inclusionStatement); } try { - + token2 = } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; @@ -2092,7 +2181,8 @@ InclusionStatement IncludeStatement() : errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - {return inclusionStatement;} + {inclusionStatement.sourceEnd = token2.sourceEnd; + return inclusionStatement;} } PrintExpression PrintExpression() : @@ -2171,40 +2261,46 @@ EchoStatement EchoStatement() : { final ArrayList expressions = new ArrayList(); Expression expr; - final int pos = SimpleCharStream.getPosition(); + Token token; + Token token2 = null; } { - expr = Expression() + token = expr = Expression() {expressions.add(expr);} ( expr = Expression() {expressions.add(expr);} )* try { - + token2 = } catch (ParseException e) { if (e.currentToken.next.kind != 4) { errorMessage = "';' expected after 'echo' statement"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceEnd; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } } - {final Expression[] exprs = new Expression[expressions.size()]; + { + final Expression[] exprs = new Expression[expressions.size()]; expressions.toArray(exprs); - return new EchoStatement(exprs,pos);} + if (token2 == null) { + return new EchoStatement(exprs,token.sourceStart, exprs[exprs.length-1].sourceEnd); + } + return new EchoStatement(exprs,token.sourceStart, token2.sourceEnd); + } } GlobalStatement GlobalStatement() : { - final int pos = SimpleCharStream.getPosition(); Variable expr; final ArrayList vars = new ArrayList(); final GlobalStatement global; + final Token token, token2; } { - + token = expr = Variable() {vars.add(expr);} ( @@ -2212,14 +2308,14 @@ GlobalStatement GlobalStatement() : {vars.add(expr);} )* try { - + token2 = { final Variable[] variables = new Variable[vars.size()]; vars.toArray(variables); global = new GlobalStatement(currentSegment, variables, - pos, - SimpleCharStream.getPosition()); + token.sourceStart, + token2.sourceEnd); currentSegment.add(global); return global;} } catch (ParseException e) { @@ -2233,23 +2329,23 @@ GlobalStatement GlobalStatement() : StaticStatement StaticStatement() : { - final int pos = SimpleCharStream.getPosition(); final ArrayList vars = new ArrayList(); VariableDeclaration expr; + final Token token, token2; } { - expr = VariableDeclarator() {vars.add(expr);} + token = expr = VariableDeclarator() {vars.add(expr);} ( expr = VariableDeclarator() {vars.add(expr);} )* try { - + token2 = { final VariableDeclaration[] variables = new VariableDeclaration[vars.size()]; vars.toArray(variables); return new StaticStatement(variables, - pos, - SimpleCharStream.getPosition());} + token.sourceStart, + token2.sourceEnd);} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; errorLevel = ERROR; @@ -2261,13 +2357,12 @@ StaticStatement StaticStatement() : LabeledStatement LabeledStatement() : { - final int pos = SimpleCharStream.getPosition(); final Token label; final Statement statement; } { label = statement = Statement() - {return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());} + {return new LabeledStatement(label.image,statement,label.sourceStart,statement.sourceEnd);} } /** @@ -2279,13 +2374,13 @@ LabeledStatement LabeledStatement() : */ Block Block() : { - final int pos = SimpleCharStream.getPosition(); final ArrayList list = new ArrayList(); Statement statement; + final Token token, token2; } { try { - + token = } catch (ParseException e) { errorMessage = "'{' expected"; errorLevel = ERROR; @@ -2296,7 +2391,7 @@ Block Block() : ( statement = BlockStatement() {list.add(statement);} | statement = htmlBlock() {list.add(statement);})* try { - + token2 = } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected"; errorLevel = ERROR; @@ -2307,7 +2402,7 @@ Block Block() : { final Statement[] statements = new Statement[list.size()]; list.toArray(statements); - return new Block(statements,pos,SimpleCharStream.getPosition());} + return new Block(statements,token.sourceStart,token2.sourceEnd);} } Statement BlockStatement() : @@ -2315,8 +2410,16 @@ Statement BlockStatement() : final Statement statement; } { - statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement); - return statement;} + try { + statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement); + return statement;} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.image +"', a statement was expected"; + errorLevel = ERROR; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + throw e; + } | statement = ClassDeclaration() {return statement;} | statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement); currentSegment.add((MethodDeclaration) statement); @@ -2364,7 +2467,6 @@ VariableDeclaration LocalVariableDeclarator() : { final Variable varName; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); } { varName = Variable() [ initializer = Expression() ] @@ -2372,25 +2474,24 @@ VariableDeclaration LocalVariableDeclarator() : if (initializer == null) { return new VariableDeclaration(currentSegment, varName, - pos, - SimpleCharStream.getPosition()); + varName.sourceStart, + varName.sourceEnd); } return new VariableDeclaration(currentSegment, varName, initializer, VariableDeclaration.EQUAL, - pos); + varName.sourceStart); } } EmptyStatement EmptyStatement() : { - final int pos; + final Token token; } { - - {pos = SimpleCharStream.getPosition(); - return new EmptyStatement(pos-1,pos);} + token = + {return new EmptyStatement(token.sourceStart,token.sourceEnd);} } /** @@ -2406,11 +2507,11 @@ Expression StatementExpression() : | expr = PrimaryExpression() [ {return new PostfixedUnaryExpression(expr, - OperatorIds.PLUS_PLUS, - SimpleCharStream.getPosition());} + OperatorIds.PLUS_PLUS, + SimpleCharStream.getPosition());} | {return new PostfixedUnaryExpression(expr, - OperatorIds.MINUS_MINUS, - SimpleCharStream.getPosition());} + OperatorIds.MINUS_MINUS, + SimpleCharStream.getPosition());} ] {return expr;} } @@ -2596,12 +2697,12 @@ Expression SwitchLabel() : Break BreakStatement() : { Expression expression = null; - final int start = SimpleCharStream.getPosition(); + final Token token, token2; } { - [ expression = Expression() ] + token = [ expression = Expression() ] try { - + token2 = } catch (ParseException e) { errorMessage = "';' expected after 'break' keyword"; errorLevel = ERROR; @@ -2609,7 +2710,7 @@ Break BreakStatement() : errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - {return new Break(expression, start, SimpleCharStream.getPosition());} + {return new Break(expression, token.sourceStart, token2.sourceEnd);} } IfStatement IfStatement() : @@ -2617,9 +2718,11 @@ IfStatement IfStatement() : final int pos = SimpleCharStream.getPosition(); final Expression condition; final IfStatement ifStatement; + Token token; } { - condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2) + token = condition = Condition("if") ifStatement = IfStatement0(condition, + token.sourceStart,token.sourceStart+2) {return ifStatement;} } @@ -2863,13 +2966,13 @@ DoStatement DoStatement() : { final Statement action; final Expression condition; - final int pos = SimpleCharStream.getPosition(); + final Token token, token2; } { - action = Statement() condition = Condition("while") + token = action = Statement() condition = Condition("while") try { - - {return new DoStatement(condition,action,pos,SimpleCharStream.getPosition());} + token2 = + {return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; @@ -2883,11 +2986,11 @@ ForeachStatement ForeachStatement() : { Statement statement; Expression expression; - final int pos = SimpleCharStream.getPosition(); ArrayVariableDeclaration variable; + Token token; } { - + token = try { } catch (ParseException e) { @@ -2946,14 +3049,14 @@ ForeachStatement ForeachStatement() : {return new ForeachStatement(expression, variable, statement, - pos, - SimpleCharStream.getPosition());} + token.sourceStart, + statement.sourceEnd);} } ForStatement ForStatement() : { -final Token token; +final Token token,token2; final int pos = SimpleCharStream.getPosition(); Expression[] initializations = null; Expression condition = null; @@ -2978,7 +3081,12 @@ final int startBlock, endBlock; [ increments = StatementExpressionList() ] ( action = Statement() - {return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());} + {return new ForStatement(initializations, + condition, + increments, + action, + token.sourceStart, + action.sourceEnd);} | {startBlock = SimpleCharStream.getPosition();} @@ -3006,11 +3114,18 @@ final int startBlock, endBlock; throw e; } try { - + token2 = { final Statement[] stmtsArray = new Statement[list.size()]; list.toArray(stmtsArray); - return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());} + return new ForStatement(initializations, + condition, + increments, + new Block(stmtsArray, + stmtsArray[0].sourceStart, + stmtsArray[stmtsArray.length-1].sourceEnd), + token.sourceStart, + token2.sourceEnd);} } catch (ParseException e) { errorMessage = "';' expected after 'endfor' keyword"; errorLevel = ERROR; @@ -3043,21 +3158,22 @@ Expression[] StatementExpressionList() : expr = StatementExpression() {list.add(expr);} ( StatementExpression() {list.add(expr);})* { - final Expression[] exprsArray = new Expression[list.size()]; - list.toArray(exprsArray); - return exprsArray;} + final Expression[] exprsArray = new Expression[list.size()]; + list.toArray(exprsArray); + return exprsArray; + } } Continue ContinueStatement() : { Expression expr = null; - final int pos = SimpleCharStream.getPosition(); + final Token token,token2; } { - [ expr = Expression() ] + token = [ expr = Expression() ] try { - - {return new Continue(expr,pos,SimpleCharStream.getPosition());} + token2 = + {return new Continue(expr,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "';' expected after 'continue' statement"; errorLevel = ERROR; @@ -3070,13 +3186,13 @@ Continue ContinueStatement() : ReturnStatement ReturnStatement() : { Expression expr = null; - final int pos = SimpleCharStream.getPosition(); + final Token token,token2; } { - [ expr = Expression() ] + token = [ expr = Expression() ] try { - - {return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());} + token2 = + {return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd);} } catch (ParseException e) { errorMessage = "';' expected after 'return' statement"; errorLevel = ERROR; diff --git a/net.sourceforge.phpeclipse/src/test/TokenMgrError.java b/net.sourceforge.phpeclipse/src/test/TokenMgrError.java index 64cc02b..a52959c 100644 --- a/net.sourceforge.phpeclipse/src/test/TokenMgrError.java +++ b/net.sourceforge.phpeclipse/src/test/TokenMgrError.java @@ -90,7 +90,7 @@ public class TokenMgrError extends Error * curLexState : lexical state in which this error occured * errorLine : line number when the error occured * errorColumn : column number when the error occured - * errorAfter : prefix that was seen before this error occured + * errorAfter : functionName that was seen before this error occured * curchar : the offending character * Note: You can customize the lexical error message by modifying this method. */ -- 1.7.1