X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 13544ce..c4cc3b5 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -78,24 +78,26 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon PHPParser.fileToParse = fileToParse; } - public static final void phpParserTester(final String strEval) throws ParseException { + public final void phpParserTester(final String strEval) throws ParseException { final StringReader stream = new StringReader(strEval); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); + token_source = new PHPParserTokenManager(jj_input_stream); } ReInit(new StringReader(strEval)); init(); phpDocument = new PHPDocument(null,"_root".toCharArray()); currentSegment = phpDocument; outlineInfo = new PHPOutlineInfo(null, currentSegment); - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); + token_source.SwitchTo(PHPParserTokenManager.PHPPARSING); phpTest(); } - public static final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException { + public final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException { final Reader stream = new FileReader(fileName); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); + token_source = new PHPParserTokenManager(jj_input_stream); } ReInit(stream); init(); @@ -105,10 +107,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon phpFile(); } - public static final void htmlParserTester(final String strEval) throws ParseException { + public final void htmlParserTester(final String strEval) throws ParseException { final StringReader stream = new StringReader(strEval); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); + token_source = new PHPParserTokenManager(jj_input_stream); } ReInit(stream); init(); @@ -151,6 +154,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); + token_source = new PHPParserTokenManager(jj_input_stream); } ReInit(stream); init(); @@ -209,14 +213,14 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon e.currentToken.sourceStart, e.currentToken.sourceEnd, errorLevel, - "Line " + e.currentToken.beginLine+", "+e.currentToken.sourceStart+":"+e.currentToken.sourceEnd); + "Line " + e.currentToken.beginLine+", "+e.currentToken.sourceStart+':'+e.currentToken.sourceEnd); } else { setMarker(fileToParse, errorMessage, errorStart, errorEnd, errorLevel, - "Line " + e.currentToken.beginLine+", "+errorStart+":"+errorEnd); + "Line " + e.currentToken.beginLine+", "+errorStart+':'+errorEnd); errorStart = -1; errorEnd = -1; } @@ -270,6 +274,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); + token_source = new PHPParserTokenManager(jj_input_stream); } ReInit(stream); init(); @@ -305,45 +310,51 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** * Put a new html block in the stack. */ - public static final void createNewHTMLCode() { + public final void createNewHTMLCode() { final int currentPosition = token.sourceStart; if (currentPosition == htmlStart || - currentPosition > SimpleCharStream.currentBuffer.length()) { + currentPosition < htmlStart || + currentPosition > jj_input_stream.getCurrentBuffer().length()) { return; } - final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray(); - pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); + final String html = jj_input_stream.getCurrentBuffer().substring(htmlStart, currentPosition); + pushOnAstNodes(new HTMLCode(html, htmlStart,currentPosition)); } /** Create a new task. */ - public static final void createNewTask() { - final int currentPosition = token.sourceStart; - final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3, - SimpleCharStream.currentBuffer.indexOf("\n", - currentPosition)-1); + public final void createNewTask(final int todoStart) { + final String todo = jj_input_stream.getCurrentBuffer().substring(todoStart, + jj_input_stream.getCurrentBuffer().indexOf("\n", + todoStart)-1); if (!PARSER_DEBUG) { try { setMarker(fileToParse, todo, - SimpleCharStream.getBeginLine(), + jj_input_stream.getBeginLine(), TASK, - "Line "+SimpleCharStream.getBeginLine()); + "Line "+jj_input_stream.getBeginLine()); } catch (CoreException e) { PHPeclipsePlugin.log(e); } } } - private static final void parse() throws ParseException { + private final void parse() throws ParseException { phpFile(); } - static final public void phpTest() throws ParseException { + final public void todo() throws ParseException { + Token todoToken; + todoToken = jj_consume_token(23); + createNewTask(todoToken.sourceStart); + } + + final public void phpTest() throws ParseException { Php(); jj_consume_token(0); } - static final public void phpFile() throws ParseException { + final public void phpFile() throws ParseException { try { label_1: while (true) { @@ -379,8 +390,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case WHILE: case FOREACH: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -389,11 +400,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: case LBRACE: case SEMICOLON: - case DOLLAR_ID: ; break; default: @@ -402,11 +414,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } PhpBlock(); } - PHPParser.createNewHTMLCode(); + createNewHTMLCode(); } catch (TokenMgrError e) { PHPeclipsePlugin.log(e); - errorStart = SimpleCharStream.beginOffset; - errorEnd = SimpleCharStream.endOffset; + errorStart = jj_input_stream.getBeginOffset(); + errorEnd = jj_input_stream.getEndOffset(); errorMessage = e.getMessage(); errorLevel = ERROR; {if (true) throw generateParseException();} @@ -418,9 +430,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * or * or */ - static final public void PhpBlock() throws ParseException { + final public void PhpBlock() throws ParseException { final PHPEchoBlock phpEchoBlock; - final Token token; + final Token token,phpEnd; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPECHOSTART: phpEchoBlock = phpEchoBlock(); @@ -456,8 +468,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case WHILE: case FOREACH: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -466,11 +478,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: case LBRACE: case SEMICOLON: - case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPSTARTSHORT: case PHPSTARTLONG: @@ -501,14 +514,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_la1[2] = jj_gen; ; } + createNewHTMLCode(); Php(); try { - jj_consume_token(PHPEND); + phpEnd = jj_consume_token(PHPEND); + htmlStart = phpEnd.sourceEnd; } catch (ParseException e) { errorMessage = "'?>' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; processParseExceptionDebug(e); } break; @@ -519,11 +534,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - static final public PHPEchoBlock phpEchoBlock() throws ParseException { + final public PHPEchoBlock phpEchoBlock() throws ParseException { final Expression expr; final PHPEchoBlock echoBlock; final Token token, token2; token = jj_consume_token(PHPECHOSTART); + createNewHTMLCode(); expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: @@ -534,13 +550,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ; } token2 = jj_consume_token(PHPEND); + htmlStart = token2.sourceEnd; + echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd); pushOnAstNodes(echoBlock); {if (true) return echoBlock;} throw new Error("Missing return statement in function"); } - static final public void Php() throws ParseException { + final public void Php() throws ParseException { label_2: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -571,8 +589,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case WHILE: case FOREACH: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -581,11 +599,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: case LBRACE: case SEMICOLON: - case DOLLAR_ID: ; break; default: @@ -596,12 +615,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - static final public ClassDeclaration ClassDeclaration() throws ParseException { + final public ClassDeclaration ClassDeclaration() throws ParseException { final ClassDeclaration classDeclaration; Token className = null; final Token superclassName, token, extendsToken; String classNameImage = SYNTAX_ERROR_CHAR; String superclassNameImage = null; + final int classEnd; token = jj_consume_token(CLASS); try { className = jj_consume_token(IDENTIFIER); @@ -655,22 +675,23 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } currentSegment.add(classDeclaration); currentSegment = classDeclaration; - ClassBody(classDeclaration); + classEnd = ClassBody(classDeclaration); currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - classDeclaration.sourceEnd = SimpleCharStream.getPosition(); + classDeclaration.sourceEnd = classEnd; pushOnAstNodes(classDeclaration); {if (true) return classDeclaration;} throw new Error("Missing return statement in function"); } - static final public void ClassBody(final ClassDeclaration classDeclaration) throws ParseException { + final public int ClassBody(final ClassDeclaration classDeclaration) throws ParseException { +Token token; try { jj_consume_token(LBRACE); } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; processParseExceptionDebug(e); } label_3: @@ -687,20 +708,23 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ClassBodyDeclaration(classDeclaration); } try { - jj_consume_token(RBRACE); + token = jj_consume_token(RBRACE); + {if (true) return token.sourceEnd;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; processParseExceptionDebug(e); + {if (true) return this.token.sourceEnd;} } + throw new Error("Missing return statement in function"); } /** * A class can contain only methods and fields. */ - static final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException { + final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException { final MethodDeclaration method; final FieldDeclaration field; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -724,7 +748,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;. * it is only used by ClassBodyDeclaration() */ - static final public FieldDeclaration FieldDeclaration() throws ParseException { + final public FieldDeclaration FieldDeclaration() throws ParseException { VariableDeclaration variableDeclaration; final VariableDeclaration[] list; final ArrayList arrayList = new ArrayList(); @@ -734,7 +758,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon token = jj_consume_token(VAR); variableDeclaration = VariableDeclaratorNoSuffix(); arrayList.add(variableDeclaration); - outlineInfo.addVariable(variableDeclaration.name()); pos = variableDeclaration.sourceEnd; label_4: while (true) { @@ -780,11 +803,28 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * a strict variable declarator : there cannot be a suffix here. * It will be used by fields and formal parameters */ - static final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException { - final Token varName; - Expression initializer = null; + final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException { + final Token token, lbrace,rbrace; + Expression expr, initializer = null; Token assignToken; - varName = jj_consume_token(DOLLAR_ID); + Variable variable; + jj_consume_token(DOLLAR); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + variable = new Variable(token.image,token.sourceStart,token.sourceEnd); + break; + case LBRACE: + lbrace = jj_consume_token(LBRACE); + expr = Expression(); + rbrace = jj_consume_token(RBRACE); + variable = new Variable(expr,lbrace.sourceStart,rbrace.sourceEnd); + break; + default: + jj_la1[10] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: assignToken = jj_consume_token(ASSIGN); @@ -799,31 +839,27 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } break; default: - jj_la1[10] = jj_gen; + jj_la1[11] = jj_gen; ; } if (initializer == null) { {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1), - varName.sourceStart+1, - varName.sourceEnd+1), - varName.sourceStart+1, - varName.sourceEnd+1);} + variable, + variable.sourceStart, + variable.sourceEnd);} } {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1), - varName.sourceStart+1, - varName.sourceEnd+1), + variable, initializer, VariableDeclaration.EQUAL, - varName.sourceStart+1);} + variable.sourceStart);} throw new Error("Missing return statement in function"); } /** * this will be used by static statement */ - static final public VariableDeclaration VariableDeclarator() throws ParseException { + final public VariableDeclaration VariableDeclarator() throws ParseException { final AbstractVariable variable; Expression initializer = null; final Token token; @@ -842,7 +878,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } break; default: - jj_la1[11] = jj_gen; + jj_la1[12] = jj_gen; ; } if (initializer == null) { @@ -863,9 +899,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * A Variable name. * @return the variable name (with suffix) */ - static final public AbstractVariable VariableDeclaratorId() throws ParseException { - final Variable var; - AbstractVariable expression = null; + final public AbstractVariable VariableDeclaratorId() throws ParseException { + AbstractVariable var; try { var = Variable(); label_5: @@ -875,206 +910,61 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } else { break label_5; } - expression = VariableSuffix(var); + var = VariableSuffix(var); } - if (expression == null) { - {if (true) return var;} - } - {if (true) return expression;} + {if (true) return var;} } catch (ParseException e) { errorMessage = "'$' expected for variable identifier"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; {if (true) throw e;} } throw new Error("Missing return statement in function"); } -/** - * Return a variablename without the $. - * @return a variable name - *//* -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+1, - token.sourceEnd+1); - } - 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+1,token.sourceEnd+1); - } -| - token = - expr = VariableName() - {return new Variable(expr,token.sourceStart,expr.sourceEnd);} -} */ - static final public Variable Variable() throws ParseException { + 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); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR: - case IDENTIFIER: - case LBRACE: - case DOLLAR_ID: - variable = Var(token); - break; - default: - jj_la1[12] = jj_gen; - ; - } - if (variable == null) { - {if (true) return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);} - } - final StringBuffer buff = new StringBuffer(); - buff.append(token.image.substring(1)); - buff.append(variable.toStringExpression()); - {if (true) return new Variable(buff.toString(),token.sourceStart+1,variable.sourceEnd+1);} - break; - case DOLLAR: - token = jj_consume_token(DOLLAR); - variable = Var(token); - {if (true) return new Variable(variable,token.sourceStart,variable.sourceEnd);} - break; - default: - jj_la1[13] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + token = jj_consume_token(DOLLAR); + variable = Var(); + {if (true) return variable;} throw new Error("Missing return statement in function"); } - static final public Variable Var(final Token dollar) throws ParseException { + final public Variable Var() throws ParseException { Variable variable = null; - final Token token; + final Token token,token2; ConstantIdentifier constant; + Expression expression; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR_ID: - token = jj_consume_token(DOLLAR_ID); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR: - case IDENTIFIER: - case LBRACE: - case DOLLAR_ID: - variable = Var(token); - break; - default: - jj_la1[14] = jj_gen; - ; - } - if (variable == null) { - {if (true) return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);} - } - final StringBuffer buff = new StringBuffer(); - buff.append(token.image.substring(1)); - buff.append(variable.toStringExpression()); - {if (true) return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd);} + case DOLLAR: + token = jj_consume_token(DOLLAR); + variable = Var(); + {if (true) return new Variable(variable,variable.sourceStart,variable.sourceEnd);} break; - default: - jj_la1[15] = jj_gen; - if (jj_2_2(2147483647)) { - token = jj_consume_token(DOLLAR); - variable = Var(token); - {if (true) return new Variable(variable,dollar.sourceStart,variable.sourceEnd);} - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IDENTIFIER: - case LBRACE: - constant = VariableName(); - {if (true) return new Variable(constant.name,dollar.sourceStart,constant.sourceEnd);} - break; - default: - jj_la1[16] = 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 ConstantIdentifier VariableName() throws ParseException { - final StringBuffer buff; - String expr; - Expression expression = null; - final Token token; - Token token2 = null; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: token = jj_consume_token(LBRACE); expression = Expression(); token2 = jj_consume_token(RBRACE); - expr = expression.toStringExpression(); - buff = new StringBuffer(expr.length()+2); - buff.append("{"); - buff.append(expr); - buff.append("}"); - expr = buff.toString(); - {if (true) return new ConstantIdentifier(expr, - token.sourceStart, - token2.sourceEnd);} + {if (true) return new Variable(expression, + token.sourceStart, + token2.sourceEnd);} break; case IDENTIFIER: token = jj_consume_token(IDENTIFIER); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACE: - jj_consume_token(LBRACE); - expression = Expression(); - token2 = jj_consume_token(RBRACE); - break; - default: - jj_la1[17] = jj_gen; - ; - } - if (expression == null) { - {if (true) return new ConstantIdentifier(token.image, - token.sourceStart, - token.sourceEnd);} - } - expr = expression.toStringExpression(); - buff = new StringBuffer(token.image.length()+expr.length()+2); - buff.append(token.image); - buff.append("{"); - buff.append(expr); - buff.append("}"); - expr = buff.toString(); - {if (true) return new ConstantIdentifier(expr, - token.sourceStart, - token2.sourceEnd);} + outlineInfo.addVariable('$' + token.image); + {if (true) return new Variable(token.image,token.sourceStart,token.sourceEnd);} break; default: - jj_la1[18] = jj_gen; + jj_la1[13] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public Expression VariableInitializer() throws ParseException { + final public Expression VariableInitializer() throws ParseException { final Expression expr; final Token token, token2; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1084,6 +974,7 @@ Variable Variable(): case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: expr = Literal(); {if (true) return expr;} break; @@ -1097,7 +988,7 @@ Variable Variable(): token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[19] = jj_gen; + jj_la1[14] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1115,7 +1006,7 @@ Variable Variable(): token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[20] = jj_gen; + jj_la1[15] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1132,14 +1023,14 @@ Variable Variable(): {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[21] = jj_gen; + jj_la1[16] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public ArrayVariableDeclaration ArrayVariable() throws ParseException { + final public ArrayVariableDeclaration ArrayVariable() throws ParseException { final Expression expr,expr2; expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1149,14 +1040,14 @@ final Expression expr,expr2; {if (true) return new ArrayVariableDeclaration(expr,expr2);} break; default: - jj_la1[22] = jj_gen; + jj_la1[17] = jj_gen; ; } - {if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());} + {if (true) return new ArrayVariableDeclaration(expr,jj_input_stream.getPosition());} throw new Error("Missing return statement in function"); } - static final public ArrayVariableDeclaration[] ArrayInitializer() throws ParseException { + final public ArrayVariableDeclaration[] ArrayInitializer() throws ParseException { ArrayVariableDeclaration expr; final ArrayList list = new ArrayList(); jj_consume_token(LPAREN); @@ -1169,8 +1060,8 @@ final Expression expr,expr2; case TRUE: case FALSE: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -1179,14 +1070,15 @@ final Expression expr,expr2; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expr = ArrayVariable(); list.add(expr); label_6: while (true) { - if (jj_2_3(2)) { + if (jj_2_2(2)) { ; } else { break label_6; @@ -1197,7 +1089,7 @@ final Expression expr,expr2; } break; default: - jj_la1[23] = jj_gen; + jj_la1[18] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1206,7 +1098,7 @@ final Expression expr,expr2; list.add(null); break; default: - jj_la1[24] = jj_gen; + jj_la1[19] = jj_gen; ; } jj_consume_token(RPAREN); @@ -1220,7 +1112,7 @@ final Expression expr,expr2; * A Method Declaration. * function MetodDeclarator() Block() */ - static final public MethodDeclaration MethodDeclaration() throws ParseException { + final public MethodDeclaration MethodDeclaration() throws ParseException { final MethodDeclaration functionDeclaration; final Block block; final OutlineableWithChildren seg = currentSegment; @@ -1233,8 +1125,8 @@ final Expression expr,expr2; if (errorMessage != null) {if (true) throw e;} errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; {if (true) throw e;} } currentSegment = functionDeclaration; @@ -1250,10 +1142,10 @@ final Expression expr,expr2; * [&] IDENTIFIER(parameters ...). * @return a function description for the outline */ - static final public MethodDeclaration MethodDeclarator(final int start) throws ParseException { + final public MethodDeclaration MethodDeclarator(final int start) throws ParseException { Token identifier = null; Token reference = null; - final Hashtable formalParameters = new Hashtable(); + final ArrayList formalParameters = new ArrayList(); String identifierChar = SYNTAX_ERROR_CHAR; int end = start; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1262,7 +1154,7 @@ final Expression expr,expr2; end = reference.sourceEnd; break; default: - jj_la1[25] = jj_gen; + jj_la1[20] = jj_gen; ; } try { @@ -1305,10 +1197,10 @@ final Expression expr,expr2; * FormalParameters follows method identifier. * (FormalParameter()) */ - static final public int FormalParameters(final Hashtable parameters) throws ParseException { + final public int FormalParameters(final ArrayList parameters) throws ParseException { VariableDeclaration var; final Token token; - Token tok = PHPParser.token; + Token tok = this.token; int end = tok.sourceEnd; try { tok = jj_consume_token(LPAREN); @@ -1322,9 +1214,9 @@ final Expression expr,expr2; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: - case DOLLAR_ID: + case DOLLAR: var = FormalParameter(); - parameters.put(var.name(),var);end = var.sourceEnd; + parameters.add(var);end = var.sourceEnd; label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1332,16 +1224,16 @@ final Expression expr,expr2; ; break; default: - jj_la1[26] = jj_gen; + jj_la1[21] = jj_gen; break label_7; } jj_consume_token(COMMA); var = FormalParameter(); - parameters.put(var.name(),var);end = var.sourceEnd; + parameters.add(var);end = var.sourceEnd; } break; default: - jj_la1[27] = jj_gen; + jj_la1[22] = jj_gen; ; } try { @@ -1362,7 +1254,7 @@ final Expression expr,expr2; * A formal parameter. * $varname[=value] (,$varname[=value]) */ - static final public VariableDeclaration FormalParameter() throws ParseException { + final public VariableDeclaration FormalParameter() throws ParseException { final VariableDeclaration variableDeclaration; Token token = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1370,10 +1262,11 @@ final Expression expr,expr2; token = jj_consume_token(BIT_AND); break; default: - jj_la1[28] = jj_gen; + jj_la1[23] = jj_gen; ; } variableDeclaration = VariableDeclaratorNoSuffix(); + outlineInfo.addVariable('$'+variableDeclaration.name()); if (token != null) { variableDeclaration.setReference(true); } @@ -1381,7 +1274,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public ConstantIdentifier Type() throws ParseException { + final public ConstantIdentifier Type() throws ParseException { final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STRING: @@ -1421,14 +1314,14 @@ final Expression expr,expr2; {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[29] = jj_gen; + jj_la1[24] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public Expression Expression() throws ParseException { + final public Expression Expression() throws ParseException { final Expression expr; Expression initializer = null; int assignOperator = -1; @@ -1439,8 +1332,8 @@ final Expression expr,expr2; case TRUE: case FALSE: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -1449,9 +1342,10 @@ final Expression expr,expr2; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expr = ConditionalExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: @@ -1476,12 +1370,12 @@ final Expression expr,expr2; } errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; errorLevel = ERROR; - errorEnd = SimpleCharStream.getPosition(); + errorEnd = jj_input_stream.getPosition(); {if (true) throw e;} } break; default: - jj_la1[30] = jj_gen; + jj_la1[25] = jj_gen; ; } if (assignOperator != -1) {// todo : change this, very very bad :( @@ -1508,14 +1402,14 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[31] = jj_gen; + jj_la1[26] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public Expression ExpressionWBang() throws ParseException { + final public Expression ExpressionWBang() throws ParseException { final Expression expr; final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1530,14 +1424,14 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[32] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public Expression ExpressionNoBang() throws ParseException { + final public Expression ExpressionNoBang() throws ParseException { Expression expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LIST: @@ -1549,7 +1443,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[33] = jj_gen; + jj_la1[28] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1560,7 +1454,7 @@ final Expression expr,expr2; * Any assignement operator. * @return the assignement operator id */ - static final public int AssignmentOperator() throws ParseException { + final public int AssignmentOperator() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); @@ -1615,14 +1509,14 @@ final Expression expr,expr2; {if (true) return VariableDeclaration.TILDE_EQUAL;} break; default: - jj_la1[34] = jj_gen; + jj_la1[29] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public Expression ConditionalExpression() throws ParseException { + final public Expression ConditionalExpression() throws ParseException { final Expression expr; Expression expr2 = null; Expression expr3 = null; @@ -1635,7 +1529,7 @@ final Expression expr,expr2; expr3 = ConditionalExpression(); break; default: - jj_la1[35] = jj_gen; + jj_la1[30] = jj_gen; ; } if (expr3 == null) { @@ -1645,7 +1539,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression ConditionalOrExpression() throws ParseException { + final public Expression ConditionalOrExpression() throws ParseException { Expression expr,expr2; int operator; expr = ConditionalAndExpression(); @@ -1657,7 +1551,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[36] = jj_gen; + jj_la1[31] = jj_gen; break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1670,7 +1564,7 @@ final Expression expr,expr2; operator = OperatorIds.ORL; break; default: - jj_la1[37] = jj_gen; + jj_la1[32] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1681,7 +1575,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression ConditionalAndExpression() throws ParseException { + final public Expression ConditionalAndExpression() throws ParseException { Expression expr,expr2; int operator; expr = ConcatExpression(); @@ -1693,7 +1587,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[38] = jj_gen; + jj_la1[33] = jj_gen; break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1706,7 +1600,7 @@ final Expression expr,expr2; operator = OperatorIds.ANDL; break; default: - jj_la1[39] = jj_gen; + jj_la1[34] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1717,7 +1611,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression ConcatExpression() throws ParseException { + final public Expression ConcatExpression() throws ParseException { Expression expr,expr2; expr = InclusiveOrExpression(); label_10: @@ -1727,7 +1621,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[40] = jj_gen; + jj_la1[35] = jj_gen; break label_10; } jj_consume_token(DOT); @@ -1738,7 +1632,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression InclusiveOrExpression() throws ParseException { + final public Expression InclusiveOrExpression() throws ParseException { Expression expr,expr2; expr = ExclusiveOrExpression(); label_11: @@ -1748,7 +1642,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[41] = jj_gen; + jj_la1[36] = jj_gen; break label_11; } jj_consume_token(BIT_OR); @@ -1759,7 +1653,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression ExclusiveOrExpression() throws ParseException { + final public Expression ExclusiveOrExpression() throws ParseException { Expression expr,expr2; expr = AndExpression(); label_12: @@ -1769,7 +1663,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[42] = jj_gen; + jj_la1[37] = jj_gen; break label_12; } jj_consume_token(XOR); @@ -1780,7 +1674,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression AndExpression() throws ParseException { + final public Expression AndExpression() throws ParseException { Expression expr,expr2; expr = EqualityExpression(); label_13: @@ -1790,7 +1684,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[43] = jj_gen; + jj_la1[38] = jj_gen; break label_13; } jj_consume_token(BIT_AND); @@ -1801,7 +1695,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression EqualityExpression() throws ParseException { + final public Expression EqualityExpression() throws ParseException { Expression expr,expr2; int operator; Token token; @@ -1817,7 +1711,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[44] = jj_gen; + jj_la1[39] = jj_gen; break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1842,7 +1736,7 @@ final Expression expr,expr2; operator = OperatorIds.EQUAL_EQUAL_EQUAL; break; default: - jj_la1[45] = jj_gen; + jj_la1[40] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1865,7 +1759,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression RelationalExpression() throws ParseException { + final public Expression RelationalExpression() throws ParseException { Expression expr,expr2; int operator; expr = ShiftExpression(); @@ -1879,7 +1773,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[46] = jj_gen; + jj_la1[41] = jj_gen; break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1900,7 +1794,7 @@ final Expression expr,expr2; operator = OperatorIds.GREATER_EQUAL; break; default: - jj_la1[47] = jj_gen; + jj_la1[42] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1911,7 +1805,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression ShiftExpression() throws ParseException { + final public Expression ShiftExpression() throws ParseException { Expression expr,expr2; int operator; expr = AdditiveExpression(); @@ -1924,7 +1818,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[48] = jj_gen; + jj_la1[43] = jj_gen; break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1941,7 +1835,7 @@ final Expression expr,expr2; operator = OperatorIds.UNSIGNED_RIGHT_SHIFT; break; default: - jj_la1[49] = jj_gen; + jj_la1[44] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1952,7 +1846,7 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression AdditiveExpression() throws ParseException { + final public Expression AdditiveExpression() throws ParseException { Expression expr,expr2; int operator; expr = MultiplicativeExpression(); @@ -1964,7 +1858,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[50] = jj_gen; + jj_la1[45] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1977,7 +1871,7 @@ final Expression expr,expr2; operator = OperatorIds.MINUS; break; default: - jj_la1[51] = jj_gen; + jj_la1[46] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1988,17 +1882,17 @@ final Expression expr,expr2; throw new Error("Missing return statement in function"); } - static final public Expression MultiplicativeExpression() throws ParseException { + final public Expression MultiplicativeExpression() throws ParseException { Expression expr,expr2; int operator; try { expr = UnaryExpression(); } catch (ParseException e) { if (errorMessage != null) {if (true) throw e;} - errorMessage = "unexpected token '"+e.currentToken.next.image+"'"; + errorMessage = "unexpected token '"+e.currentToken.next.image+'\''; errorLevel = ERROR; - errorStart = PHPParser.token.sourceStart; - errorEnd = PHPParser.token.sourceEnd; + errorStart = this.token.sourceStart; + errorEnd = this.token.sourceEnd; {if (true) throw e;} } label_18: @@ -2010,7 +1904,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[52] = jj_gen; + jj_la1[47] = jj_gen; break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2027,7 +1921,7 @@ final Expression expr,expr2; operator = OperatorIds.REMAINDER; break; default: - jj_la1[53] = jj_gen; + jj_la1[48] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2041,13 +1935,60 @@ final Expression expr,expr2; /** * An unary expression starting with @, & or nothing */ - static final public Expression UnaryExpression() throws ParseException { + final public Expression UnaryExpression() throws ParseException { final Expression expr; /* expr = UnaryExpressionNoPrefix() //why did I had that ? {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} | */ + expr = AtNotTildeUnaryExpression(); + {if (true) return expr;} + throw new Error("Missing return statement in function"); + } + + final public Expression AtNotTildeUnaryExpression() throws ParseException { + final Expression expr; + final Token token; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AT: + token = jj_consume_token(AT); + expr = AtNotTildeUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);} + break; + case TILDE: + token = jj_consume_token(TILDE); + expr = AtNotTildeUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.TWIDDLE,token.sourceStart);} + break; + case BANG: + token = jj_consume_token(BANG); expr = AtNotUnaryExpression(); - {if (true) return expr;} + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} + break; + case ARRAY: + case NEW: + case NULL: + case TRUE: + case FALSE: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: + case IDENTIFIER: + case LPAREN: + expr = UnaryExpressionNoPrefix(); + {if (true) return expr;} + break; + default: + jj_la1[49] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); } @@ -2055,7 +1996,7 @@ final Expression expr,expr2; * An expression prefixed (or not) by one or more @ and !. * @return the expression */ - static final public Expression AtNotUnaryExpression() throws ParseException { + final public Expression AtNotUnaryExpression() throws ParseException { final Expression expr; final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2074,7 +2015,6 @@ final Expression expr,expr2; case NULL: case TRUE: case FALSE: - case DOLLAR: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2083,35 +2023,36 @@ final Expression expr,expr2; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expr = UnaryExpressionNoPrefix(); {if (true) return expr;} break; default: - jj_la1[54] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public Expression UnaryExpressionNoPrefix() throws ParseException { + final public Expression UnaryExpressionNoPrefix() throws ParseException { final Expression expr; final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: token = jj_consume_token(PLUS); - expr = AtNotUnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr, + expr = AtNotTildeUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr, OperatorIds.PLUS, token.sourceStart);} break; case MINUS: token = jj_consume_token(MINUS); - expr = AtNotUnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr, + expr = AtNotTildeUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr, OperatorIds.MINUS, token.sourceStart);} break; @@ -2125,26 +2066,26 @@ final Expression expr,expr2; case NULL: case TRUE: case FALSE: - case DOLLAR: case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expr = UnaryExpressionNotPlusMinus(); {if (true) return expr;} break; default: - jj_la1[55] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public Expression PreIncDecExpression() throws ParseException { + final public Expression PreIncDecExpression() throws ParseException { final Expression expr; final int operator; final Token token; @@ -2158,7 +2099,7 @@ final Token token; operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[56] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2167,19 +2108,18 @@ final Token token; throw new Error("Missing return statement in function"); } - static final public Expression UnaryExpressionNotPlusMinus() throws ParseException { + final public Expression UnaryExpressionNotPlusMinus() throws ParseException { final Expression expr; - if (jj_2_4(2147483647)) { + if (jj_2_3(2147483647)) { expr = CastExpression(); {if (true) return expr;} } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case NEW: - case DOLLAR: case BIT_AND: + case DOLLAR: case IDENTIFIER: - case DOLLAR_ID: expr = PostfixExpression(); {if (true) return expr;} break; @@ -2189,6 +2129,7 @@ final Token token; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: expr = Literal(); {if (true) return expr;} break; @@ -2207,7 +2148,7 @@ final Token token; {if (true) return expr;} break; default: - jj_la1[57] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2215,7 +2156,7 @@ final Token token; throw new Error("Missing return statement in function"); } - static final public CastExpression CastExpression() throws ParseException { + final public CastExpression CastExpression() throws ParseException { final ConstantIdentifier type; final Expression expr; final Token token,token1; @@ -2237,7 +2178,7 @@ final Token token,token1; type = new ConstantIdentifier(token); break; default: - jj_la1[58] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2247,7 +2188,7 @@ final Token token,token1; throw new Error("Missing return statement in function"); } - static final public Expression PostfixExpression() throws ParseException { + final public Expression PostfixExpression() throws ParseException { final Expression expr; int operator = -1; Token token = null; @@ -2265,13 +2206,13 @@ final Token token,token1; operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[59] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[60] = jj_gen; + jj_la1[56] = jj_gen; ; } if (operator == -1) { @@ -2281,21 +2222,20 @@ final Token token,token1; throw new Error("Missing return statement in function"); } - static final public Expression PrimaryExpression() throws ParseException { + final public Expression PrimaryExpression() throws ParseException { Expression expr; Token token = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case NEW: - case DOLLAR: case BIT_AND: + case DOLLAR: 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[61] = jj_gen; + jj_la1[57] = jj_gen; ; } expr = refPrimaryExpression(token); @@ -2306,14 +2246,14 @@ final Token token,token1; {if (true) return expr;} break; default: - jj_la1[62] = jj_gen; + jj_la1[58] = 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 { + final public Expression refPrimaryExpression(final Token reference) throws ParseException { Expression expr; Expression expr2 = null; final Token identifier; @@ -2328,7 +2268,7 @@ final Token token,token1; ; break; default: - jj_la1[63] = jj_gen; + jj_la1[59] = jj_gen; break label_19; } jj_consume_token(STATICCLASSACCESS); @@ -2342,7 +2282,7 @@ final Token token,token1; expr2 = Arguments(expr); break; default: - jj_la1[64] = jj_gen; + jj_la1[60] = jj_gen; ; } if (expr2 == null) { @@ -2359,14 +2299,13 @@ final Token token,token1; {if (true) return expr2;} break; case DOLLAR: - case DOLLAR_ID: expr = VariableDeclaratorId(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: expr = Arguments(expr); break; default: - jj_la1[65] = jj_gen; + jj_la1[61] = jj_gen; ; } {if (true) return expr;} @@ -2388,13 +2327,13 @@ final Token token,token1; expr = Arguments(expr); break; default: - jj_la1[66] = jj_gen; + jj_la1[62] = jj_gen; ; } {if (true) return expr;} break; default: - jj_la1[67] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2406,18 +2345,18 @@ final Token token,token1; * array(vars) * @return an array */ - static final public ArrayInitializer ArrayDeclarator() throws ParseException { + final public ArrayInitializer ArrayDeclarator() throws ParseException { final ArrayVariableDeclaration[] vars; final Token token; token = jj_consume_token(ARRAY); vars = ArrayInitializer(); {if (true) return new ArrayInitializer(vars, token.sourceStart, - PHPParser.token.sourceEnd);} + this.token.sourceEnd);} throw new Error("Missing return statement in function"); } - static final public Expression ClassIdentifier() throws ParseException { + final public Expression ClassIdentifier() throws ParseException { final Expression expr; final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2438,12 +2377,11 @@ final Token token,token1; {if (true) return expr;} break; case DOLLAR: - case DOLLAR_ID: expr = VariableDeclaratorId(); {if (true) return expr;} break; default: - jj_la1[68] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2453,9 +2391,9 @@ final Token token,token1; /** * Used by Variabledeclaratorid and primarysuffix */ - static final public AbstractVariable VariableSuffix(final AbstractVariable prefix) throws ParseException { + final public AbstractVariable VariableSuffix(final AbstractVariable prefix) throws ParseException { Expression expression = null; - final Token classAccessToken; + final Token classAccessToken,lbrace,rbrace; Token token; int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2463,16 +2401,23 @@ final Token token,token1; classAccessToken = jj_consume_token(CLASSACCESS); try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IDENTIFIER: case LBRACE: - expression = VariableName(); + lbrace = jj_consume_token(LBRACE); + expression = Expression(); + rbrace = jj_consume_token(RBRACE); + expression = new Variable(expression, + lbrace.sourceStart, + rbrace.sourceEnd); + break; + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + expression = new ConstantIdentifier(token.image,token.sourceStart,token.sourceEnd); break; case DOLLAR: - case DOLLAR_ID: expression = Variable(); break; default: - jj_la1[69] = jj_gen; + jj_la1[65] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2508,8 +2453,8 @@ final Token token,token1; case INT: case INTEGER: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2518,9 +2463,10 @@ final Token token,token1; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -2530,8 +2476,8 @@ final Token token,token1; case TRUE: case FALSE: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2540,9 +2486,10 @@ final Token token,token1; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expression = Expression(); pos = expression.sourceEnd+1; break; @@ -2559,13 +2506,13 @@ final Token token,token1; pos = expression.sourceEnd+1; break; default: - jj_la1[70] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[71] = jj_gen; + jj_la1[67] = jj_gen; ; } try { @@ -2580,16 +2527,112 @@ final Token token,token1; } {if (true) return new ArrayDeclarator(prefix,expression,pos);} break; + case LBRACE: + token = jj_consume_token(LBRACE); + pos = token.sourceEnd+1; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + case AT: + case BANG: + case TILDE: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: + case IDENTIFIER: + case LPAREN: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: + case BANG: + case TILDE: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: + case IDENTIFIER: + case LPAREN: + expression = Expression(); + pos = expression.sourceEnd+1; + break; + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + expression = Type(); + pos = expression.sourceEnd+1; + break; + default: + jj_la1[68] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + break; + default: + jj_la1[69] = jj_gen; + ; + } + try { + token = jj_consume_token(RBRACE); + pos = token.sourceEnd; + } catch (ParseException e) { + errorMessage = "']' expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } + {if (true) return new ArrayDeclarator(prefix,expression,pos);} + break; default: - jj_la1[72] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public Literal Literal() throws ParseException { + final public Literal Literal() throws ParseException { final Token token; + StringLiteral literal; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INTEGER_LITERAL: token = jj_consume_token(INTEGER_LITERAL); @@ -2615,18 +2658,71 @@ final Token token,token1; token = jj_consume_token(NULL); {if (true) return new NullLiteral(token);} break; + case DOUBLEQUOTE: + literal = evaluableString(); + {if (true) return literal;} + break; default: - jj_la1[73] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public FunctionCall Arguments(final Expression func) throws ParseException { + final public StringLiteral evaluableString() throws ParseException { + ArrayList list = new ArrayList(); + Token start,end; + Token token,lbrace,rbrace; + AbstractVariable var; + Expression expr; + start = jj_consume_token(DOUBLEQUOTE); + label_20: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOLLARS: + ; + break; + default: + jj_la1[72] = jj_gen; + break label_20; + } + jj_consume_token(DOLLARS); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + list.add(new Variable(token.image, + token.sourceStart, + token.sourceEnd)); + break; + case LBRACE1: + lbrace = jj_consume_token(LBRACE1); + token = jj_consume_token(ID); + list.add(new Variable(token.image, + token.sourceStart, + token.sourceEnd)); + rbrace = jj_consume_token(RBRACE1); + break; + default: + jj_la1[73] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + end = jj_consume_token(DOUBLEQUOTE2); + AbstractVariable[] vars = new AbstractVariable[list.size()]; + list.toArray(vars); + {if (true) return new StringLiteral(jj_input_stream.getCurrentBuffer().substring(start.sourceEnd,end.sourceStart), + start.sourceStart, + end.sourceEnd, + vars);} + throw new Error("Missing return statement in function"); + } + + final public FunctionCall Arguments(final Expression func) throws ParseException { Expression[] args = null; -final Token token; - jj_consume_token(LPAREN); +final Token token,lparen; + lparen = jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -2636,8 +2732,8 @@ final Token token; case TRUE: case FALSE: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2646,9 +2742,10 @@ final Token token; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: args = ArgumentList(); break; default: @@ -2661,11 +2758,17 @@ final Token token; } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; errorLevel = ERROR; - errorStart = args[args.length-1].sourceEnd+1; - errorEnd = args[args.length-1].sourceEnd+1; + if (args == null) { + errorStart = lparen.sourceEnd+1; + errorEnd = lparen.sourceEnd+2; + } else { + errorStart = args[args.length-1].sourceEnd+1; + errorEnd = args[args.length-1].sourceEnd+2; + } processParseExceptionDebug(e); } - {if (true) return new FunctionCall(func,args,args[args.length-1].sourceEnd);} + int sourceEnd = (args == null && args.length != 0) ? lparen.sourceEnd+1 : args[args.length-1].sourceEnd; + {if (true) return new FunctionCall(func,args,sourceEnd);} throw new Error("Missing return statement in function"); } @@ -2674,14 +2777,14 @@ final Token token; * argumentDeclaration() (, argumentDeclaration)* * @return an array of arguments */ - static final public Expression[] ArgumentList() throws ParseException { + final public Expression[] ArgumentList() throws ParseException { Expression arg; final ArrayList list = new ArrayList(); int pos; Token token; arg = Expression(); list.add(arg);pos = arg.sourceEnd; - label_20: + label_21: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -2689,7 +2792,7 @@ Token token; break; default: jj_la1[75] = jj_gen; - break label_20; + break label_21; } token = jj_consume_token(COMMA); pos = token.sourceEnd; @@ -2715,10 +2818,10 @@ Token token; * A Statement without break. * @return a statement */ - static final public Statement StatementNoBreak() throws ParseException { + final public Statement StatementNoBreak() throws ParseException { final Statement statement; Token token = null; - if (jj_2_5(2)) { + if (jj_2_4(2)) { statement = expressionStatement(); {if (true) return statement;} } else { @@ -2817,7 +2920,7 @@ Token token; * expression ; * @return an expression */ - static final public Statement expressionStatement() throws ParseException { + final public Statement expressionStatement() throws ParseException { final Statement statement; final Token token; statement = Expression(); @@ -2837,7 +2940,7 @@ Token token; throw new Error("Missing return statement in function"); } - static final public Define defineStatement() throws ParseException { + final public Define defineStatement() throws ParseException { Expression defineName,defineValue; final Token defineToken; Token token; @@ -2907,7 +3010,7 @@ Token token; /** * A Normal statement. */ - static final public Statement Statement() throws ParseException { + final public Statement Statement() throws ParseException { final Statement statement; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: @@ -2934,8 +3037,8 @@ Token token; case WHILE: case FOREACH: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2944,11 +3047,12 @@ Token token; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOUBLEQUOTE: + case DOLLAR: case IDENTIFIER: case LPAREN: case LBRACE: case SEMICOLON: - case DOLLAR_ID: statement = StatementNoBreak(); {if (true) return statement;} break; @@ -2967,12 +3071,14 @@ Token token; /** * An html block inside a php syntax. */ - static final public HTMLBlock htmlBlock() throws ParseException { + final public HTMLBlock htmlBlock() throws ParseException { final int startIndex = nodePtr; final AstNode[] blockNodes; final int nbNodes; - jj_consume_token(PHPEND); - label_21: + final Token phpEnd; + phpEnd = jj_consume_token(PHPEND); + htmlStart = phpEnd.sourceEnd; + label_22: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPECHOSTART: @@ -2980,7 +3086,7 @@ Token token; break; default: jj_la1[79] = jj_gen; - break label_21; + break label_22; } phpEchoBlock(); } @@ -2997,16 +3103,20 @@ Token token; jj_consume_token(-1); throw new ParseException(); } + createNewHTMLCode(); } catch (ParseException e) { errorMessage = "unexpected end of file , '= 100) return; if (pos == jj_endpos + 1) { jj_lasttokens[jj_endpos++] = kind; @@ -7288,17 +7462,17 @@ final ArrayList list = new ArrayList(); } } - static public ParseException generateParseException() { + public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[143]; - for (int i = 0; i < 143; i++) { + boolean[] la1tokens = new boolean[160]; + for (int i = 0; i < 160; i++) { la1tokens[i] = false; } if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 129; i++) { + for (int i = 0; i < 128; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< jj_gen) { @@ -7355,7 +7529,6 @@ final ArrayList list = new ArrayList(); case 2: jj_3_3(); break; case 3: jj_3_4(); break; case 4: jj_3_5(); break; - case 5: jj_3_6(); break; } } p = p.next; @@ -7364,7 +7537,7 @@ final ArrayList list = new ArrayList(); jj_rescan = false; } - static final private void jj_save(int index, int xla) { + final private void jj_save(int index, int xla) { JJCalls p = jj_2_rtns[index]; while (p.gen > jj_gen) { if (p.next == null) { p = p.next = new JJCalls(); break; }