X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index e411485..d3b3e59 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -30,14 +30,16 @@ import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; import java.util.Enumeration; +import java.util.ArrayList; import java.io.StringReader; import java.io.*; import java.text.MessageFormat; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpdt.internal.compiler.parser.*; import net.sourceforge.phpdt.internal.compiler.ast.*; +import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren; +import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; /** * A new php parser. @@ -52,13 +54,13 @@ public final class PHPParser extends PHPParserSuperclass { private static IFile fileToParse; /** The current segment. */ - private static PHPSegmentWithChildren currentSegment; + private static OutlineableWithChildren currentSegment; private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$ private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$ - PHPOutlineInfo outlineInfo; + static PHPOutlineInfo outlineInfo; - private static PHPFunctionDeclaration currentFunction; + public static MethodDeclaration currentFunction; private static boolean assigning; /** The error level of the current ParseException. */ @@ -68,13 +70,25 @@ public final class PHPParser extends PHPParserSuperclass { private static int errorStart = -1; private static int errorEnd = -1; + private static PHPDocument phpDocument; + /** + * The point where html starts. + * It will be used by the token manager to create HTMLCode objects + */ + public static int htmlStart; - //ast stack - private final static int AstStackIncrement = 100; - /** The stack of node. */ - private static AstNode[] astStack; + //ast stack + private final static int AstStackIncrement = 100; + /** The stack of node. */ + private static AstNode[] nodes; /** The cursor in expression stack. */ - private static int expressionPtr; + private static int nodePtr; + private static VariableDeclaration[] variableDeclarationStack; + private static int variableDeclarationPtr; + private static Statement[] statementStack; + private static int statementPtr; + private static ElseIf[] elseIfStack; + private static int elseIfPtr; public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; @@ -88,6 +102,75 @@ public final class PHPParser extends PHPParserSuperclass { this.fileToParse = fileToParse; } + /** + * Reinitialize the parser. + */ + private static final void init() { + nodes = new AstNode[AstStackIncrement]; + statementStack = new Statement[AstStackIncrement]; + elseIfStack = new ElseIf[AstStackIncrement]; + nodePtr = -1; + statementPtr = -1; + elseIfPtr = -1; + htmlStart = 0; + } + + /** + * Add an php node on the stack. + * @param node the node that will be added to the stack + */ + private static final void pushOnAstNodes(AstNode node) { + try { + nodes[++nodePtr] = node; + } catch (IndexOutOfBoundsException e) { + int oldStackLength = nodes.length; + AstNode[] oldStack = nodes; + nodes = new AstNode[oldStackLength + AstStackIncrement]; + System.arraycopy(oldStack, 0, nodes, 0, oldStackLength); + nodePtr = oldStackLength; + nodes[nodePtr] = node; + } + } + + private static final void pushOnVariableDeclarationStack(VariableDeclaration var) { + try { + variableDeclarationStack[++variableDeclarationPtr] = var; + } catch (IndexOutOfBoundsException e) { + int oldStackLength = variableDeclarationStack.length; + VariableDeclaration[] oldStack = variableDeclarationStack; + variableDeclarationStack = new VariableDeclaration[oldStackLength + AstStackIncrement]; + System.arraycopy(oldStack, 0, variableDeclarationStack, 0, oldStackLength); + variableDeclarationPtr = oldStackLength; + variableDeclarationStack[variableDeclarationPtr] = var; + } + } + + private static final void pushOnStatementStack(Statement statement) { + try { + statementStack[++statementPtr] = statement; + } catch (IndexOutOfBoundsException e) { + int oldStackLength = statementStack.length; + Statement[] oldStack = statementStack; + statementStack = new Statement[oldStackLength + AstStackIncrement]; + System.arraycopy(oldStack, 0, statementStack, 0, oldStackLength); + statementPtr = oldStackLength; + statementStack[statementPtr] = statement; + } + } + + private static final void pushOnElseIfStack(ElseIf elseIf) { + try { + elseIfStack[++elseIfPtr] = elseIf; + } catch (IndexOutOfBoundsException e) { + int oldStackLength = elseIfStack.length; + ElseIf[] oldStack = elseIfStack; + elseIfStack = new ElseIf[oldStackLength + AstStackIncrement]; + System.arraycopy(oldStack, 0, elseIfStack, 0, oldStackLength); + elseIfPtr = oldStackLength; + elseIfStack[elseIfPtr] = elseIf; + } + } + public static final void phpParserTester(final String strEval) throws CoreException, ParseException { PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); final StringReader stream = new StringReader(strEval); @@ -95,7 +178,7 @@ public final class PHPParser extends PHPParserSuperclass { jj_input_stream = new SimpleCharStream(stream, 1, 1); } ReInit(new StringReader(strEval)); - astStack = new AstNode[AstStackIncrement]; + init(); phpTest(); } @@ -106,7 +189,7 @@ public final class PHPParser extends PHPParserSuperclass { jj_input_stream = new SimpleCharStream(stream, 1, 1); } ReInit(stream); - astStack = new AstNode[AstStackIncrement]; + init(); phpFile(); } catch (FileNotFoundException e) { e.printStackTrace(); //To change body of catch statement use Options | File Templates. @@ -119,21 +202,24 @@ public final class PHPParser extends PHPParserSuperclass { jj_input_stream = new SimpleCharStream(stream, 1, 1); } ReInit(stream); - astStack = new AstNode[AstStackIncrement]; + init(); phpFile(); } public final PHPOutlineInfo parseInfo(final Object parent, final String s) { + currentSegment = new PHPDocument(parent); outlineInfo = new PHPOutlineInfo(parent); - currentSegment = outlineInfo.getDeclarations(); final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } ReInit(stream); - astStack = new AstNode[AstStackIncrement]; + init(); try { parse(); + phpDocument = new PHPDocument(null); + phpDocument.nodes = nodes; + PHPeclipsePlugin.log(1,phpDocument.toString()); } catch (ParseException e) { processParseException(e); } @@ -256,7 +342,7 @@ public final class PHPParser extends PHPParserSuperclass { jj_input_stream = new SimpleCharStream(stream, 1, 1); } ReInit(stream); - astStack = new AstNode[AstStackIncrement]; + init(); try { parse(); } catch (ParseException e) { @@ -286,6 +372,18 @@ public final class PHPParser extends PHPParserSuperclass { } } + /** + * Put a new html block in the stack. + */ + public static final void createNewHTMLCode() { + final int currentPosition = SimpleCharStream.getPosition(); + if (currentPosition == htmlStart) { + return; + } + final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition).toCharArray(); + pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); + } + private static final void parse() throws ParseException { phpFile(); } @@ -295,14 +393,14 @@ PARSER_END(PHPParser) TOKEN : { - : PHPPARSING -| : PHPPARSING -| {PHPParser.createNewHTMLCode();} : PHPPARSING +| {PHPParser.createNewHTMLCode();} : PHPPARSING +| "> : DEFAULT + "> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT } /* Skip any character if we are not in php mode */ @@ -435,10 +533,37 @@ MORE : | } +//Misc token TOKEN : { - <_ORL : "OR"> -| <_ANDL : "AND"> + +| +| +| +| +| +} + +/* OPERATORS */ + TOKEN : +{ + +| +| +| +| +| +| +| +| +| +| +| +| +| >"> +| >>"> +| <_ORL : "OR"> +| <_ANDL : "AND"> } /* LITERALS */ @@ -469,9 +594,9 @@ MORE : | < STRING_1: "\"" ( - ~["\""] | ~["{"] - | - "\\\"" + ~["\"","{","}"] + | "\\\"" + | "\\" | "{" ~["\""] "}" )* "\"" @@ -479,9 +604,8 @@ MORE : | < STRING_2: "'" ( - ~["'"] - | - "\\'" + ~["'"] + | "\\'" )* "'" @@ -490,8 +614,7 @@ MORE : "`" ( ~["`"] - | - "\\`" + | "\\`" )* "`" > @@ -537,10 +660,10 @@ MORE : { "> | -| +| | ="> -| "> | | @@ -560,32 +683,6 @@ MORE : | -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| >"> -| >>"> | >="> } @@ -600,6 +697,7 @@ void phpTest() : { Php() + {PHPParser.createNewHTMLCode();} } void phpFile() : @@ -655,10 +753,18 @@ void PhpBlock() : } } -void phpEchoBlock() : -{} +PHPEchoBlock phpEchoBlock() : { - Expression() [ ] + final Expression expr; + final int pos = SimpleCharStream.getPosition(); + PHPEchoBlock echoBlock; +} +{ + expr = Expression() [ ] + { + echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition()); + pushOnAstNodes(echoBlock); + return echoBlock;} } void Php() : @@ -667,10 +773,11 @@ void Php() : (BlockStatement())* } -void ClassDeclaration() : +ClassDeclaration ClassDeclaration() : { - final PHPClassDeclaration classDeclaration; + final ClassDeclaration classDeclaration; final Token className; + Token superclassName = null; final int pos; } { @@ -688,7 +795,7 @@ void ClassDeclaration() : [ try { - + superclassName = } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; @@ -698,21 +805,29 @@ void ClassDeclaration() : } ] { - if (currentSegment != null) { - classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); + if (superclassName == null) { + classDeclaration = new ClassDeclaration(currentSegment, + className.image.toCharArray(), + pos, + 0); + } else { + classDeclaration = new ClassDeclaration(currentSegment, + className.image.toCharArray(), + superclassName.image.toCharArray(), + pos, + 0); + } currentSegment.add(classDeclaration); currentSegment = classDeclaration; - } - } - ClassBody() - { - if (currentSegment != null) { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); - } } + ClassBody(classDeclaration) + {currentSegment = (OutlineableWithChildren) currentSegment.getParent(); + classDeclaration.sourceEnd = SimpleCharStream.getPosition(); + pushOnAstNodes(classDeclaration); + return classDeclaration;} } -void ClassBody() : +void ClassBody(ClassDeclaration classDeclaration) : {} { try { @@ -724,7 +839,7 @@ void ClassBody() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - ( ClassBodyDeclaration() )* + ( ClassBodyDeclaration(classDeclaration) )* try { } catch (ParseException e) { @@ -739,35 +854,39 @@ void ClassBody() : /** * A class can contain only methods and fields. */ -void ClassBodyDeclaration() : -{} +void ClassBodyDeclaration(ClassDeclaration classDeclaration) : { - MethodDeclaration() -| - FieldDeclaration() + MethodDeclaration method; + FieldDeclaration field; +} +{ + method = MethodDeclaration() {classDeclaration.addMethod(method);} +| field = FieldDeclaration() {classDeclaration.addVariable(field);} } /** * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;. */ -void FieldDeclaration() : +FieldDeclaration FieldDeclaration() : { - PHPVarDeclaration variableDeclaration; + VariableDeclaration variableDeclaration; + variableDeclarationPtr = 0; + variableDeclarationStack = new VariableDeclaration[AstStackIncrement]; + VariableDeclaration[] list; + final int pos = SimpleCharStream.getPosition(); } { variableDeclaration = VariableDeclarator() { - if (currentSegment != null) { - currentSegment.add(variableDeclaration); - } + pushOnVariableDeclarationStack(variableDeclaration); + outlineInfo.addVariable(new String(variableDeclaration.name)); + currentSegment.add(variableDeclaration); } ( variableDeclaration = VariableDeclarator() - { - if (currentSegment != null) { - currentSegment.add(variableDeclaration); - } - } + {pushOnVariableDeclarationStack(variableDeclaration); + outlineInfo.addVariable(new String(variableDeclaration.name)); + currentSegment.add(variableDeclaration);} )* try { @@ -778,11 +897,18 @@ void FieldDeclaration() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } + + {list = new VariableDeclaration[variableDeclarationPtr]; + System.arraycopy(variableDeclarationStack,0,list,0,variableDeclarationPtr); + return new FieldDeclaration(list, + pos, + SimpleCharStream.getPosition());} } -PHPVarDeclaration VariableDeclarator() : +VariableDeclaration VariableDeclarator() : { final String varName, varValue; + Expression initializer = null; final int pos = jj_input_stream.getPosition(); } { @@ -790,8 +916,7 @@ PHPVarDeclaration VariableDeclarator() : [ try { - varValue = VariableInitializer() - {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} + initializer = VariableInitializer() } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; @@ -800,20 +925,41 @@ PHPVarDeclaration VariableDeclarator() : throw e; } ] - {return new PHPVarDeclaration(currentSegment,varName,pos);} + { + if (initializer == null) { + return new VariableDeclaration(currentSegment, + varName.toCharArray(), + pos, + jj_input_stream.getPosition()); + } + return new VariableDeclaration(currentSegment, + varName.toCharArray(), + initializer, + pos); + } } +/** + * A Variable name. + * @return the variable name (with suffix) + */ String VariableDeclaratorId() : { String expr; + Expression expression; final StringBuffer buff = new StringBuffer(); + final int pos = SimpleCharStream.getPosition(); + ConstantIdentifier ex; } { try { - expr = Variable() - {buff.append(expr);} - ( LOOKAHEAD(2) expr = VariableSuffix() - {buff.append(expr);} + expr = Variable() {buff.append(expr);} + ( LOOKAHEAD(2) + {ex = new ConstantIdentifier(expr.toCharArray(), + pos, + SimpleCharStream.getPosition());} + expression = VariableSuffix(ex) + {buff.append(expression.toStringExpression());} )* {return buff.toString();} } catch (ParseException e) { @@ -827,22 +973,22 @@ String VariableDeclaratorId() : String Variable(): { - String expr = null; + final StringBuffer buff; + Expression expression = null; final Token token; + final String expr; } { - token = [ expr = Expression() ] + token = [ expression = Expression() ] { - if (expr == null && !assigning) { - if (currentFunction != null) { - PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); - if (var != null) { - var.getVariable().setUsed(true); - } - } + if (expression == null && !assigning) { return token.image.substring(1); } - return token + "{" + expr + "}"; + buff = new StringBuffer(token.image); + buff.append('{'); + buff.append(expression.toStringExpression()); + buff.append('}'); + return buff.toString(); } | expr = VariableName() @@ -851,126 +997,116 @@ String Variable(): String VariableName(): { -String expr = null; -final Token token; + final StringBuffer buff; + String expr = null; + Expression expression = null; + final Token token; } { - expr = Expression() - {return "{"+expr+"}";} + expression = Expression() + {buff = new StringBuffer('{'); + buff.append(expression.toStringExpression()); + buff.append('}'); + return buff.toString();} | - token = [ expr = Expression() ] + token = [ expression = Expression() ] { - if (expr == null) { - if (currentFunction != null) { - PHPVarDeclaration var = currentFunction.getParameter(token.image); - if (var != null) { - var.getVariable().setUsed(true); - } - } + if (expression == null) { return token.image; } - return token + "{" + expr + "}"; + buff = new StringBuffer(token.image); + buff.append('{'); + buff.append(expression.toStringExpression()); + buff.append('}'); + return buff.toString(); } | expr = VariableName() { - if (currentFunction != null) { - PHPVarDeclaration var = currentFunction.getParameter(expr); - if (var != null) { - var.getVariable().setUsed(true); - } - } - return "$" + expr; + buff = new StringBuffer('$'); + buff.append(expr); + return buff.toString(); } | - token = - { - if (currentFunction != null) { - PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); - if (var != null) { - var.getVariable().setUsed(true); - } - } - return token.image + expr; - } -/*| pas besoin ? - token = [expr = VariableName()] - { - if (expr == null) { - return token.image; - } - return token.image + expr; - }*/ + token = {return token.image;} } -String VariableInitializer() : +Expression VariableInitializer() : { - final String expr; + final Expression expr; final Token token; + final int pos = SimpleCharStream.getPosition(); } { expr = Literal() {return expr;} | (token = | token = ) - {return "-" + token.image;} + {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(), + pos, + SimpleCharStream.getPosition()), + OperatorIds.MINUS, + pos);} | (token = | token = ) - {return "+" + token.image;} + {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(), + pos, + SimpleCharStream.getPosition()), + OperatorIds.PLUS, + pos);} | expr = ArrayDeclarator() {return expr;} | token = - {return token.image;} + {return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());} } -String ArrayVariable() : +ArrayVariableDeclaration ArrayVariable() : { -String expr; -final StringBuffer buff = new StringBuffer(); +Expression expr; +Expression expr2 = null; } { - expr = Expression() - {buff.append(expr);} - [ expr = Expression() - {buff.append("=>").append(expr);}] - {return buff.toString();} + expr = Expression() [ expr2 = Expression()] + {return new ArrayVariableDeclaration(expr,expr2);} } -String ArrayInitializer() : +ArrayVariableDeclaration[] ArrayInitializer() : { -String expr; -final StringBuffer buff = new StringBuffer("("); + ArrayVariableDeclaration expr; + final ArrayList list = new ArrayList(); } { [ expr = ArrayVariable() - {buff.append(expr);} + {list.add(expr);} ( LOOKAHEAD(2) expr = ArrayVariable() - {buff.append(",").append(expr);} + {list.add(expr);} )* ] - [ {buff.append(",");}] + [ {list.add(null);}] { - buff.append(")"); - return buff.toString(); - } + ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; + list.toArray(vars); + return vars;} } /** * A Method Declaration. * function MetodDeclarator() Block() */ -void MethodDeclaration() : +MethodDeclaration MethodDeclaration() : { - final PHPFunctionDeclaration functionDeclaration; + final MethodDeclaration functionDeclaration; Token functionToken; + final Block block; } { functionToken = try { functionDeclaration = MethodDeclarator() + {outlineInfo.addVariable(new String(functionDeclaration.name));} } catch (ParseException e) { if (errorMessage != null) { throw e; @@ -988,28 +1124,14 @@ void MethodDeclaration() : } currentFunction = functionDeclaration; } - Block() + block = Block() { - Hashtable parameters = currentFunction.getParameters(); - Enumeration vars = parameters.elements(); - while (vars.hasMoreElements()) { - PHPVarDeclaration o = (PHPVarDeclaration) vars.nextElement(); - if (!o.getVariable().isUsed()) { - try { - setMarker(fileToParse, - "Parameter "+o.getVariable().getName()+" is never used in function", - functionToken.beginLine, - WARNING, - "Line " + token.beginLine); - } catch (CoreException e) { - PHPeclipsePlugin.log(e); - } - } - } + functionDeclaration.statements = block.statements; currentFunction = null; if (currentSegment != null) { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + currentSegment = (OutlineableWithChildren) currentSegment.getParent(); } + return functionDeclaration; } } @@ -1018,21 +1140,23 @@ void MethodDeclaration() : * [&] IDENTIFIER(parameters ...). * @return a function description for the outline */ -PHPFunctionDeclaration MethodDeclarator() : +MethodDeclaration MethodDeclarator() : { final Token identifier; - final StringBuffer methodDeclaration = new StringBuffer(); + Token reference = null; final Hashtable formalParameters; - final int pos = jj_input_stream.getPosition(); + final int pos = SimpleCharStream.getPosition(); } { - [ {methodDeclaration.append("&");} ] + [ reference = ] identifier = formalParameters = FormalParameters() - { - methodDeclaration.append(identifier); - return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters); - } + {return new MethodDeclaration(currentSegment, + identifier.image.toCharArray(), + formalParameters, + reference != null, + pos, + SimpleCharStream.getPosition());} } /** @@ -1043,7 +1167,7 @@ Hashtable FormalParameters() : { String expr; final StringBuffer buff = new StringBuffer("("); - PHPVarDeclaration var; + VariableDeclaration var; final Hashtable parameters = new Hashtable(); } { @@ -1057,10 +1181,10 @@ Hashtable FormalParameters() : throw e; } [ var = FormalParameter() - {parameters.put(var.getVariable().getName(),var);} + {parameters.put(new String(var.name),var);} ( var = FormalParameter() - {parameters.put(var.getVariable().getName(),var);} + {parameters.put(new String(var.name),var);} )* ] try { @@ -1079,88 +1203,80 @@ Hashtable FormalParameters() : * A formal parameter. * $varname[=value] (,$varname[=value]) */ -PHPVarDeclaration FormalParameter() : +VariableDeclaration FormalParameter() : { - final PHPVarDeclaration variableDeclaration; + final VariableDeclaration variableDeclaration; Token token = null; } { [token = ] variableDeclaration = VariableDeclarator() { if (token != null) { - variableDeclaration.getVariable().setReference(true); + variableDeclaration.setReference(true); } - return variableDeclaration; - } -} - -String Type() : -{} -{ - - {return "string";} -| - - {return "bool";} -| - - {return "boolean";} -| - - {return "real";} -| - - {return "double";} -| - - {return "float";} -| - - {return "int";} -| - - {return "integer";} -| - - {return "object";} -} - -String Expression() : -{ - final String expr; - final String assignOperator; - final String expr2; -} -{ - expr = PrintExpression() - {return expr;} -| - expr = ListExpression() - {return expr;} -| - LOOKAHEAD(varAssignation()) - expr = varAssignation() - {return expr;} -| - expr = ConditionalExpression() - {return expr;} + return variableDeclaration;} +} + +ConstantIdentifier Type() : +{final int pos;} +{ + {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.STRING, + pos,pos-6);} +| {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.BOOL, + pos,pos-4);} +| {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.BOOLEAN, + pos,pos-7);} +| {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.REAL, + pos,pos-4);} +| {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.DOUBLE, + pos,pos-5);} +| {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.FLOAT, + pos,pos-5);} +| {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.INT, + pos,pos-3);} +| {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.INTEGER, + pos,pos-7);} +| {pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(Types.OBJECT, + pos,pos-6);} +} + +Expression Expression() : +{ + final Expression expr; +} +{ + expr = PrintExpression() {return expr;} +| expr = ListExpression() {return expr;} +| LOOKAHEAD(varAssignation()) + expr = varAssignation() {return expr;} +| expr = ConditionalExpression() {return expr;} } /** * A Variable assignation. * varName (an assign operator) any expression */ -String varAssignation() : +VarAssignation varAssignation() : { - String varName,assignOperator,expr2; - PHPVarDeclaration variable; + String varName; + final Expression expression; + final int assignOperator; final int pos = SimpleCharStream.getPosition(); } { varName = VariableDeclaratorId() assignOperator = AssignmentOperator() try { - expr2 = Expression() + expression = Expression() } catch (ParseException e) { if (errorMessage != null) { throw e; @@ -1171,313 +1287,286 @@ String varAssignation() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - {return varName + assignOperator + expr2;} + {return new VarAssignation(varName.toCharArray(), + expression, + assignOperator, + pos, + SimpleCharStream.getPosition());} } -String AssignmentOperator() : +int AssignmentOperator() : {} { - -{return "=";} -| -{return "*=";} -| -{return "/=";} -| -{return "%=";} -| -{return "+=";} -| -{return "-=";} -| -{return "<<=";} -| -{return ">>=";} -| -{return "&=";} -| -{return "|=";} -| -{return "|=";} -| -{return ".=";} -| -{return "~=";} -} - -String ConditionalExpression() : + {return VarAssignation.EQUAL;} +| {return VarAssignation.STAR_EQUAL;} +| {return VarAssignation.SLASH_EQUAL;} +| {return VarAssignation.REM_EQUAL;} +| {return VarAssignation.PLUS_EQUAL;} +| {return VarAssignation.MINUS_EQUAL;} +| {return VarAssignation.LSHIFT_EQUAL;} +| {return VarAssignation.RSIGNEDSHIFT_EQUAL;} +| {return VarAssignation.AND_EQUAL;} +| {return VarAssignation.XOR_EQUAL;} +| {return VarAssignation.OR_EQUAL;} +| {return VarAssignation.DOT_EQUAL;} +| {return VarAssignation.TILDE_EQUAL;} +} + +Expression ConditionalExpression() : { - final String expr; - String expr2 = null; - String expr3 = null; + final Expression expr; + Expression expr2 = null; + Expression expr3 = null; } { expr = ConditionalOrExpression() [ expr2 = Expression() expr3 = ConditionalExpression() ] { if (expr3 == null) { return expr; - } else { - return expr + "?" + expr2 + ":" + expr3; } + return new ConditionalExpression(expr,expr2,expr3); } } -String ConditionalOrExpression() : +Expression ConditionalOrExpression() : { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; + int operator; } { expr = ConditionalAndExpression() - {buff.append(expr);} ( - (operator = | operator = <_ORL>) expr = ConditionalAndExpression() + ( + {operator = OperatorIds.OR_OR;} + | <_ORL> {operator = OperatorIds.ORL;} + ) expr2 = ConditionalAndExpression() { - buff.append(operator.image); - buff.append(expr); + expr = new BinaryExpression(expr,expr2,operator); } )* - { - return buff.toString(); - } + {return expr;} } -String ConditionalAndExpression() : +Expression ConditionalAndExpression() : { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; + int operator; } { expr = ConcatExpression() - {buff.append(expr);} ( - (operator = | operator = <_ANDL>) expr = ConcatExpression() - { - buff.append(operator.image); - buff.append(expr); - } + ( {operator = OperatorIds.AND_AND;} + | <_ANDL> {operator = OperatorIds.ANDL;}) + expr2 = ConcatExpression() {expr = new BinaryExpression(expr,expr2,operator);} )* - {return buff.toString();} + {return expr;} } -String ConcatExpression() : +Expression ConcatExpression() : { - String expr; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; } { expr = InclusiveOrExpression() - {buff.append(expr);} ( - expr = InclusiveOrExpression() - {buff.append(".").append(expr);} + expr2 = InclusiveOrExpression() + {expr = new BinaryExpression(expr,expr2,OperatorIds.DOT);} )* - {return buff.toString();} + {return expr;} } -String InclusiveOrExpression() : +Expression InclusiveOrExpression() : { - String expr; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; } { expr = ExclusiveOrExpression() - {buff.append(expr);} - ( - expr = ExclusiveOrExpression() - {buff.append("|").append(expr);} + ( expr2 = ExclusiveOrExpression() + {expr = new BinaryExpression(expr,expr2,OperatorIds.OR);} )* - {return buff.toString();} + {return expr;} } -String ExclusiveOrExpression() : +Expression ExclusiveOrExpression() : { - String expr; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; } { expr = AndExpression() - { - buff.append(expr); - } ( - expr = AndExpression() - { - buff.append("^"); - buff.append(expr); - } + expr2 = AndExpression() + {expr = new BinaryExpression(expr,expr2,OperatorIds.XOR);} )* - { - return buff.toString(); - } + {return expr;} } -String AndExpression() : +Expression AndExpression() : { - String expr; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; } { expr = EqualityExpression() - { - buff.append(expr); - } ( - expr = EqualityExpression() - { - buff.append("&").append(expr); - } + expr2 = EqualityExpression() + {expr = new BinaryExpression(expr,expr2,OperatorIds.AND);} )* - {return buff.toString();} + {return expr;} } -String EqualityExpression() : +Expression EqualityExpression() : { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; + int operator; } { expr = RelationalExpression() - {buff.append(expr);} ( - ( operator = - | operator = - | operator = - | operator = - | operator = + ( {operator = OperatorIds.EQUAL_EQUAL;} + | {operator = OperatorIds.DIF;} + | {operator = OperatorIds.DIF;} + | {operator = OperatorIds.BANG_EQUAL_EQUAL;} + | {operator = OperatorIds.EQUAL_EQUAL_EQUAL;} ) try { - expr = RelationalExpression() + expr2 = RelationalExpression() } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'"; + if (errorMessage != null) { + throw e; + } + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; throw e; } { - buff.append(operator.image); - buff.append(expr); + expr = new BinaryExpression(expr,expr2,operator); } )* - {return buff.toString();} + {return expr;} } -String RelationalExpression() : +Expression RelationalExpression() : { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; + int operator; } { expr = ShiftExpression() - {buff.append(expr);} ( - ( operator = | operator = | operator = | operator = ) expr = ShiftExpression() - {buff.append(operator.image).append(expr);} + ( {operator = OperatorIds.LESS;} + | {operator = OperatorIds.GREATER;} + | {operator = OperatorIds.LESS_EQUAL;} + | {operator = OperatorIds.GREATER_EQUAL;}) + expr2 = ShiftExpression() + {expr = new BinaryExpression(expr,expr2,operator);} )* - {return buff.toString();} + {return expr;} } -String ShiftExpression() : +Expression ShiftExpression() : { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; + int operator; } { expr = AdditiveExpression() - {buff.append(expr);} ( - (operator = | operator = | operator = ) expr = AdditiveExpression() - { - buff.append(operator.image); - buff.append(expr); - } + ( {operator = OperatorIds.LEFT_SHIFT;} + | {operator = OperatorIds.RIGHT_SHIFT;} + | {operator = OperatorIds.UNSIGNED_RIGHT_SHIFT;}) + expr2 = AdditiveExpression() + {expr = new BinaryExpression(expr,expr2,operator);} )* - {return buff.toString();} + {return expr;} } -String AdditiveExpression() : +Expression AdditiveExpression() : { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + Expression expr,expr2; + int operator; } { expr = MultiplicativeExpression() - {buff.append(expr);} ( - ( operator = | operator = ) expr = MultiplicativeExpression() - { - buff.append(operator.image); - buff.append(expr); - } + ( {operator = OperatorIds.PLUS;} + | {operator = OperatorIds.MINUS;} ) + expr2 = MultiplicativeExpression() + {expr = new BinaryExpression(expr,expr2,operator);} )* - {return buff.toString();} + {return expr;} } -String MultiplicativeExpression() : +Expression MultiplicativeExpression() : { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer();} + Expression expr,expr2; + int operator; +} { try { expr = UnaryExpression() } catch (ParseException e) { + if (errorMessage != null) { + throw e; + } errorMessage = "unexpected token '"+e.currentToken.next.image+"'"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; throw e; } - {buff.append(expr);} ( - ( operator = | operator = | operator = ) expr = UnaryExpression() - { - buff.append(operator.image); - buff.append(expr); - } + ( {operator = OperatorIds.MULTIPLY;} + | {operator = OperatorIds.DIVIDE;} + | {operator = OperatorIds.REMAINDER;}) + expr2 = UnaryExpression() + {expr = new BinaryExpression(expr,expr2,operator);} )* - {return buff.toString();} + {return expr;} } /** * An unary expression starting with @, & or nothing */ -String UnaryExpression() : +Expression UnaryExpression() : { - final String expr; - final Token token; - final StringBuffer buff = new StringBuffer(); + Expression expr; + final int pos = SimpleCharStream.getPosition(); } { - token = expr = UnaryExpressionNoPrefix() - { - if (token == null) { - return expr; - } - return token.image + expr; - } + expr = UnaryExpressionNoPrefix() + {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} | - ( {buff.append("@");})* expr = UnaryExpressionNoPrefix() - {return buff.append(expr).toString();} + expr = AtUnaryExpression() + {return expr;} } -String UnaryExpressionNoPrefix() : +Expression AtUnaryExpression() : { - final String expr; - final Token token; + Expression expr; + final int pos = SimpleCharStream.getPosition(); } { - ( token = | token = ) expr = UnaryExpression() - { - return token.image + expr; - } + + expr = AtUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);} +| + expr = UnaryExpressionNoPrefix() + {return expr;} +} + + +Expression UnaryExpressionNoPrefix() : +{ + Expression expr; + int operator; + final int pos = SimpleCharStream.getPosition(); +} +{ + ( {operator = OperatorIds.PLUS;} + | {operator = OperatorIds.MINUS;}) + expr = UnaryExpression() + {return new PrefixedUnaryExpression(expr,operator,pos);} | expr = PreIncDecExpression() {return expr;} @@ -1487,165 +1576,180 @@ String UnaryExpressionNoPrefix() : } -String PreIncDecExpression() : +Expression PreIncDecExpression() : { -final String expr; -final Token token; +final Expression expr; +final int operator; + final int pos = SimpleCharStream.getPosition(); } { - (token = | token = ) expr = PrimaryExpression() - {return token.image + expr;} + ( {operator = OperatorIds.PLUS_PLUS;} + | {operator = OperatorIds.MINUS_MINUS;}) + expr = PrimaryExpression() + {return new PrefixedUnaryExpression(expr,operator,pos);} } -String UnaryExpressionNotPlusMinus() : +Expression UnaryExpressionNotPlusMinus() : { - final String expr; + Expression expr; + final int pos = SimpleCharStream.getPosition(); } { - expr = UnaryExpression() - {return "!" + expr;} -| - LOOKAHEAD( (Type() | ) ) - expr = CastExpression() - {return expr;} -| - expr = PostfixExpression() - {return expr;} -| - expr = Literal() - {return expr;} -| - expr = Expression() + expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} +| LOOKAHEAD( (Type() | ) ) + expr = CastExpression() {return expr;} +| expr = PostfixExpression() {return expr;} +| expr = Literal() {return expr;} +| expr = Expression() try { } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; throw e; } - {return "("+expr+")";} + {return expr;} } -String CastExpression() : +CastExpression CastExpression() : { -final String type, expr; +final ConstantIdentifier type; +final Expression expr; +final int pos = SimpleCharStream.getPosition(); } { - (type = Type() | {type = "array";}) expr = UnaryExpression() - {return "(" + type + ")" + expr;} + + (type = Type() + | {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());}) + expr = UnaryExpression() + {return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());} } -String PostfixExpression() : +Expression PostfixExpression() : { - final String expr; - Token operator = null; + Expression expr; + int operator = -1; + final int pos = SimpleCharStream.getPosition(); } { - expr = PrimaryExpression() [ operator = | operator = ] + expr = PrimaryExpression() + [ {operator = OperatorIds.PLUS_PLUS;} + | {operator = OperatorIds.MINUS_MINUS;}] { - if (operator == null) { + if (operator == -1) { return expr; } - return expr + operator.image; + return new PostfixedUnaryExpression(expr,operator,pos); } } -String PrimaryExpression() : +Expression PrimaryExpression() : { final Token identifier; - String expr; + Expression expr; final StringBuffer buff = new StringBuffer(); + final int pos = SimpleCharStream.getPosition(); } { LOOKAHEAD(2) identifier = expr = ClassIdentifier() - {buff.append(identifier.image).append("::").append(expr);} - ( - expr = PrimarySuffix() - {buff.append(expr);} - )* - {return buff.toString();} + {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(), + pos, + SimpleCharStream.getPosition()), + expr, + ClassAccess.STATIC);} + (expr = PrimarySuffix(expr))* + {return expr;} | - expr = PrimaryPrefix() {buff.append(expr);} - ( expr = PrimarySuffix() {buff.append(expr);} )* - {return buff.toString();} + expr = PrimaryPrefix() + (expr = PrimarySuffix(expr))* + {return expr;} | expr = ArrayDeclarator() - {return "array" + expr;} + {return expr;} } -String ArrayDeclarator() : +ArrayInitializer ArrayDeclarator() : { - final String expr; + final ArrayVariableDeclaration[] vars; + final int pos = SimpleCharStream.getPosition(); } { - expr = ArrayInitializer() - {return "array" + expr;} + vars = ArrayInitializer() + {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());} } -String PrimaryPrefix() : +Expression PrimaryPrefix() : { - final String expr; + final Expression expr; final Token token; + final String var; + final int pos = SimpleCharStream.getPosition(); } { - token = - {return token.image;} -| - expr = ClassIdentifier() - { - return "new " + expr; - } -| - expr = VariableDeclaratorId() - {return expr;} + token = {return new ConstantIdentifier(token.image.toCharArray(), + pos, + SimpleCharStream.getPosition());} +| expr = ClassIdentifier() {return new PrefixedUnaryExpression(expr, + OperatorIds.NEW, + pos);} +| var = VariableDeclaratorId() {return new ConstantIdentifier(var.toCharArray(), + pos, + SimpleCharStream.getPosition());} } -String classInstantiation() : +PrefixedUnaryExpression classInstantiation() : { - String expr; - final StringBuffer buff = new StringBuffer("new "); + Expression expr; + final StringBuffer buff; + final int pos = SimpleCharStream.getPosition(); } { expr = ClassIdentifier() - {buff.append(expr);} [ + {buff = new StringBuffer(expr.toStringExpression());} expr = PrimaryExpression() - {buff.append(expr);} + {buff.append(expr.toStringExpression()); + expr = new ConstantIdentifier(buff.toString().toCharArray(), + pos, + SimpleCharStream.getPosition());} ] - {return buff.toString();} + {return new PrefixedUnaryExpression(expr, + OperatorIds.NEW, + pos);} } -String ClassIdentifier(): +ConstantIdentifier ClassIdentifier(): { final String expr; final Token token; + final int pos = SimpleCharStream.getPosition(); } { - token = - {return token.image;} -| - expr = VariableDeclaratorId() - {return expr;} + token = {return new ConstantIdentifier(token.image.toCharArray(), + pos, + SimpleCharStream.getPosition());} +| expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(), + pos, + SimpleCharStream.getPosition());} } -String PrimarySuffix() : +AbstractSuffixExpression PrimarySuffix(Expression prefix) : { - final String expr; + final AbstractSuffixExpression expr; } { - expr = Arguments() - {return expr;} -| - expr = VariableSuffix() - {return expr;} + expr = Arguments(prefix) {return expr;} +| expr = VariableSuffix(prefix) {return expr;} } -String VariableSuffix() : +AbstractSuffixExpression VariableSuffix(Expression prefix) : { String expr = null; + final int pos = SimpleCharStream.getPosition(); + Expression expression = null; } { @@ -1658,9 +1762,11 @@ String VariableSuffix() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - {return "->" + expr;} + {return new ClassAccess(prefix, + new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()), + ClassAccess.NORMAL);} | - [ expr = Expression() | expr = Type() ] //Not good + [ expression = Expression() | expression = Type() ] //Not good try { } catch (ParseException e) { @@ -1670,52 +1776,35 @@ String VariableSuffix() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - { - if(expr == null) { - return "[]"; - } - return "[" + expr + "]"; - } + {return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());} } -String Literal() : +Literal Literal() : { - final String expr; final Token token; + final int pos; } { - token = - {return token.image;} -| - token = - {return token.image;} -| - token = - {return token.image;} -| - expr = BooleanLiteral() - {return expr;} -| - - {return "null";} -} - -String BooleanLiteral() : -{} -{ - - {return "true";} -| - - {return "false";} + token = {pos = SimpleCharStream.getPosition(); + return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);} +| token = {pos = SimpleCharStream.getPosition(); + return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);} +| token = {pos = SimpleCharStream.getPosition(); + return new StringLiteral(token.image.toCharArray(),pos-token.image.length(),pos);} +| {pos = SimpleCharStream.getPosition(); + return new TrueLiteral(pos-4,pos);} +| {pos = SimpleCharStream.getPosition(); + return new FalseLiteral(pos-4,pos);} +| {pos = SimpleCharStream.getPosition(); + return new NullLiteral(pos-4,pos);} } -String Arguments() : +FunctionCall Arguments(Expression func) : { -String expr = null; +ArgumentDeclaration[] args = null; } { - [ expr = ArgumentList() ] + [ args = ArgumentList() ] try { } catch (ParseException e) { @@ -1725,47 +1814,81 @@ String expr = null; errorEnd = jj_input_stream.getPosition() + 1; throw e; } - { - if (expr == null) { - return "()"; - } - return "(" + expr + ")"; - } + {return new FunctionCall(func,args,SimpleCharStream.getPosition());} } -String ArgumentList() : +ArgumentDeclaration[] ArgumentList() : { -String expr; -final StringBuffer buff = new StringBuffer(); +ArgumentDeclaration arg; +final ArrayList list = new ArrayList(); +ArgumentDeclaration argument; } { - expr = Expression() - {buff.append(expr);} + arg = argumentDeclaration() + {list.add(arg);} ( try { - expr = Expression() + arg = argumentDeclaration() + {list.add(arg);} } catch (ParseException e) { - errorMessage = "expression expected after a comma in argument list"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; throw e; } - { - buff.append(",").append(expr); - } )* - {return buff.toString();} + { + ArgumentDeclaration[] args = new ArgumentDeclaration[list.size()]; + list.toArray(args); + return args;} } +ArgumentDeclaration argumentDeclaration() : +{ + boolean reference = false; + String varName; + Expression initializer = null; + final int pos = SimpleCharStream.getPosition(); +} +{ + [ {reference = true;}] + varName = VariableDeclaratorId() + [ + + try { + initializer = VariableInitializer() + } catch (ParseException e) { + errorMessage = "Literal expression expected in variable initializer"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + throw e; + } + ] + { + if (initializer == null) { + return new ArgumentDeclaration(varName.toCharArray(), + reference, + pos); + } + return new ArgumentDeclaration(varName.toCharArray(), + reference, + initializer, + pos); + } +} /** - * A Statement without break + * A Statement without break. */ -void StatementNoBreak() : -{} +Statement StatementNoBreak() : +{ + final Statement statement; + Token token = null; +} { LOOKAHEAD(2) - Expression() + statement = Expression() try { } catch (ParseException e) { @@ -1777,115 +1900,140 @@ void StatementNoBreak() : throw e; } } -| - LOOKAHEAD(2) - LabeledStatement() -| - Block() -| - EmptyStatement() -| - StatementExpression() + {return statement;} +| LOOKAHEAD(2) + statement = LabeledStatement() {return statement;} +| statement = Block() {return statement;} +| statement = EmptyStatement() {return statement;} +| statement = StatementExpression() try { } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; throw e; } -| - SwitchStatement() -| - IfStatement() -| - WhileStatement() -| - DoStatement() -| - ForStatement() -| - ForeachStatement() -| - ContinueStatement() -| - ReturnStatement() -| - EchoStatement() -| - [] IncludeStatement() -| - StaticStatement() -| - GlobalStatement() + {return statement;} +| statement = SwitchStatement() {return statement;} +| statement = IfStatement() {return statement;} +| statement = WhileStatement() {return statement;} +| statement = DoStatement() {return statement;} +| statement = ForStatement() {return statement;} +| statement = ForeachStatement() {return statement;} +| statement = ContinueStatement() {return statement;} +| statement = ReturnStatement() {return statement;} +| statement = EchoStatement() {return statement;} +| [token=] statement = IncludeStatement() + {if (token != null) { + ((InclusionStatement)statement).silent = true; + } + return statement;} +| statement = StaticStatement() {return statement;} +| statement = GlobalStatement() {return statement;} } /** - * A Normal statement + * A Normal statement. */ -void Statement() : -{} +Statement Statement() : { - StatementNoBreak() -| - BreakStatement() + final Statement statement; +} +{ + statement = StatementNoBreak() {return statement;} +| statement = BreakStatement() {return statement;} } -void htmlBlock() : -{} +/** + * An html block inside a php syntax. + */ +HTMLBlock htmlBlock() : { - (phpEchoBlock())* ( | ) + final int startIndex = nodePtr; + AstNode[] blockNodes; + int nbNodes; +} +{ + (phpEchoBlock())* + try { + ( | ) + } catch (ParseException e) { + errorMessage = "End of file unexpected, ' - | token = - | token = - | token = ) - expr = Expression() - { - if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, token.image,pos,expr)); + ( {keyword = InclusionStatement.REQUIRE;} + | {keyword = InclusionStatement.REQUIRE_ONCE;} + | {keyword = InclusionStatement.INCLUDE;} + | {keyword = InclusionStatement.INCLUDE_ONCE;}) + try { + expr = Expression() + } catch (ParseException e) { + if (errorMessage != null) { + throw e; } + errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + throw e; + } + {inclusionStatement = new InclusionStatement(currentSegment, + keyword, + expr, + pos); + currentSegment.add(inclusionStatement); } try { } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; throw e; } + {return inclusionStatement;} } -String PrintExpression() : +PrintExpression PrintExpression() : { - final StringBuffer buff = new StringBuffer("print "); - final String expr; + final Expression expr; + final int pos = SimpleCharStream.getPosition(); } { - expr = Expression() - { - buff.append(expr); - return buff.toString(); - } + expr = Expression() {return new PrintExpression(expr,pos,SimpleCharStream.getPosition());} } -String ListExpression() : +ListExpression ListExpression() : { - final StringBuffer buff = new StringBuffer("list("); - String expr; + String expr = null; + Expression expression = null; + ArrayList list = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); } { @@ -1894,28 +2042,28 @@ String ListExpression() : } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; throw e; } [ expr = VariableDeclaratorId() - {buff.append(expr);} + {list.add(expr);} ] + {if (expr == null) list.add(null);} ( try { } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; throw e; } expr = VariableDeclaratorId() - {buff.append(",").append(expr);} + {list.add(expr);} )* - {buff.append(")");} try { } catch (ParseException e) { @@ -1925,51 +2073,83 @@ String ListExpression() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - [ expr = Expression() {buff.append("(").append(expr);}] - {return buff.toString();} + [ expression = Expression() + { + String[] strings = new String[list.size()]; + list.toArray(strings); + return new ListExpression(strings, + expression, + pos, + SimpleCharStream.getPosition());} + ] + { + String[] strings = new String[list.size()]; + list.toArray(strings); + return new ListExpression(strings,pos,SimpleCharStream.getPosition());} } /** - * An echo statement is like this : echo anyexpression (, otherexpression)* + * An echo statement. + * echo anyexpression (, otherexpression)* */ -void EchoStatement() : -{} +EchoStatement EchoStatement() : +{ + final ArrayList expressions = new ArrayList(); + Expression expr; + final int pos = SimpleCharStream.getPosition(); +} { - Expression() ( Expression())* + expr = Expression() + {expressions.add(expr);} + ( + expr = Expression() + {expressions.add(expr);} + )* try { + { + Expression[] exprs = new Expression[expressions.size()]; + expressions.toArray(exprs); + return new EchoStatement(exprs,pos);} } catch (ParseException e) { if (e.currentToken.next.kind != 4) { errorMessage = "';' expected after 'echo' statement"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; throw e; } } } -void GlobalStatement() : +GlobalStatement GlobalStatement() : { final int pos = jj_input_stream.getPosition(); String expr; + ArrayList vars = new ArrayList(); + GlobalStatement global; } { expr = VariableDeclaratorId() - {if (currentSegment != null) { - currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr)); - }} + {vars.add(expr);} ( expr = VariableDeclaratorId() - {if (currentSegment != null) { - currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr)); - }} + {vars.add(expr);} )* try { + { + String[] strings = new String[vars.size()]; + vars.toArray(strings); + global = new GlobalStatement(currentSegment, + strings, + pos, + SimpleCharStream.getPosition()); + currentSegment.add(global); + return global;} } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -1977,14 +2157,25 @@ void GlobalStatement() : } } -void StaticStatement() : -{} +StaticStatement StaticStatement() : { - VariableDeclarator() ( VariableDeclarator())* + final int pos = SimpleCharStream.getPosition(); + final ArrayList vars = new ArrayList(); + VariableDeclaration expr; +} +{ + expr = VariableDeclarator() {vars.add(new String(expr.name));} + ( expr = VariableDeclarator() {vars.add(new String(expr.name));})* try { + { + String[] strings = new String[vars.size()]; + vars.toArray(strings); + return new StaticStatement(strings, + pos, + SimpleCharStream.getPosition());} } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; errorLevel = ERROR; errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = jj_input_stream.getPosition() + 1; @@ -1992,14 +2183,32 @@ void StaticStatement() : } } -void LabeledStatement() : -{} +LabeledStatement LabeledStatement() : { - Statement() + final int pos = SimpleCharStream.getPosition(); + final Token label; + final Statement statement; +} +{ + label = statement = Statement() + {return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());} } -void Block() : -{} +/** + * A Block is + * { + * statements + * }. + * @return a block + */ +Block Block() : +{ + final int pos = SimpleCharStream.getPosition(); + Statement[] statements; + Statement statement; + final int startingPtr = statementPtr; + final int length; +} { try { @@ -2010,7 +2219,8 @@ void Block() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - ( BlockStatement() | htmlBlock())* + ( statement = BlockStatement() {pushOnStatementStack(statement);} + | statement = htmlBlock() {pushOnStatementStack(statement);})* try { } catch (ParseException e) { @@ -2020,67 +2230,106 @@ void Block() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } + { + length = statementPtr-startingPtr+1; + statements = new Statement[length]; + System.arraycopy(variableDeclarationStack,startingPtr+1,statements,0,length); + statementPtr = startingPtr; + return new Block(statements,pos,SimpleCharStream.getPosition());} } -void BlockStatement() : -{} +Statement BlockStatement() : { - Statement() -| - ClassDeclaration() -| - MethodDeclaration() + final Statement statement; +} +{ + statement = Statement() {return statement;} +| statement = ClassDeclaration() {return statement;} +| statement = MethodDeclaration() {return statement;} } /** * A Block statement that will not contain any 'break' */ -void BlockStatementNoBreak() : -{} +Statement BlockStatementNoBreak() : { - StatementNoBreak() -| - ClassDeclaration() -| - MethodDeclaration() + final Statement statement; +} +{ + statement = StatementNoBreak() {return statement;} +| statement = ClassDeclaration() {return statement;} +| statement = MethodDeclaration() {return statement;} } -void LocalVariableDeclaration() : -{} +VariableDeclaration[] LocalVariableDeclaration() : { - LocalVariableDeclarator() ( LocalVariableDeclarator() )* + final ArrayList list = new ArrayList(); + VariableDeclaration var; +} +{ + var = LocalVariableDeclarator() + {list.add(var);} + ( var = LocalVariableDeclarator() {list.add(var);})* + { + VariableDeclaration[] vars = new VariableDeclaration[list.size()]; + list.toArray(vars); + return vars;} } -void LocalVariableDeclarator() : -{} +VariableDeclaration LocalVariableDeclarator() : { - VariableDeclaratorId() [ Expression() ] + final String varName; + Expression initializer = null; + final int pos = SimpleCharStream.getPosition(); +} +{ + varName = VariableDeclaratorId() [ initializer = Expression() ] + { + if (initializer == null) { + return new VariableDeclaration(currentSegment, + varName.toCharArray(), + pos, + jj_input_stream.getPosition()); + } + return new VariableDeclaration(currentSegment, + varName.toCharArray(), + initializer, + pos); + } } -void EmptyStatement() : -{} +EmptyStatement EmptyStatement() : +{ + final int pos; +} { + {pos = SimpleCharStream.getPosition(); + return new EmptyStatement(pos-1,pos);} } -void StatementExpression() : -{} +Statement StatementExpression() : { - PreIncDecExpression() + Expression expr; +} +{ + expr = PreIncDecExpression() {return expr;} | - PrimaryExpression() - [ - - | - - | - AssignmentOperator() Expression() - ] + expr = PrimaryExpression() + [ {expr = new PostfixedUnaryExpression(expr, + OperatorIds.PLUS_PLUS, + SimpleCharStream.getPosition());} + | {expr = new PostfixedUnaryExpression(expr, + OperatorIds.MINUS_MINUS, + SimpleCharStream.getPosition());} + | AssignmentOperator() Expression() ] } -void SwitchStatement() : +SwitchStatement SwitchStatement() : { - final int pos = jj_input_stream.getPosition(); + final Expression variable; + final AbstractCase[] cases; + final int pos = SimpleCharStream.getPosition(); } { @@ -2094,7 +2343,7 @@ void SwitchStatement() : throw e; } try { - Expression() + variable = Expression() } catch (ParseException e) { if (errorMessage != null) { throw e; @@ -2114,16 +2363,24 @@ void SwitchStatement() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - (switchStatementBrace() | switchStatementColon(pos, pos + 6)) + (cases = switchStatementBrace() | cases = switchStatementColon(pos, pos + 6)) + {return new SwitchStatement(variable,cases,pos,SimpleCharStream.getPosition());} } -void switchStatementBrace() : -{} +AbstractCase[] switchStatementBrace() : +{ + AbstractCase cas; + final ArrayList cases = new ArrayList(); +} { - ( switchLabel0() )* + ( cas = switchLabel0() {cases.add(cas);})* try { + { + AbstractCase[] abcase = new AbstractCase[cases.size()]; + cases.toArray(abcase); + return abcase;} } catch (ParseException e) { errorMessage = "'}' expected"; errorLevel = ERROR; @@ -2137,8 +2394,11 @@ void switchStatementBrace() : * @param start the begin offset of the switch * @param end the end offset of the switch */ -void switchStatementColon(final int start, final int end) : -{} +AbstractCase[] switchStatementColon(final int start, final int end) : +{ + AbstractCase cas; + final ArrayList cases = new ArrayList(); +} { {try { @@ -2151,7 +2411,7 @@ void switchStatementColon(final int start, final int end) : } catch (CoreException e) { PHPeclipsePlugin.log(e); }} - (switchLabel0())* + ( cas = switchLabel0() {cases.add(cas);})* try { } catch (ParseException e) { @@ -2163,6 +2423,10 @@ void switchStatementColon(final int start, final int end) : } try { + { + AbstractCase[] abcase = new AbstractCase[cases.size()]; + cases.toArray(abcase); + return abcase;} } catch (ParseException e) { errorMessage = "';' expected after 'endswitch' keyword"; errorLevel = ERROR; @@ -2172,56 +2436,42 @@ void switchStatementColon(final int start, final int end) : } } -void switchLabel0() : +AbstractCase switchLabel0() : { - Token breakToken = null; - final int line; + final Expression expr; + Statement statement; + final ArrayList stmts = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); } { - line = SwitchLabel() - ( BlockStatementNoBreak() | htmlBlock() )* - [ breakToken = BreakStatement() ] + expr = SwitchLabel() + ( statement = BlockStatementNoBreak() {stmts.add(statement);} + | statement = htmlBlock() {stmts.add(statement);})* + [ statement = BreakStatement() {stmts.add(statement);}] { - try { - if (breakToken == null) { - setMarker(fileToParse, - "You should use put a 'break' at the end of your statement", - line, - INFO, - "Line " + line); - } - } catch (CoreException e) { - PHPeclipsePlugin.log(e); - } + Statement[] stmtsArray = new Statement[stmts.size()]; + stmts.toArray(stmtsArray); + if (expr == null) {//it's a default + return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition()); } + return new Case(expr,stmtsArray,pos,SimpleCharStream.getPosition());} } -Token BreakStatement() : -{ - final Token token; -} -{ - token = [ Expression() ] - try { - - } catch (ParseException e) { - errorMessage = "';' expected after 'break' keyword"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; - } - {return token;} -} - -int SwitchLabel() : +/** + * A SwitchLabel. + * case Expression() : + * default : + * @return the if it was a case and null if not + */ +Expression SwitchLabel() : { final Token token; + final Expression expr; } { token = try { - Expression() + expr = Expression() } catch (ParseException e) { if (errorMessage != null) throw e; errorMessage = "expression expected after 'case' keyword"; @@ -2232,6 +2482,7 @@ int SwitchLabel() : } try { + {return expr;} } catch (ParseException e) { errorMessage = "':' expected after case expression"; errorLevel = ERROR; @@ -2239,11 +2490,11 @@ int SwitchLabel() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - {return token.beginLine;} | token = <_DEFAULT> try { + {return null;} } catch (ParseException e) { errorMessage = "':' expected after 'default' keyword"; errorLevel = ERROR; @@ -2251,20 +2502,43 @@ int SwitchLabel() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - {return token.beginLine;} } -void IfStatement() : +Break BreakStatement() : +{ + Expression expression = null; + final int start = SimpleCharStream.getPosition(); +} +{ + [ expression = Expression() ] + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'break' keyword"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + throw e; + } + {return new Break(expression, start, SimpleCharStream.getPosition());} +} + +IfStatement IfStatement() : { - final Token token; final int pos = jj_input_stream.getPosition(); + Expression condition; + IfStatement ifStatement; } { - token = Condition("if") IfStatement0(pos,pos+token.image.length()) + condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2) + {return ifStatement;} } -void Condition(final String keyword) : -{} + +Expression Condition(final String keyword) : +{ + final Expression condition; +} { try { @@ -2275,9 +2549,10 @@ void Condition(final String keyword) : errorEnd = errorStart +1; processParseException(e); } - Expression() + condition = Expression() try { + {return condition;} } catch (ParseException e) { errorMessage = "')' expected after " + keyword + " keyword"; errorLevel = ERROR; @@ -2287,10 +2562,27 @@ void Condition(final String keyword) : } } -void IfStatement0(final int start,final int end) : -{} +IfStatement IfStatement0(Expression condition, final int start,final int end) : { - (Statement() | htmlBlock())* (ElseIfStatementColon())* [ElseStatementColon()] + Statement statement; + Statement stmt; + final Statement[] statementsArray; + ElseIf elseifStatement; + Else elseStatement = null; + ArrayList stmts; + final ArrayList elseIfList = new ArrayList(); + ElseIf[] elseIfs; + int pos = SimpleCharStream.getPosition(); + int endStatements; +} +{ + + {stmts = new ArrayList();} + ( statement = Statement() {stmts.add(statement);} + | statement = htmlBlock() {stmts.add(statement);})* + {endStatements = SimpleCharStream.getPosition();} + (elseifStatement = ElseIfStatementColon() {elseIfList.add(elseifStatement);})* + [elseStatement = ElseStatementColon()] {try { setMarker(fileToParse, @@ -2320,13 +2612,37 @@ void IfStatement0(final int start,final int end) : errorEnd = jj_input_stream.getPosition() + 1; throw e; } + { + elseIfs = new ElseIf[elseIfList.size()]; + elseIfList.toArray(elseIfs); + if (stmts.size() == 1) { + return new IfStatement(condition, + (Statement) stmts.get(0), + elseIfs, + elseStatement, + pos, + SimpleCharStream.getPosition()); + } else { + statementsArray = new Statement[stmts.size()]; + stmts.toArray(statementsArray); + return new IfStatement(condition, + new Block(statementsArray,pos,endStatements), + elseIfs, + elseStatement, + pos, + SimpleCharStream.getPosition()); + } + } + | - (Statement() | htmlBlock()) - ( LOOKAHEAD(1) ElseIfStatement() )* + (stmt = Statement() | stmt = htmlBlock()) + ( LOOKAHEAD(1) elseifStatement = ElseIfStatement() {elseIfList.add(elseifStatement);})* [ LOOKAHEAD(1) try { - Statement() + {pos = SimpleCharStream.getPosition();} + statement = Statement() + {elseStatement = new Else(statement,pos,SimpleCharStream.getPosition());} } catch (ParseException e) { if (errorMessage != null) { throw e; @@ -2338,39 +2654,85 @@ void IfStatement0(final int start,final int end) : throw e; } ] + { + elseIfs = new ElseIf[elseIfList.size()]; + elseIfList.toArray(elseIfs); + return new IfStatement(condition, + stmt, + elseIfs, + elseStatement, + pos, + SimpleCharStream.getPosition());} } -void ElseIfStatementColon() : -{} +ElseIf ElseIfStatementColon() : +{ + Expression condition; + Statement statement; + final ArrayList list = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); +} { - Condition("elseif") (Statement() | htmlBlock())* + condition = Condition("elseif") + ( statement = Statement() {list.add(statement);} + | statement = htmlBlock() {list.add(statement);})* + { + Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());} } -void ElseStatementColon() : -{} +Else ElseStatementColon() : { - (Statement() | htmlBlock())* + Statement statement; + final ArrayList list = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); +} +{ + ( statement = Statement() {list.add(statement);} + | statement = htmlBlock() {list.add(statement);})* + { + Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return new Else(stmtsArray,pos,SimpleCharStream.getPosition());} } -void ElseIfStatement() : -{} +ElseIf ElseIfStatement() : { - Condition("elseif") Statement() + Expression condition; + Statement statement; + final ArrayList list = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); +} +{ + condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/} + { + Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());} } -void WhileStatement() : +WhileStatement WhileStatement() : { - final Token token; - final int pos = jj_input_stream.getPosition(); + final Expression condition; + final Statement action; + final int pos = SimpleCharStream.getPosition(); } { - token = Condition("while") WhileStatement0(pos,pos + token.image.length()) + + condition = Condition("while") + action = WhileStatement0(pos,pos + 5) + {return new WhileStatement(condition,action,pos,SimpleCharStream.getPosition());} } -void WhileStatement0(final int start, final int end) : -{} +Statement WhileStatement0(final int start, final int end) : { - (Statement())* + Statement statement; + final ArrayList stmts = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); +} +{ + (statement = Statement() {stmts.add(statement);})* {try { setMarker(fileToParse, "Ugly syntax detected, you should while () {...} instead of while (): ... endwhile;", @@ -2392,6 +2754,10 @@ void WhileStatement0(final int start, final int end) : } try { + { + Statement[] stmtsArray = new Statement[stmts.size()]; + stmts.toArray(stmtsArray); + return new Block(stmtsArray,pos,SimpleCharStream.getPosition());} } catch (ParseException e) { errorMessage = "';' expected after 'endwhile' keyword"; errorLevel = ERROR; @@ -2400,15 +2766,21 @@ void WhileStatement0(final int start, final int end) : throw e; } | - Statement() + statement = Statement() + {return statement;} } -void DoStatement() : -{} +DoStatement DoStatement() : { - Statement() Condition("while") + final Statement action; + final Expression condition; + final int pos = SimpleCharStream.getPosition(); +} +{ + action = Statement() condition = Condition("while") try { + {return new DoStatement(condition,action,pos,SimpleCharStream.getPosition());} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; @@ -2418,8 +2790,14 @@ void DoStatement() : } } -void ForeachStatement() : -{} +ForeachStatement ForeachStatement() : +{ + Statement statement; + Expression expression; + final StringBuffer buff = new StringBuffer(); + final int pos = SimpleCharStream.getPosition(); + ArrayVariableDeclaration variable; +} { try { @@ -2432,7 +2810,7 @@ void ForeachStatement() : throw e; } try { - Variable() + expression = Expression() } catch (ParseException e) { errorMessage = "variable expected"; errorLevel = ERROR; @@ -2440,7 +2818,6 @@ void ForeachStatement() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - ( VariableSuffix() )* try { } catch (ParseException e) { @@ -2451,7 +2828,7 @@ void ForeachStatement() : throw e; } try { - Variable() + variable = ArrayVariable() } catch (ParseException e) { errorMessage = "variable expected"; errorLevel = ERROR; @@ -2459,7 +2836,6 @@ void ForeachStatement() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } - [ Expression() ] try { } catch (ParseException e) { @@ -2470,7 +2846,7 @@ void ForeachStatement() : throw e; } try { - Statement() + statement = Statement() } catch (ParseException e) { if (errorMessage != null) throw e; errorMessage = "statement expected"; @@ -2479,12 +2855,24 @@ void ForeachStatement() : errorEnd = jj_input_stream.getPosition() + 1; throw e; } + {return new ForeachStatement(expression, + variable, + statement, + pos, + SimpleCharStream.getPosition());} + } -void ForStatement() : +ForStatement ForStatement() : { final Token token; -final int pos = jj_input_stream.getPosition(); +final int pos = SimpleCharStream.getPosition(); +Statement[] initializations = null; +Expression condition = null; +Statement[] increments = null; +Statement action; +final ArrayList list = new ArrayList(); +final int startBlock, endBlock; } { token = @@ -2497,11 +2885,16 @@ final int pos = jj_input_stream.getPosition(); errorEnd = jj_input_stream.getPosition() + 1; throw e; } - [ ForInit() ] [ Expression() ] [ StatementExpressionList() ] + [ initializations = ForInit() ] + [ condition = Expression() ] + [ increments = StatementExpressionList() ] ( - Statement() + action = Statement() + {return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());} | - (Statement())* + + {startBlock = SimpleCharStream.getPosition();} + (action = Statement() {list.add(action);})* { try { setMarker(fileToParse, @@ -2514,6 +2907,7 @@ final int pos = jj_input_stream.getPosition(); PHPeclipsePlugin.log(e); } } + {endBlock = SimpleCharStream.getPosition();} try { } catch (ParseException e) { @@ -2525,6 +2919,10 @@ final int pos = jj_input_stream.getPosition(); } try { + { + Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());} } catch (ParseException e) { errorMessage = "';' expected after 'endfor' keyword"; errorLevel = ERROR; @@ -2535,27 +2933,43 @@ final int pos = jj_input_stream.getPosition(); ) } -void ForInit() : -{} +Statement[] ForInit() : +{ + Statement[] statements; +} { LOOKAHEAD(LocalVariableDeclaration()) - LocalVariableDeclaration() + statements = LocalVariableDeclaration() + {return statements;} | - StatementExpressionList() + statements = StatementExpressionList() + {return statements;} } -void StatementExpressionList() : -{} +Statement[] StatementExpressionList() : +{ + final ArrayList list = new ArrayList(); + Statement expr; +} { - StatementExpression() ( StatementExpression() )* + expr = StatementExpression() {list.add(expr);} + ( StatementExpression() {list.add(expr);})* + { + Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return stmtsArray;} } -void ContinueStatement() : -{} +Continue ContinueStatement() : +{ + Expression expr = null; + final int pos = SimpleCharStream.getPosition(); +} { - [ Expression() ] + [ expr = Expression() ] try { + {return new Continue(expr,pos,SimpleCharStream.getPosition());} } catch (ParseException e) { errorMessage = "';' expected after 'continue' statement"; errorLevel = ERROR; @@ -2565,12 +2979,16 @@ void ContinueStatement() : } } -void ReturnStatement() : -{} +ReturnStatement ReturnStatement() : +{ + Expression expr = null; + final int pos = SimpleCharStream.getPosition(); +} { - [ Expression() ] + [ expr = Expression() ] try { + {return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());} } catch (ParseException e) { errorMessage = "';' expected after 'return' statement"; errorLevel = ERROR;