X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index 35b3173..f82c7cd 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -29,15 +29,17 @@ import org.eclipse.ui.texteditor.MarkerUtilities; 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.Outlineable; +import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; /** * A new php parser. @@ -45,6 +47,7 @@ import net.sourceforge.phpdt.internal.compiler.ast.*; * given with JavaCC. You can get JavaCC at http://www.webgain.com * You can test the parser with the PHPParserTestCase2.java * @author Matthieu Casanova + * @version $Reference: 1.0$ */ public final class PHPParser extends PHPParserSuperclass { @@ -52,15 +55,12 @@ 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$ static PHPOutlineInfo outlineInfo; - private static PHPFunctionDeclaration currentFunction; - private static boolean assigning; - /** The error level of the current ParseException. */ private static int errorLevel = ERROR; /** The message of the current ParseException. If it's null it's because the parse exception wasn't handled */ @@ -68,13 +68,21 @@ public final class PHPParser extends PHPParserSuperclass { private static int errorStart = -1; private static int errorEnd = -1; + private static PHPDocument phpDocument; + + private static final char[] SYNTAX_ERROR_CHAR = {'s','y','n','t','a','x',' ','e','r','r','o','r'}; + /** + * 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; + private static AstNode[] nodes; /** The cursor in expression stack. */ - private static int expressionPtr; + private static int nodePtr; public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; @@ -88,52 +96,49 @@ public final class PHPParser extends PHPParserSuperclass { this.fileToParse = fileToParse; } - public static final void phpParserTester(final String strEval) throws CoreException, ParseException { - PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); - final StringReader stream = new StringReader(strEval); - if (jj_input_stream == null) { - jj_input_stream = new SimpleCharStream(stream, 1, 1); - } - ReInit(new StringReader(strEval)); - astStack = new AstNode[AstStackIncrement]; - phpTest(); + /** + * Reinitialize the parser. + */ + private static final void init() { + nodes = new AstNode[AstStackIncrement]; + nodePtr = -1; + htmlStart = 0; } - public static final void htmlParserTester(final File fileName) throws CoreException, ParseException { + /** + * Add an php node on the stack. + * @param node the node that will be added to the stack + */ + private static final void pushOnAstNodes(final AstNode node) { try { - final Reader stream = new FileReader(fileName); - if (jj_input_stream == null) { - jj_input_stream = new SimpleCharStream(stream, 1, 1); - } - ReInit(stream); - astStack = new AstNode[AstStackIncrement]; - phpFile(); - } catch (FileNotFoundException e) { - e.printStackTrace(); //To change body of catch statement use Options | File Templates. - } - } - - public static final void htmlParserTester(final String strEval) throws CoreException, ParseException { - final StringReader stream = new StringReader(strEval); - if (jj_input_stream == null) { - jj_input_stream = new SimpleCharStream(stream, 1, 1); + nodes[++nodePtr] = node; + } catch (IndexOutOfBoundsException e) { + final int oldStackLength = nodes.length; + final AstNode[] oldStack = nodes; + nodes = new AstNode[oldStackLength + AstStackIncrement]; + System.arraycopy(oldStack, 0, nodes, 0, oldStackLength); + nodePtr = oldStackLength; + nodes[nodePtr] = node; } - ReInit(stream); - astStack = new AstNode[AstStackIncrement]; - phpFile(); } public final PHPOutlineInfo parseInfo(final Object parent, final String s) { - outlineInfo = new PHPOutlineInfo(parent); - currentSegment = outlineInfo.getDeclarations(); + phpDocument = new PHPDocument(parent,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(parent, currentSegment); 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.nodes = new AstNode[nodes.length]; + System.arraycopy(nodes,0,phpDocument.nodes,0,nodes.length); + if (PHPeclipsePlugin.DEBUG) { + PHPeclipsePlugin.log(1,phpDocument.toString()); + } } catch (ParseException e) { processParseException(e); } @@ -149,7 +154,7 @@ public final class PHPParser extends PHPParserSuperclass { if (errorMessage == null) { PHPeclipsePlugin.log(e); errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it"; - errorStart = jj_input_stream.getPosition(); + errorStart = SimpleCharStream.getPosition(); errorEnd = errorStart + 1; } setMarker(e); @@ -165,8 +170,8 @@ public final class PHPParser extends PHPParserSuperclass { if (errorStart == -1) { setMarker(fileToParse, errorMessage, - jj_input_stream.tokenBegin, - jj_input_stream.tokenBegin + e.currentToken.image.length(), + SimpleCharStream.tokenBegin, + SimpleCharStream.tokenBegin + e.currentToken.image.length(), errorLevel, "Line " + e.currentToken.beginLine); } else { @@ -184,31 +189,6 @@ public final class PHPParser extends PHPParserSuperclass { } } - /** - * Create markers according to the external parser output - */ - private static void createMarkers(final String output, final IFile file) throws CoreException { - // delete all markers - file.deleteMarkers(IMarker.PROBLEM, false, 0); - - int indx = 0; - int brIndx; - boolean flag = true; - while ((brIndx = output.indexOf("
", indx)) != -1) { - // newer php error output (tested with 4.2.3) - scanLine(output, file, indx, brIndx); - indx = brIndx + 6; - flag = false; - } - if (flag) { - while ((brIndx = output.indexOf("
", indx)) != -1) { - // older php error output (tested with 4.2.3) - scanLine(output, file, indx, brIndx); - indx = brIndx + 4; - } - } - } - private static void scanLine(final String output, final IFile file, final int indx, @@ -256,7 +236,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 +266,37 @@ 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 || currentPosition > SimpleCharStream.currentBuffer.length()) { + return; + } + final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray(); + pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); + } + + /** + * Create a new task. + */ + public static final void createNewTask() { + final int currentPosition = SimpleCharStream.getPosition(); + final String todo = SimpleCharStream.currentBuffer.substring(currentPosition+1, + SimpleCharStream.currentBuffer.indexOf("\n", + currentPosition)-1); + try { + setMarker(fileToParse, + "todo : " + todo, + SimpleCharStream.getBeginLine(), + TASK, + "Line "+SimpleCharStream.getBeginLine()); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } + private static final void parse() throws ParseException { phpFile(); } @@ -295,14 +306,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 */ @@ -326,34 +337,30 @@ PARSER_END(PHPParser) SPECIAL_TOKEN : { "//" : IN_SINGLE_LINE_COMMENT -| - "#" : IN_SINGLE_LINE_COMMENT -| - <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT -| - "/*" : IN_MULTI_LINE_COMMENT +| "#" : IN_SINGLE_LINE_COMMENT +| <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT +| "/*" : IN_MULTI_LINE_COMMENT } SPECIAL_TOKEN : { : PHPPARSING +| "?>" : DEFAULT } - SPECIAL_TOKEN : + SPECIAL_TOKEN : { - " > : DEFAULT + "todo" {PHPParser.createNewTask();} } - -SPECIAL_TOKEN : + SPECIAL_TOKEN : { - : PHPPARSING + "*/" : PHPPARSING } - -SPECIAL_TOKEN : + SPECIAL_TOKEN : { - : PHPPARSING + "*/" : PHPPARSING } @@ -386,6 +393,7 @@ MORE : | | | +| | | "> | @@ -435,64 +443,67 @@ MORE : | } +//Misc token + TOKEN : +{ + +| +| +| +| +| +} + +/* OPERATORS */ TOKEN : { - <_ORL : "OR"> -| <_ANDL : "AND"> + +| +| +| +| +| +| +| +| +| +| +| +| +| >"> +| >>"> +| <_ORL : "OR"> +| <_ANDL : "AND"> } /* LITERALS */ TOKEN : { - < INTEGER_LITERAL: + (["l","L"])? | (["l","L"])? | (["l","L"])? > | - < #DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* > + <#DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* > | - < #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ > + <#HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ > | - < #OCTAL_LITERAL: "0" (["0"-"7"])* > + <#OCTAL_LITERAL: "0" (["0"-"7"])* > | - < FLOATING_POINT_LITERAL: + )? (["f","F","d","D"])? | "." (["0"-"9"])+ ()? (["f","F","d","D"])? | (["0"-"9"])+ (["f","F","d","D"])? | (["0"-"9"])+ ()? ["f","F","d","D"] > | - < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ > + <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ > | - < STRING_LITERAL: ( | | )> -| < STRING_1: - "\"" - ( - ~["\"","{","}"] - | "\\\"" - | "\\" - | "{" ~["\""] "}" - )* - "\"" - > -| < STRING_2: - "'" - ( - ~["'"] - | "\\'" - )* - - "'" - > -| < STRING_3: - "`" - ( - ~["`"] - | "\\`" - )* - "`" - > + | | )> +| +| +| } /* IDENTIFIERS */ @@ -535,10 +546,10 @@ MORE : { "> | -| +| | ="> -| "> | | @@ -558,46 +569,13 @@ MORE : | -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| >"> -| >>"> | >="> } TOKEN : { - < DOLLAR_ID: > -} - -void phpTest() : -{} -{ - Php() - + > } void phpFile() : @@ -605,7 +583,7 @@ void phpFile() : { try { (PhpBlock())* - + {PHPParser.createNewHTMLCode();} } catch (TokenMgrError e) { PHPeclipsePlugin.log(e); errorStart = SimpleCharStream.getPosition(); @@ -623,18 +601,20 @@ void phpFile() : */ void PhpBlock() : { - final int start = jj_input_stream.getPosition(); + final int start = SimpleCharStream.getPosition(); + final PHPEchoBlock phpEchoBlock; } { - phpEchoBlock() + phpEchoBlock = phpEchoBlock() + {pushOnAstNodes(phpEchoBlock);} | - [ + [ | {try { setMarker(fileToParse, "You should use '' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } } -void phpEchoBlock() : -{} +PHPEchoBlock phpEchoBlock() : { - Expression() [ ] + final Expression expr; + final int pos = SimpleCharStream.getPosition(); + final PHPEchoBlock echoBlock; +} +{ + expr = Expression() [ ] + { + echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition()); + pushOnAstNodes(echoBlock); + return echoBlock;} } void Php() : @@ -665,52 +653,65 @@ void Php() : (BlockStatement())* } -void ClassDeclaration() : +ClassDeclaration ClassDeclaration() : { - final PHPClassDeclaration classDeclaration; - final Token className; + final ClassDeclaration classDeclaration; + final Token className,superclassName; final int pos; + char[] classNameImage = SYNTAX_ERROR_CHAR; + char[] superclassNameImage = null; } { + {pos = SimpleCharStream.getPosition();} try { - {pos = jj_input_stream.getPosition();} className = + {classNameImage = className.image.toCharArray();} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } [ try { - + superclassName = + {superclassNameImage = superclassName.image.toCharArray();} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); + superclassNameImage = SYNTAX_ERROR_CHAR; } ] { - if (currentSegment != null) { - classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); + if (superclassNameImage == null) { + classDeclaration = new ClassDeclaration(currentSegment, + classNameImage, + pos, + 0); + } else { + classDeclaration = new ClassDeclaration(currentSegment, + classNameImage, + superclassNameImage, + 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(final ClassDeclaration classDeclaration) : {} { try { @@ -718,18 +719,18 @@ void ClassBody() : } 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - ( ClassBodyDeclaration() )* + ( ClassBodyDeclaration(classDeclaration) )* try { } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', 'var', 'function' or '}' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } @@ -737,278 +738,280 @@ void ClassBody() : /** * A class can contain only methods and fields. */ -void ClassBodyDeclaration() : -{} +void ClassBodyDeclaration(final ClassDeclaration classDeclaration) : +{ + final MethodDeclaration method; + final FieldDeclaration field; +} { - MethodDeclaration() -| FieldDeclaration() + method = MethodDeclaration() {classDeclaration.addMethod(method);} +| field = FieldDeclaration() {classDeclaration.addField(field);} } /** * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;. */ -void FieldDeclaration() : +FieldDeclaration FieldDeclaration() : { - PHPVarDeclaration variableDeclaration; + VariableDeclaration variableDeclaration; + final VariableDeclaration[] list; + final ArrayList arrayList = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); } { variableDeclaration = VariableDeclarator() - { - outlineInfo.addVariable(variableDeclaration.getVariable().getName()); - if (currentSegment != null) { - currentSegment.add(variableDeclaration); - } - } - ( - variableDeclaration = VariableDeclarator() - { - if (currentSegment != null) { - currentSegment.add(variableDeclaration); - } - } + {arrayList.add(variableDeclaration); + outlineInfo.addVariable(new String(variableDeclaration.name));} + ( variableDeclaration = VariableDeclarator() + {arrayList.add(variableDeclaration); + outlineInfo.addVariable(new String(variableDeclaration.name));} )* try { } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } + + {list = new VariableDeclaration[arrayList.size()]; + arrayList.toArray(list); + return new FieldDeclaration(list, + pos, + SimpleCharStream.getPosition(), + currentSegment);} } -PHPVarDeclaration VariableDeclarator() : +VariableDeclaration VariableDeclarator() : { - final String varName, varValue; - final int pos = jj_input_stream.getPosition(); + final String varName; + Expression initializer = null; + final int pos = SimpleCharStream.getPosition(); } { varName = VariableDeclaratorId() [ try { - varValue = VariableInitializer() - {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} + 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; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } ] - {return new PHPVarDeclaration(currentSegment,varName,pos);} + { + if (initializer == null) { + return new VariableDeclaration(currentSegment, + varName.toCharArray(), + pos, + SimpleCharStream.getPosition()); + } + return new VariableDeclaration(currentSegment, + varName.toCharArray(), + initializer, + pos); + } } +/** + * A Variable name. + * @return the variable name (with suffix) + */ String VariableDeclaratorId() : { - String expr; - final StringBuffer buff = new StringBuffer(); + final String expr; + Expression expression = null; + final int pos = SimpleCharStream.getPosition(); + ConstantIdentifier ex; } { try { - expr = Variable() {buff.append(expr);} + expr = Variable() ( LOOKAHEAD(2) - expr = VariableSuffix() {buff.append(expr);} + {ex = new ConstantIdentifier(expr.toCharArray(), + pos, + SimpleCharStream.getPosition());} + expression = VariableSuffix(ex) )* - {return buff.toString();} + { + if (expression == null) { + return expr; + } + return expression.toStringExpression(); + } } catch (ParseException e) { errorMessage = "'$' expected for variable identifier"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } +/** + * Return a variablename without the $. + * @return a variable name + */ 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) { 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() {return expr;} } +/** + * A Variable name (without the $) + * @return a variable name String + */ String VariableName(): { -String expr = null; -final Token token; + final StringBuffer buff; + final String expr; + 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(); +final Expression expr,expr2; } { expr = Expression() - {buff.append(expr);} - [ expr = Expression() - {buff.append("=>").append(expr);}] - {return buff.toString();} + [ expr2 = Expression() + {return new ArrayVariableDeclaration(expr,expr2);} + ] + {return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());} } -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(); - } + final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; + list.toArray(vars); + return vars;} } /** * A Method Declaration. * function MetodDeclarator() Block() */ -void MethodDeclaration() : +MethodDeclaration MethodDeclaration() : { - final PHPFunctionDeclaration functionDeclaration; - Token functionToken; + final MethodDeclaration functionDeclaration; + final Block block; + final OutlineableWithChildren seg = currentSegment; } { - functionToken = + try { functionDeclaration = MethodDeclarator() - {outlineInfo.addVariable(functionDeclaration.getName());} + {outlineInfo.addVariable(new String(functionDeclaration.name));} } catch (ParseException e) { - if (errorMessage != null) { - throw e; - } + if (errorMessage != null) throw e; errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - { - if (currentSegment != null) { - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; - } - currentFunction = functionDeclaration; - } - 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); - } - } - } - currentFunction = null; - if (currentSegment != null) { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); - } - } + {currentSegment = functionDeclaration;} + block = Block() + {functionDeclaration.statements = block.statements; + currentSegment = seg; + return functionDeclaration;} } /** @@ -1016,21 +1019,33 @@ 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(); + char[] identifierChar = SYNTAX_ERROR_CHAR; } { - [ {methodDeclaration.append("&");} ] - identifier = - formalParameters = FormalParameters() - { - methodDeclaration.append(identifier); - return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters); + [reference = ] + try { + identifier = + {identifierChar = identifier.image.toCharArray();} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } + formalParameters = FormalParameters() + {return new MethodDeclaration(currentSegment, + identifierChar, + formalParameters, + reference != null, + pos, + SimpleCharStream.getPosition());} } /** @@ -1039,9 +1054,7 @@ PHPFunctionDeclaration MethodDeclarator() : */ Hashtable FormalParameters() : { - String expr; - final StringBuffer buff = new StringBuffer("("); - PHPVarDeclaration var; + VariableDeclaration var; final Hashtable parameters = new Hashtable(); } { @@ -1050,15 +1063,15 @@ Hashtable FormalParameters() : } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(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 { @@ -1066,9 +1079,9 @@ Hashtable FormalParameters() : } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } {return parameters;} } @@ -1077,40 +1090,56 @@ 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; - } + 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; + final int pos = SimpleCharStream.getPosition(); } - -String Type() : -{} { - {return "string";} -| {return "bool";} -| {return "boolean";} -| {return "real";} -| {return "double";} -| {return "float";} -| {return "int";} -| {return "integer";} -| {return "object";} + expr = Expression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} +| expr = ExpressionNoBang() {return expr;} } -String Expression() : +Expression ExpressionNoBang() : { - final String expr; - final String assignOperator; - final String expr2; + final Expression expr; } { expr = PrintExpression() {return expr;} @@ -1124,321 +1153,305 @@ String Expression() : * A Variable assignation. * varName (an assign operator) any expression */ -String varAssignation() : +VarAssignation varAssignation() : { - String varName,assignOperator,expr2; - PHPVarDeclaration variable; + final String varName; + final Expression initializer; + final int assignOperator; final int pos = SimpleCharStream.getPosition(); } { varName = VariableDeclaratorId() assignOperator = AssignmentOperator() try { - expr2 = Expression() + initializer = Expression() } catch (ParseException e) { if (errorMessage != null) { throw e; } errorMessage = "expression expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - {return varName + assignOperator + expr2;} + {return new VarAssignation(varName.toCharArray(), + initializer, + assignOperator, + pos, + SimpleCharStream.getPosition());} } -String AssignmentOperator() : +int AssignmentOperator() : {} { - {return "=";} -| {return "*=";} -| {return "/=";} -| {return "%=";} -| {return "+=";} -| {return "-=";} -| {return "<<=";} -| {return ">>=";} -| {return "&=";} -| {return "|=";} -| {return "|=";} -| {return ".=";} -| {return "~=";} + {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;} } -String ConditionalExpression() : +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; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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(); + final Expression expr; + final int pos = SimpleCharStream.getPosition(); } { - token = expr = UnaryExpressionNoPrefix() - { - if (token == null) { - return expr; - } - return token.image + expr; - } -| ( {buff.append("@");})* + expr = UnaryExpressionNoPrefix() + {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} +| + expr = AtUnaryExpression() {return expr;} +} + +Expression AtUnaryExpression() : +{ + final Expression expr; + final int pos = SimpleCharStream.getPosition(); +} +{ + + expr = AtUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);} +| expr = UnaryExpressionNoPrefix() - {return buff.append(expr).toString();} + {return expr;} } -String UnaryExpressionNoPrefix() : + +Expression UnaryExpressionNoPrefix() : { - final String expr; - final Token token; + final Expression expr; + final int operator; + final int pos = SimpleCharStream.getPosition(); } { - ( token = | token = ) expr = UnaryExpression() - { - return token.image + expr; - } + ( {operator = OperatorIds.PLUS;} + | {operator = OperatorIds.MINUS;}) + expr = UnaryExpression() + {return new PrefixedUnaryExpression(expr,operator,pos);} | expr = PreIncDecExpression() {return expr;} @@ -1448,23 +1461,26 @@ 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; + final Expression expr; } { - expr = UnaryExpression() {return "!" + expr;} -| LOOKAHEAD( (Type() | ) ) +// expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} + LOOKAHEAD( (Type() | ) ) expr = CastExpression() {return expr;} | expr = PostfixExpression() {return expr;} | expr = Literal() {return expr;} @@ -1474,118 +1490,159 @@ String UnaryExpressionNotPlusMinus() : } 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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; + final 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; - final StringBuffer buff = new StringBuffer(); + Expression expr; + final int pos = SimpleCharStream.getPosition(); } { LOOKAHEAD(2) identifier = expr = ClassIdentifier() - {buff.append(identifier.image).append("::").append(expr);} + {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(), + pos, + SimpleCharStream.getPosition()), + expr, + ClassAccess.STATIC);} ( - expr = PrimarySuffix() - {buff.append(expr);} - )* - {return buff.toString();} + LOOKAHEAD(PrimarySuffix()) + expr = PrimarySuffix(expr))* + {return expr;} | - expr = PrimaryPrefix() {buff.append(expr);} - ( expr = PrimarySuffix() {buff.append(expr);} )* - {return buff.toString();} + expr = PrimaryPrefix() + ( + LOOKAHEAD(PrimarySuffix()) + expr = PrimarySuffix(expr))* + {return expr;} | expr = ArrayDeclarator() - {return "array" + expr;} + {return expr;} } -String ArrayDeclarator() : +/** + * An array declarator. + * array(vars) + * @return an array + */ +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 VariableDeclaration(currentSegment, + 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(final 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(final Expression prefix) : { String expr = null; + final int pos = SimpleCharStream.getPosition(); + Expression expression = null; } { @@ -1594,225 +1651,315 @@ String VariableSuffix() : } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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) { errorMessage = "']' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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 = 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(final Expression func) : { -String expr = null; +Expression[] args = null; } { - [ expr = ArgumentList() ] + [ args = ArgumentList() ] try { } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - { - if (expr == null) { - return "()"; - } - return "(" + expr + ")"; - } + {return new FunctionCall(func,args,SimpleCharStream.getPosition());} } -String ArgumentList() : +/** + * An argument list is a list of arguments separated by comma : + * argumentDeclaration() (, argumentDeclaration)* + * @return an array of arguments + */ +Expression[] ArgumentList() : { -String expr; -final StringBuffer buff = new StringBuffer(); +Expression arg; +final ArrayList list = new ArrayList(); } { - expr = Expression() - {buff.append(expr);} + arg = Expression() + {list.add(arg);} ( try { - expr = Expression() + arg = Expression() + {list.add(arg);} } catch (ParseException e) { 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - {buff.append(",").append(expr);} )* - {return buff.toString();} + { + final Expression[] arguments = new Expression[list.size()]; + list.toArray(arguments); + return arguments;} } /** * A Statement without break. */ -void StatementNoBreak() : -{} +Statement StatementNoBreak() : +{ + final Statement statement; + Token token = null; +} { LOOKAHEAD(2) - Expression() + statement = Expression() try { } catch (ParseException e) { - if (e.currentToken.next.kind != 4) { + if (e.currentToken.next.kind != PHPParserConstants.PHPEND) { 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } + {return statement;} | LOOKAHEAD(2) - LabeledStatement() -| Block() -| EmptyStatement() -| StatementExpression() + 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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;} +| statement = defineStatement() {currentSegment.add((Outlineable)statement);return statement;} +} + +Define defineStatement() : +{ + final int start = SimpleCharStream.getPosition(); + Expression defineName,defineValue; +} +{ + + try { + + } 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; + processParseException(e); + } + try { + defineName = Expression() + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + throw e; + } + try { + + } 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; + processParseException(e); + } + try { + ( defineValue = PrintExpression() + | LOOKAHEAD(varAssignation()) + defineValue = varAssignation() + | defineValue = ConditionalExpression()) + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + throw e; + } + try { + + } 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; + processParseException(e); + } + {return new Define(currentSegment, + defineName, + defineValue, + start, + SimpleCharStream.getPosition());} } /** * A Normal statement. */ -void Statement() : -{} +Statement Statement() : { - StatementNoBreak() -| BreakStatement() + final Statement statement; +} +{ + statement = StatementNoBreak() {return statement;} +| statement = BreakStatement() {return statement;} } /** * An html block inside a php syntax. */ -void htmlBlock() : -{} +HTMLBlock htmlBlock() : +{ + final int startIndex = nodePtr; + final AstNode[] blockNodes; + final int nbNodes; +} { (phpEchoBlock())* try { ( | ) } catch (ParseException e) { - errorMessage = "End of file unexpected, ' - | token = - | token = - | token = ) - 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; + ( {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; } - { - if (currentSegment != null) { - currentSegment.add(new PHPReqIncDeclaration(currentSegment, token.image,pos,expr)); - } + errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } + {return inclusionStatement;} } -String PrintExpression() : +PrintExpression PrintExpression() : { - final String expr; + final Expression expr; + final int pos = SimpleCharStream.getPosition(); } { - expr = Expression() {return "print " + expr;} + expr = Expression() {return new PrintExpression(expr,pos,SimpleCharStream.getPosition());} } -String ListExpression() : +ListExpression ListExpression() : { - final StringBuffer buff = new StringBuffer("list("); - String expr; + String expr = null; + final Expression expression; + final ArrayList list = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); } { @@ -1821,186 +1968,305 @@ 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - expr = VariableDeclaratorId() - {buff.append(",").append(expr);} + [expr = VariableDeclaratorId() {list.add(expr);}] )* - {buff.append(")");} 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - [ expr = Expression() {buff.append("(").append(expr);}] - {return buff.toString();} + [ expression = Expression() + { + final String[] strings = new String[list.size()]; + list.toArray(strings); + return new ListExpression(strings, + expression, + pos, + SimpleCharStream.getPosition());} + ] + { + final String[] strings = new String[list.size()]; + list.toArray(strings); + return new ListExpression(strings,pos,SimpleCharStream.getPosition());} } /** * An echo statement. * echo anyexpression (, otherexpression)* */ -void EchoStatement() : -{} +EchoStatement EchoStatement() : { - Expression() ( Expression())* + final ArrayList expressions = new ArrayList(); + Expression expr; + final int pos = SimpleCharStream.getPosition(); +} +{ + expr = Expression() + {expressions.add(expr);} + ( + expr = Expression() + {expressions.add(expr);} + )* try { } 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } + {final Expression[] exprs = new Expression[expressions.size()]; + expressions.toArray(exprs); + return new EchoStatement(exprs,pos);} } -void GlobalStatement() : +GlobalStatement GlobalStatement() : { - final int pos = jj_input_stream.getPosition(); + final int pos = SimpleCharStream.getPosition(); String expr; + final ArrayList vars = new ArrayList(); + final 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 { + { + final 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"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } -void StaticStatement() : -{} +StaticStatement StaticStatement() : +{ + final int pos = SimpleCharStream.getPosition(); + final ArrayList vars = new ArrayList(); + VariableDeclaration expr; +} { - VariableDeclarator() ( VariableDeclarator())* + expr = VariableDeclarator() {vars.add(new String(expr.name));} + ( expr = VariableDeclarator() {vars.add(new String(expr.name));})* try { + { + final 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"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } -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(); + final ArrayList list = new ArrayList(); + Statement statement; +} { 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - ( BlockStatement() | htmlBlock())* + ( statement = BlockStatement() {list.add(statement);} + | statement = htmlBlock() {list.add(statement);})* try { } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } + { + final Statement[] statements = new Statement[list.size()]; + list.toArray(statements); + return new Block(statements,pos,SimpleCharStream.getPosition());} } -void BlockStatement() : -{} +Statement BlockStatement() : { - Statement() -| ClassDeclaration() -| MethodDeclaration() + final Statement statement; +} +{ + try { + statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement); + return statement;} + } catch (ParseException e) { + if (errorMessage != null) throw e; + errorMessage = "statement expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + throw e; + } +| statement = ClassDeclaration() {return statement;} +| statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement); + currentSegment.add((MethodDeclaration) statement); + 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() {currentSegment.add((MethodDeclaration) statement); + 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);})* + { + final VariableDeclaration[] vars = new VariableDeclaration[list.size()]; + list.toArray(vars); + return vars;} } -void LocalVariableDeclarator() : -{} +VariableDeclaration LocalVariableDeclarator() : +{ + final String varName; + Expression initializer = null; + final int pos = SimpleCharStream.getPosition(); +} { - VariableDeclaratorId() [ Expression() ] + varName = VariableDeclaratorId() [ initializer = Expression() ] + { + if (initializer == null) { + return new VariableDeclaration(currentSegment, + varName.toCharArray(), + pos, + SimpleCharStream.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() : -{} +Expression StatementExpression() : { - PreIncDecExpression() + final Expression expr,expr2; + final int operator; +} +{ + expr = PreIncDecExpression() {return expr;} | - PrimaryExpression() - [ - | - | AssignmentOperator() Expression() ] + expr = PrimaryExpression() + [ {return new PostfixedUnaryExpression(expr, + OperatorIds.PLUS_PLUS, + SimpleCharStream.getPosition());} + | {return new PostfixedUnaryExpression(expr, + OperatorIds.MINUS_MINUS, + SimpleCharStream.getPosition());} + | operator = AssignmentOperator() expr2 = Expression() + {return new BinaryExpression(expr,expr2,operator);} + ] + {return expr;} } -void SwitchStatement() : +SwitchStatement SwitchStatement() : { - final int pos = jj_input_stream.getPosition(); + final Expression variable; + final AbstractCase[] cases; + final int pos = SimpleCharStream.getPosition(); } { @@ -2009,20 +2275,20 @@ void SwitchStatement() : } catch (ParseException e) { errorMessage = "'(' expected after 'switch'"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { - Expression() + variable = Expression() } catch (ParseException e) { if (errorMessage != null) { throw e; } errorMessage = "expression expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { @@ -2030,25 +2296,33 @@ void SwitchStatement() : } 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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 { + { + final AbstractCase[] abcase = new AbstractCase[cases.size()]; + cases.toArray(abcase); + return abcase;} } 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } @@ -2057,8 +2331,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 { @@ -2071,146 +2348,177 @@ void switchStatementColon(final int start, final int end) : } catch (CoreException e) { PHPeclipsePlugin.log(e); }} - (switchLabel0())* + ( cas = switchLabel0() {cases.add(cas);})* try { } catch (ParseException e) { errorMessage = "'endswitch' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { + { + final AbstractCase[] abcase = new AbstractCase[cases.size()]; + cases.toArray(abcase); + return abcase;} } catch (ParseException e) { errorMessage = "';' expected after 'endswitch' keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } -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); - } + final 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"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { + {return expr;} } catch (ParseException e) { errorMessage = "':' expected after case expression"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - {return token.beginLine;} | token = <_DEFAULT> try { + {return null;} } catch (ParseException e) { errorMessage = "':' expected after 'default' keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - {return token.beginLine;} } -void IfStatement() : +Break BreakStatement() : { - final Token token; - final int pos = jj_input_stream.getPosition(); + Expression expression = null; + final int start = SimpleCharStream.getPosition(); +} +{ + [ expression = Expression() ] + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'break' keyword"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + throw e; + } + {return new Break(expression, start, SimpleCharStream.getPosition());} } + +IfStatement IfStatement() : { - token = Condition("if") IfStatement0(pos,pos+token.image.length()) + final int pos = SimpleCharStream.getPosition(); + final Expression condition; + final IfStatement ifStatement; +} +{ + 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 { } catch (ParseException e) { errorMessage = "'(' expected after " + keyword + " keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length(); + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length(); errorEnd = errorStart +1; processParseException(e); } - Expression() + condition = Expression() try { } catch (ParseException e) { errorMessage = "')' expected after " + keyword + " keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - throw e; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } + {return condition;} } -void IfStatement0(final int start,final int end) : -{} +IfStatement IfStatement0(final Expression condition, final int start,final int end) : { - (Statement() | htmlBlock())* (ElseIfStatementColon())* [ElseStatementColon()] + Statement statement; + final Statement stmt; + final Statement[] statementsArray; + ElseIf elseifStatement; + Else elseStatement = null; + final ArrayList stmts; + final ArrayList elseIfList = new ArrayList(); + final ElseIf[] elseIfs; + int pos = SimpleCharStream.getPosition(); + final 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, @@ -2227,8 +2535,8 @@ void IfStatement0(final int start,final int end) : } catch (ParseException e) { errorMessage = "'endif' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { @@ -2236,61 +2544,131 @@ void IfStatement0(final int start,final int end) : } catch (ParseException e) { errorMessage = "';' expected after 'endif' keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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; } errorMessage = "unexpected token '"+e.currentToken.next.image+"', a statement was expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } ] + { + elseIfs = new ElseIf[elseIfList.size()]; + elseIfList.toArray(elseIfs); + return new IfStatement(condition, + stmt, + elseIfs, + elseStatement, + pos, + SimpleCharStream.getPosition());} } -void ElseIfStatementColon() : -{} +ElseIf ElseIfStatementColon() : { - Condition("elseif") (Statement() | htmlBlock())* + final Expression condition; + Statement statement; + final ArrayList list = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); +} +{ + condition = Condition("elseif") + ( statement = Statement() {list.add(statement);} + | statement = htmlBlock() {list.add(statement);})* + { + final Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());} } -void ElseStatementColon() : -{} +Else ElseStatementColon() : +{ + Statement statement; + final ArrayList list = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); +} { - (Statement() | htmlBlock())* + ( statement = Statement() {list.add(statement);} + | statement = htmlBlock() {list.add(statement);})* + { + final Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return new Else(stmtsArray,pos,SimpleCharStream.getPosition());} } -void ElseIfStatement() : -{} +ElseIf ElseIfStatement() : { - Condition("elseif") Statement() + final Expression condition; + final Statement statement; + final ArrayList list = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); +} +{ + condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/} + { + final 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;", @@ -2306,40 +2684,55 @@ void WhileStatement0(final int start, final int end) : } catch (ParseException e) { errorMessage = "'endwhile' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { + { + final 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; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } | - Statement() + statement = Statement() + {return statement;} } -void DoStatement() : -{} +DoStatement DoStatement() : +{ + final Statement action; + final Expression condition; + final int pos = SimpleCharStream.getPosition(); +} { - Statement() Condition("while") + 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; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } -void ForeachStatement() : -{} +ForeachStatement ForeachStatement() : +{ + Statement statement; + Expression expression; + final int pos = SimpleCharStream.getPosition(); + ArrayVariableDeclaration variable; +} { try { @@ -2347,64 +2740,74 @@ void ForeachStatement() : } catch (ParseException e) { errorMessage = "'(' expected after 'foreach' keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { - Variable() + expression = Expression() } catch (ParseException e) { errorMessage = "variable expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - ( VariableSuffix() )* try { } catch (ParseException e) { errorMessage = "'as' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { - Variable() + variable = ArrayVariable() } catch (ParseException e) { errorMessage = "variable expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - [ Expression() ] try { } catch (ParseException e) { errorMessage = "')' expected after 'foreach' keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { - Statement() + statement = Statement() } catch (ParseException e) { if (errorMessage != null) throw e; errorMessage = "statement expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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(); +Expression[] initializations = null; +Expression condition = null; +Expression[] increments = null; +Statement action; +final ArrayList list = new ArrayList(); +final int startBlock, endBlock; } { token = @@ -2413,15 +2816,20 @@ final int pos = jj_input_stream.getPosition(); } catch (ParseException e) { errorMessage = "'(' expected after 'for' keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.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, @@ -2434,68 +2842,93 @@ final int pos = jj_input_stream.getPosition(); PHPeclipsePlugin.log(e); } } + {endBlock = SimpleCharStream.getPosition();} try { } catch (ParseException e) { errorMessage = "'endfor' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } try { + { + final Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());} } catch (ParseException e) { errorMessage = "';' expected after 'endfor' keyword"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } ) } -void ForInit() : -{} +Expression[] ForInit() : +{ + final Expression[] exprs; +} { LOOKAHEAD(LocalVariableDeclaration()) - LocalVariableDeclaration() + exprs = LocalVariableDeclaration() + {return exprs;} | - StatementExpressionList() + exprs = StatementExpressionList() + {return exprs;} } -void StatementExpressionList() : -{} +Expression[] StatementExpressionList() : +{ + final ArrayList list = new ArrayList(); + final Expression expr; +} { - StatementExpression() ( StatementExpression() )* + expr = StatementExpression() {list.add(expr);} + ( StatementExpression() {list.add(expr);})* + { + final Expression[] exprsArray = new Expression[list.size()]; + list.toArray(exprsArray); + return exprsArray;} } -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; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } -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; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; throw e; } } \ No newline at end of file