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 a28acb9..9d2846a 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -1,3 +1,4 @@ + options { LOOKAHEAD = 1; CHOICE_AMBIGUITY_CHECK = 2; @@ -17,6 +18,7 @@ options { BUILD_TOKEN_MANAGER = true; SANITY_CHECK = true; FORCE_LA_CHECK = false; + COMMON_TOKEN_ACTION = true; } PARSER_BEGIN(PHPParser) @@ -29,7 +31,6 @@ 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.*; @@ -39,7 +40,9 @@ import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; 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; +import net.sourceforge.phpdt.internal.corext.Assert; /** * A new php parser. @@ -50,8 +53,9 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; */ public final class PHPParser extends PHPParserSuperclass { - /** The file that is parsed. */ - private static IFile fileToParse; +//todo : fix the variables names bug +//todo : handle tilde operator + /** The current segment. */ private static OutlineableWithChildren currentSegment; @@ -60,8 +64,6 @@ public final class PHPParser extends PHPParserSuperclass { private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$ static PHPOutlineInfo outlineInfo; - 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 */ @@ -70,6 +72,8 @@ public final class PHPParser extends PHPParserSuperclass { private static int errorStart = -1; private static int errorEnd = -1; private static PHPDocument phpDocument; + + private static final String SYNTAX_ERROR_CHAR = "syntax error"; /** * The point where html starts. * It will be used by the token manager to create HTMLCode objects @@ -83,8 +87,10 @@ public final class PHPParser extends PHPParserSuperclass { /** The cursor in expression stack. */ private static int nodePtr; + public static final boolean PARSER_DEBUG = false; + public final void setFileToParse(final IFile fileToParse) { - this.fileToParse = fileToParse; + PHPParser.fileToParse = fileToParse; } public PHPParser() { @@ -92,7 +98,47 @@ public final class PHPParser extends PHPParserSuperclass { public PHPParser(final IFile fileToParse) { this(new StringReader("")); - this.fileToParse = fileToParse; + PHPParser.fileToParse = fileToParse; + } + + public static final void phpParserTester(final String strEval) throws ParseException { + final StringReader stream = new StringReader(strEval); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(new StringReader(strEval)); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); + phpTest(); + } + + public static final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException { + final Reader stream = new FileReader(fileName); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + phpFile(); + } + + public static final void htmlParserTester(final String strEval) throws ParseException { + final StringReader stream = new StringReader(strEval); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + phpFile(); } /** @@ -108,12 +154,12 @@ public final class PHPParser extends PHPParserSuperclass { * Add an php node on the stack. * @param node the node that will be added to the stack */ - private static final void pushOnAstNodes(AstNode node) { + private static final void pushOnAstNodes(final AstNode node) { try { nodes[++nodePtr] = node; } catch (IndexOutOfBoundsException e) { - int oldStackLength = nodes.length; - AstNode[] oldStack = nodes; + final int oldStackLength = nodes.length; + final AstNode[] oldStack = nodes; nodes = new AstNode[oldStackLength + AstStackIncrement]; System.arraycopy(oldStack, 0, nodes, 0, oldStackLength); nodePtr = oldStackLength; @@ -135,7 +181,9 @@ public final class PHPParser extends PHPParserSuperclass { parse(); phpDocument.nodes = new AstNode[nodes.length]; System.arraycopy(nodes,0,phpDocument.nodes,0,nodes.length); - PHPeclipsePlugin.log(1,phpDocument.toString()); + if (PHPeclipsePlugin.DEBUG) { + PHPeclipsePlugin.log(1,phpDocument.toString()); + } } catch (ParseException e) { processParseException(e); } @@ -143,6 +191,19 @@ public final class PHPParser extends PHPParserSuperclass { } /** + * This function will throw the exception if we are in debug mode + * and process it if we are in production mode. + * this should be fast since the PARSER_DEBUG is static final so the difference will be at compile time + * @param e the exception + * @throws ParseException the thrown exception + */ + private static void processParseExceptionDebug(final ParseException e) throws ParseException { + if (PARSER_DEBUG) { + throw e; + } + processParseException(e); + } + /** * This method will process the parse exception. * If the error message is null, the parse exception wasn't catched and a trace is written in the log * @param e the ParseException @@ -151,15 +212,16 @@ 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 = SimpleCharStream.getPosition(); - errorEnd = errorStart + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; } setMarker(e); errorMessage = null; + // if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e); } /** - * Create marker for the parse error + * Create marker for the parse error. * @param e the ParseException */ private static void setMarker(final ParseException e) { @@ -167,17 +229,17 @@ public final class PHPParser extends PHPParserSuperclass { if (errorStart == -1) { setMarker(fileToParse, errorMessage, - SimpleCharStream.tokenBegin, - SimpleCharStream.tokenBegin + e.currentToken.image.length(), + e.currentToken.sourceStart, + e.currentToken.sourceEnd, errorLevel, - "Line " + e.currentToken.beginLine); + "Line " + e.currentToken.beginLine+", "+e.currentToken.sourceStart+':'+e.currentToken.sourceEnd); } else { setMarker(fileToParse, errorMessage, errorStart, errorEnd, errorLevel, - "Line " + e.currentToken.beginLine); + "Line " + e.currentToken.beginLine+", "+errorStart+':'+errorEnd); errorStart = -1; errorEnd = -1; } @@ -186,42 +248,17 @@ 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, final int brIndx) throws CoreException { String current; - StringBuffer lineNumberBuffer = new StringBuffer(10); + final StringBuffer lineNumberBuffer = new StringBuffer(10); char ch; current = output.substring(indx, brIndx); if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) { - int onLine = current.indexOf("on line "); + final int onLine = current.indexOf("on line "); if (onLine != -1) { lineNumberBuffer.delete(0, lineNumberBuffer.length()); for (int i = onLine; i < current.length(); i++) { @@ -231,9 +268,9 @@ public final class PHPParser extends PHPParserSuperclass { } } - int lineNumber = Integer.parseInt(lineNumberBuffer.toString()); + final int lineNumber = Integer.parseInt(lineNumberBuffer.toString()); - Hashtable attributes = new Hashtable(); + final Hashtable attributes = new Hashtable(); current = current.replaceAll("\n", ""); current = current.replaceAll("", ""); @@ -252,7 +289,7 @@ public final class PHPParser extends PHPParserSuperclass { } } - public final void parse(final String s) throws CoreException { + public final void parse(final String s) { final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); @@ -292,12 +329,32 @@ 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) { + final int currentPosition = token.sourceStart; + if (currentPosition == htmlStart || + currentPosition < htmlStart || + currentPosition > SimpleCharStream.currentBuffer.length()) { return; } - final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray(); - pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); + final String html = SimpleCharStream.currentBuffer.substring(htmlStart, currentPosition); + pushOnAstNodes(new HTMLCode(html, htmlStart,currentPosition)); + } + + /** Create a new task. */ + public static final void createNewTask(final int todoStart) { + final String todo = SimpleCharStream.currentBuffer.substring(todoStart, + SimpleCharStream.currentBuffer.indexOf("\n", + todoStart)-1); + if (!PARSER_DEBUG) { + try { + setMarker(fileToParse, + todo, + SimpleCharStream.getBeginLine(), + TASK, + "Line "+SimpleCharStream.getBeginLine()); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } } private static final void parse() throws ParseException { @@ -307,16 +364,28 @@ public final class PHPParser extends PHPParserSuperclass { PARSER_END(PHPParser) +TOKEN_MGR_DECLS: +{ + // CommonTokenAction: use the begins/ends fields added to the Jack + // CharStream class to set corresponding fields in each Token (which was + // also extended with new fields). By default Jack doesn't supply absolute + // offsets, just line/column offsets + static void CommonTokenAction(Token t) { + t.sourceStart = input_stream.beginOffset; + t.sourceEnd = input_stream.endOffset; + } // CommonTokenAction +} // TOKEN_MGR_DECLS + TOKEN : { - {PHPParser.createNewHTMLCode();} : PHPPARSING -| {PHPParser.createNewHTMLCode();} : PHPPARSING -| : PHPPARSING +| : PHPPARSING +| "> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT + "> : DEFAULT } /* Skip any character if we are not in php mode */ @@ -336,38 +405,47 @@ PARSER_END(PHPParser) | "\f" } + SPECIAL_TOKEN : +{ + " " : PHPPARSING +| "\t" : PHPPARSING +| "\n" : PHPPARSING +| "\r" : PHPPARSING +| "\f" : PHPPARSING +} /* COMMENTS */ 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 +| < ~[] > } - SPECIAL_TOKEN : + SPECIAL_TOKEN : { - " > : DEFAULT + "todo" } - -SPECIAL_TOKEN : +void todo() : +{Token todoToken;} +{ + todoToken = "TODO" {createNewTask(todoToken.sourceStart);} +} + SPECIAL_TOKEN : { - : PHPPARSING + "*/" : PHPPARSING } - -SPECIAL_TOKEN : + SPECIAL_TOKEN : { - : PHPPARSING + "*/" : PHPPARSING } @@ -400,10 +478,15 @@ MORE : | | | +| | -| "> -| -| "> +} + + TOKEN : +{ + "> : PHPPARSING +| : PHPPARSING +| "> : PHPPARSING } /* RESERVED WORDS AND LITERALS */ @@ -450,36 +533,35 @@ MORE : } //Misc token - TOKEN : + TOKEN : { - -| -| -| -| -| + : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING } /* OPERATORS */ - TOKEN : -{ - -| -| -| -| -| -| -| -| -| -| -| -| -| >"> -| >>"> -| <_ORL : "OR"> -| <_ANDL : "AND"> + TOKEN : +{ + : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| >"> : PHPPARSING +| >>"> : PHPPARSING +| <_ORL : "OR"> : PHPPARSING +| <_ANDL : "AND"> : PHPPARSING } /* LITERALS */ @@ -506,40 +588,81 @@ MORE : | <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ > | - | | )> -| -| | )> +//| +| +| +} - "'" - > -| + SKIP : +{ + : IN_STRING +} + + TOKEN : +{ + : IN_STRING +} + + + TOKEN : +{ + : DOLLAR_IN_STRING +} + + TOKEN : +{ + : PHPPARSING } + TOKEN : +{ + : DOLLAR_IN_STRING_EXPR +} + + SPECIAL_TOKEN : +{ + <"{"> : SKIPSTRING +} + + SPECIAL_TOKEN : +{ + <"}"> : IN_STRING +} + + SKIP : +{ + <~[]> +} + + TOKEN : +{ + : DOLLAR_IN_STRING +} + + TOKEN : +{ + +} + + SKIP : +{ + <~[]> +} + + SKIP : +{ + <~[]> +} /* IDENTIFIERS */ - TOKEN : + + TOKEN : { : IN_VARIABLE} + + + TOKEN : { - < IDENTIFIER: (|) (||)* > + |) (||)* > | < #LETTER: ["a"-"z"] | ["A"-"Z"] @@ -554,57 +677,63 @@ MORE : > } + SPECIAL_TOKEN : +{ + < ~[] > : IN_STRING +} /* SEPARATORS */ - TOKEN : + TOKEN : { - -| -| -| -| -| -| -| -| + : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING } /* COMPARATOR */ - TOKEN : + TOKEN : { - "> -| -| -| ="> -| "> -| -| + "> : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| ="> : PHPPARSING +| "> : PHPPARSING +| : PHPPARSING +| : PHPPARSING } /* ASSIGNATION */ - TOKEN : -{ - -| >="> -} - - TOKEN : + TOKEN : +{ + : PHPPARSING +| >="> : PHPPARSING +} + +void phpTest() : +{} { - < DOLLAR_ID: > + Php() + } void phpFile() : @@ -612,11 +741,11 @@ void phpFile() : { try { (PhpBlock())* - + {PHPParser.createNewHTMLCode();} } catch (TokenMgrError e) { PHPeclipsePlugin.log(e); - errorStart = SimpleCharStream.getPosition(); - errorEnd = errorStart + 1; + errorStart = SimpleCharStream.beginOffset; + errorEnd = SimpleCharStream.endOffset; errorMessage = e.getMessage(); errorLevel = ERROR; throw generateParseException(); @@ -630,46 +759,53 @@ void phpFile() : */ void PhpBlock() : { - final int start = SimpleCharStream.getPosition(); + final PHPEchoBlock phpEchoBlock; + final Token token,phpEnd; } { - phpEchoBlock() + phpEchoBlock = phpEchoBlock() + {pushOnAstNodes(phpEchoBlock);} | [ - | + | token = {try { setMarker(fileToParse, "You should use ' + phpEnd = + {htmlStart = phpEnd.sourceEnd;} } catch (ParseException e) { errorMessage = "'?>' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } } PHPEchoBlock phpEchoBlock() : { final Expression expr; - final int pos = SimpleCharStream.getPosition(); - PHPEchoBlock echoBlock; + final PHPEchoBlock echoBlock; + final Token token, token2; } { - expr = Expression() [ ] + token = {PHPParser.createNewHTMLCode();} + expr = Expression() [ ] token2 = { - echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition()); + htmlStart = token2.sourceEnd; + + echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd); pushOnAstNodes(echoBlock); return echoBlock;} } @@ -683,163 +819,245 @@ void Php() : ClassDeclaration ClassDeclaration() : { final ClassDeclaration classDeclaration; - final Token className; - Token superclassName = null; - final int pos; + Token className = null; + final Token superclassName, token, extendsToken; + String classNameImage = SYNTAX_ERROR_CHAR; + String superclassNameImage = null; + final int classEnd; } { - + token = try { - {pos = SimpleCharStream.getPosition();} className = + {classNameImage = className.image;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = token.sourceEnd+1; + errorEnd = token.sourceEnd+1; + processParseExceptionDebug(e); } [ - + extendsToken = try { superclassName = + {superclassNameImage = superclassName.image;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = extendsToken.sourceEnd+1; + errorEnd = extendsToken.sourceEnd+1; + processParseExceptionDebug(e); + superclassNameImage = SYNTAX_ERROR_CHAR; } ] { - if (superclassName == null) { + int start, end; + if (className == null) { + start = token.sourceStart; + end = token.sourceEnd; + } else { + start = className.sourceStart; + end = className.sourceEnd; + } + if (superclassNameImage == null) { + classDeclaration = new ClassDeclaration(currentSegment, - className.image.toCharArray(), - pos, - 0); + classNameImage, + start, + end); } else { classDeclaration = new ClassDeclaration(currentSegment, - className.image.toCharArray(), - superclassName.image.toCharArray(), - pos, - 0); + classNameImage, + superclassNameImage, + start, + end); } currentSegment.add(classDeclaration); currentSegment = classDeclaration; } - ClassBody(classDeclaration) + classEnd = ClassBody(classDeclaration) {currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - classDeclaration.sourceEnd = SimpleCharStream.getPosition(); + classDeclaration.sourceEnd = classEnd; pushOnAstNodes(classDeclaration); return classDeclaration;} } -void ClassBody(ClassDeclaration classDeclaration) : -{} +int ClassBody(final ClassDeclaration classDeclaration) : +{ +Token token; +} { try { } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } ( ClassBodyDeclaration(classDeclaration) )* try { - + token = + {return token.sourceEnd;} } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', 'var', 'function' or '}' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); + return PHPParser.token.sourceEnd; } } /** * A class can contain only methods and fields. */ -void ClassBodyDeclaration(ClassDeclaration classDeclaration) : +void ClassBodyDeclaration(final ClassDeclaration classDeclaration) : { - MethodDeclaration method; - FieldDeclaration field; + final MethodDeclaration method; + final FieldDeclaration field; } { - method = MethodDeclaration() {method.setParent(classDeclaration);} -| field = FieldDeclaration() + method = MethodDeclaration() {method.analyzeCode(); + classDeclaration.addMethod(method);} +| field = FieldDeclaration() {classDeclaration.addField(field);} } /** * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;. + * it is only used by ClassBodyDeclaration() */ FieldDeclaration FieldDeclaration() : { VariableDeclaration variableDeclaration; - VariableDeclaration[] list; + final VariableDeclaration[] list; final ArrayList arrayList = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); + final Token token; + Token token2 = null; + int pos; } { - variableDeclaration = VariableDeclarator() - {arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name)); - currentSegment.add(variableDeclaration);} - ( variableDeclaration = VariableDeclarator() - {arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name)); - currentSegment.add(variableDeclaration);} + token = variableDeclaration = VariableDeclaratorNoSuffix() + { + arrayList.add(variableDeclaration); + pos = variableDeclaration.sourceEnd; + } + ( + variableDeclaration = VariableDeclaratorNoSuffix() + { + arrayList.add(variableDeclaration); + outlineInfo.addVariable(variableDeclaration.name()); + pos = variableDeclaration.sourceEnd; + } )* try { - + token2 = } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } {list = new VariableDeclaration[arrayList.size()]; arrayList.toArray(list); + int end; + if (token2 == null) { + end = list[list.length-1].sourceEnd; + } else { + end = token2.sourceEnd; + } return new FieldDeclaration(list, - pos, - SimpleCharStream.getPosition(), + token.sourceStart, + end, currentSegment);} } +/** + * a strict variable declarator : there cannot be a suffix here. + * It will be used by fields and formal parameters + */ +VariableDeclaration VariableDeclaratorNoSuffix() : +{ + final Token token, lbrace,rbrace; + Expression expr, initializer = null; + Token assignToken; + Variable variable; +} +{ + + ( + token = + {variable = new Variable(token.image,token.sourceStart,token.sourceEnd);} + | + lbrace = expr = Expression() rbrace = + {variable = new Variable(expr,lbrace.sourceStart,rbrace.sourceEnd);} + ) + [ + assignToken = + try { + initializer = VariableInitializer() + } catch (ParseException e) { + errorMessage = "Literal expression expected in variable initializer"; + errorLevel = ERROR; + errorStart = assignToken.sourceEnd +1; + errorEnd = assignToken.sourceEnd +1; + processParseExceptionDebug(e); + } + ] + { + if (initializer == null) { + return new VariableDeclaration(currentSegment, + variable, + variable.sourceStart, + variable.sourceEnd); + } + return new VariableDeclaration(currentSegment, + variable, + initializer, + VariableDeclaration.EQUAL, + variable.sourceStart); + } +} + +/** + * this will be used by static statement + */ VariableDeclaration VariableDeclarator() : { - final String varName; + final AbstractVariable variable; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); + final Token token; } { - varName = VariableDeclaratorId() + variable = VariableDeclaratorId() [ - + token = try { initializer = VariableInitializer() } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = token.sourceEnd+1; + errorEnd = token.sourceEnd+1; + processParseExceptionDebug(e); } ] { if (initializer == null) { return new VariableDeclaration(currentSegment, - varName.toCharArray(), - pos, - SimpleCharStream.getPosition()); + variable, + variable.sourceStart, + variable.sourceEnd); } return new VariableDeclaration(currentSegment, - varName.toCharArray(), - initializer, - pos); + variable, + initializer, + VariableDeclaration.EQUAL, + variable.sourceStart); } } @@ -847,133 +1065,105 @@ VariableDeclaration VariableDeclarator() : * A Variable name. * @return the variable name (with suffix) */ -String VariableDeclaratorId() : +AbstractVariable VariableDeclaratorId() : { - String expr; - Expression expression; - final StringBuffer buff = new StringBuffer(); - final int pos = SimpleCharStream.getPosition(); - ConstantIdentifier ex; + final Variable var; + AbstractVariable expression = null; } { try { - expr = Variable() {buff.append(expr);} - ( LOOKAHEAD(2) - {ex = new ConstantIdentifier(expr.toCharArray(), - pos, - SimpleCharStream.getPosition());} - expression = VariableSuffix(ex) - {buff.append(expression.toStringExpression());} + var = Variable() + ( + LOOKAHEAD(2) + expression = VariableSuffix(var) )* - {return buff.toString();} + { + if (expression == null) { + return var; + } + return expression; + } } catch (ParseException e) { errorMessage = "'$' expected for variable identifier"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; throw e; } } -String Variable(): +Variable Variable() : { - final StringBuffer buff; - Expression expression = null; + Variable variable = null; final Token token; - final String expr; } { - token = [ expression = Expression() ] + token = variable = Var() { - if (expression == null && !assigning) { - return token.image.substring(1); - } - buff = new StringBuffer(token.image); - buff.append("{"); - buff.append(expression.toStringExpression()); - buff.append("}"); - return buff.toString(); + return variable; } -| - expr = VariableName() - {return "$" + expr;} } -String VariableName(): +Variable Var() : { - final StringBuffer buff; - String expr = null; - Expression expression = null; - final Token token; + Variable variable = null; + final Token token,token2; + ConstantIdentifier constant; + Expression expression; } { - expression = Expression() - {buff = new StringBuffer("{"); - buff.append(expression.toStringExpression()); - buff.append("}"); - return buff.toString();} + token = variable = Var() + {return new Variable(variable,variable.sourceStart,variable.sourceEnd);} | - token = [ expression = Expression() ] + token = expression = Expression() token2 = { - if (expression == null) { - return token.image; - } - buff = new StringBuffer(token.image); - buff.append("{"); - buff.append(expression.toStringExpression()); - buff.append("}"); - return buff.toString(); + return new Variable(expression, + token.sourceStart, + token2.sourceEnd); } | - expr = VariableName() + token = { - buff = new StringBuffer("$"); - buff.append(expr); - return buff.toString(); + outlineInfo.addVariable('$' + token.image); + return new Variable(token.image,token.sourceStart,token.sourceEnd); } -| - token = {return token.image;} } Expression VariableInitializer() : { final Expression expr; - final Token token; - final int pos = SimpleCharStream.getPosition(); + final Token token, token2; } { expr = Literal() {return expr;} | - (token = | token = ) - {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(), - pos, - SimpleCharStream.getPosition()), + token2 = (token = | token = ) + {return new PrefixedUnaryExpression(new NumberLiteral(token), OperatorIds.MINUS, - pos);} + token2.sourceStart);} | - (token = | token = ) - {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(), - pos, - SimpleCharStream.getPosition()), + token2 = (token = | token = ) + {return new PrefixedUnaryExpression(new NumberLiteral(token), OperatorIds.PLUS, - pos);} + token2.sourceStart);} | expr = ArrayDeclarator() {return expr;} | token = - {return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());} + {return new ConstantIdentifier(token);} } ArrayVariableDeclaration ArrayVariable() : { -Expression expr,expr2; +final Expression expr,expr2; } { expr = Expression() - [ expr2 = Expression() - {return new ArrayVariableDeclaration(expr,expr2);} + [ + expr2 = Expression() + {return new ArrayVariableDeclaration(expr,expr2);} ] {return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());} } @@ -984,16 +1174,20 @@ ArrayVariableDeclaration[] ArrayInitializer() : final ArrayList list = new ArrayList(); } { - [ expr = ArrayVariable() - {list.add(expr);} - ( LOOKAHEAD(2) expr = ArrayVariable() - {list.add(expr);} - )* - ] - [ {list.add(null);}] + + [ + expr = ArrayVariable() + {list.add(expr);} + ( LOOKAHEAD(2) expr = ArrayVariable() + {list.add(expr);} + )* + ] + [ + {list.add(null);} + ] { - ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; + final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; list.toArray(vars); return vars;} } @@ -1006,34 +1200,27 @@ MethodDeclaration MethodDeclaration() : { final MethodDeclaration functionDeclaration; final Block block; + final OutlineableWithChildren seg = currentSegment; + final Token token; } { - + token = try { - functionDeclaration = MethodDeclarator() - {outlineInfo.addVariable(new String(functionDeclaration.name));} + functionDeclaration = MethodDeclarator(token.sourceStart) + {outlineInfo.addVariable(functionDeclaration.name);} } catch (ParseException e) { if (errorMessage != null) throw e; errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; throw e; } - { - if (currentSegment != null) { - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; - } - } + {currentSegment = functionDeclaration;} block = Block() - { - functionDeclaration.statements = block.statements; - if (currentSegment != null) { - currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - } - return functionDeclaration; - } + {functionDeclaration.statements = block.statements; + currentSegment = seg; + return functionDeclaration;} } /** @@ -1041,60 +1228,96 @@ MethodDeclaration MethodDeclaration() : * [&] IDENTIFIER(parameters ...). * @return a function description for the outline */ -MethodDeclaration MethodDeclarator() : +MethodDeclaration MethodDeclarator(final int start) : { - final Token identifier; + Token identifier = null; Token reference = null; - final Hashtable formalParameters; - final int pos = SimpleCharStream.getPosition(); + final ArrayList formalParameters = new ArrayList(); + String identifierChar = SYNTAX_ERROR_CHAR; + int end = start; } { - [reference = ] identifier = - formalParameters = FormalParameters() - {return new MethodDeclaration(currentSegment, - identifier.image.toCharArray(), - formalParameters, - reference != null, - pos, - SimpleCharStream.getPosition());} + [reference = {end = reference.sourceEnd;}] + try { + identifier = + { + identifierChar = identifier.image; + end = identifier.sourceEnd; + } + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; + errorLevel = ERROR; + errorStart = e.currentToken.sourceEnd; + errorEnd = e.currentToken.next.sourceStart; + processParseExceptionDebug(e); + } + end = FormalParameters(formalParameters) + { + int nameStart, nameEnd; + if (identifier == null) { + if (reference == null) { + nameStart = start + 9; + nameEnd = start + 10; + } else { + nameStart = reference.sourceEnd + 1; + nameEnd = reference.sourceEnd + 2; + } + } else { + nameStart = identifier.sourceStart; + nameEnd = identifier.sourceEnd; + } + return new MethodDeclaration(currentSegment, + identifierChar, + formalParameters, + reference != null, + nameStart, + nameEnd, + start, + end); + } } /** * FormalParameters follows method identifier. * (FormalParameter()) */ -Hashtable FormalParameters() : +int FormalParameters(final ArrayList parameters) : { VariableDeclaration var; - final Hashtable parameters = new Hashtable(); + final Token token; + Token tok = PHPParser.token; + int end = tok.sourceEnd; } { try { - + tok = + {end = tok.sourceEnd;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.next.sourceStart; + errorEnd = e.currentToken.next.sourceEnd; + processParseExceptionDebug(e); } - [ var = FormalParameter() - {parameters.put(new String(var.name),var);} - ( - var = FormalParameter() - {parameters.put(new String(var.name),var);} - )* - ] + [ + var = FormalParameter() + {parameters.add(var);end = var.sourceEnd;} + ( + var = FormalParameter() + {parameters.add(var);end = var.sourceEnd;} + )* + ] try { - + token = + {end = token.sourceEnd;} } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.next.sourceStart; + errorEnd = e.currentToken.next.sourceEnd; + processParseExceptionDebug(e); } - {return parameters;} + {return end;} } /** @@ -1107,8 +1330,9 @@ VariableDeclaration FormalParameter() : Token token = null; } { - [token = ] variableDeclaration = VariableDeclarator() + [token = ] variableDeclaration = VariableDeclaratorNoSuffix() { + outlineInfo.addVariable('$'+variableDeclaration.name()); if (token != null) { variableDeclaration.setReference(true); } @@ -1116,98 +1340,105 @@ VariableDeclaration FormalParameter() : } 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);} +{final Token token;} +{ + token = {return new ConstantIdentifier(token);} +| token = {return new ConstantIdentifier(token);} +| token = {return new ConstantIdentifier(token);} +| token = {return new ConstantIdentifier(token);} +| token = {return new ConstantIdentifier(token);} +| token = {return new ConstantIdentifier(token);} +| token = {return new ConstantIdentifier(token);} +| token = {return new ConstantIdentifier(token);} +| token = {return new ConstantIdentifier(token);} } Expression Expression() : { final Expression expr; + Expression initializer = null; + int assignOperator = -1; } { - expr = PrintExpression() {return expr;} -| expr = ListExpression() {return expr;} -| LOOKAHEAD(varAssignation()) - expr = varAssignation() {return expr;} -| expr = ConditionalExpression() {return expr;} -} - -/** - * A Variable assignation. - * varName (an assign operator) any expression - */ -VarAssignation varAssignation() : -{ - String varName; - final Expression expression; - final int assignOperator; - final int pos = SimpleCharStream.getPosition(); -} -{ - varName = VariableDeclaratorId() - assignOperator = AssignmentOperator() + LOOKAHEAD(1) + expr = ConditionalExpression() + [ + assignOperator = AssignmentOperator() try { - expression = Expression() + initializer = Expression() } catch (ParseException e) { if (errorMessage != null) { throw e; } - errorMessage = "expression expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorEnd = SimpleCharStream.getPosition(); throw e; } - {return new VarAssignation(varName.toCharArray(), - expression, - assignOperator, - pos, - SimpleCharStream.getPosition());} + ] + { + if (assignOperator != -1) {// todo : change this, very very bad :( + if (expr instanceof AbstractVariable) { + return new VariableDeclaration(currentSegment, + (AbstractVariable) expr, + initializer, + expr.sourceStart, + initializer.sourceEnd); + } + String varName = expr.toStringExpression().substring(1); + return new VariableDeclaration(currentSegment, + new Variable(varName, + expr.sourceStart, + expr.sourceEnd), + expr.sourceStart, + initializer.sourceEnd); + } + return expr; + } +| expr = ExpressionWBang() {return expr;} +} + +Expression ExpressionWBang() : +{ + final Expression expr; + final Token token; +} +{ + token = expr = ExpressionWBang() + {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} +| expr = ExpressionNoBang() {return expr;} } +Expression ExpressionNoBang() : +{ + Expression expr; +} +{ + expr = ListExpression() {return expr;} +| + expr = PrintExpression() {return expr;} +} + +/** + * Any assignement operator. + * @return the assignement operator id + */ int AssignmentOperator() : {} { - {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;} + {return VariableDeclaration.EQUAL;} +| {return VariableDeclaration.STAR_EQUAL;} +| {return VariableDeclaration.SLASH_EQUAL;} +| {return VariableDeclaration.REM_EQUAL;} +| {return VariableDeclaration.PLUS_EQUAL;} +| {return VariableDeclaration.MINUS_EQUAL;} +| {return VariableDeclaration.LSHIFT_EQUAL;} +| {return VariableDeclaration.RSIGNEDSHIFT_EQUAL;} +| {return VariableDeclaration.AND_EQUAL;} +| {return VariableDeclaration.XOR_EQUAL;} +| {return VariableDeclaration.OR_EQUAL;} +| {return VariableDeclaration.DOT_EQUAL;} +| {return VariableDeclaration.TILDE_EQUAL;} } Expression ConditionalExpression() : @@ -1237,7 +1468,8 @@ Expression ConditionalOrExpression() : ( {operator = OperatorIds.OR_OR;} | <_ORL> {operator = OperatorIds.ORL;} - ) expr2 = ConditionalAndExpression() + ) + expr2 = ConditionalAndExpression() { expr = new BinaryExpression(expr,expr2,operator); } @@ -1305,6 +1537,7 @@ Expression AndExpression() : { expr = EqualityExpression() ( + LOOKAHEAD(1) expr2 = EqualityExpression() {expr = new BinaryExpression(expr,expr2,OperatorIds.AND);} )* @@ -1315,15 +1548,16 @@ Expression EqualityExpression() : { Expression expr,expr2; int operator; + Token token; } { expr = RelationalExpression() ( - ( {operator = OperatorIds.EQUAL_EQUAL;} - | {operator = OperatorIds.DIF;} - | {operator = OperatorIds.DIF;} - | {operator = OperatorIds.BANG_EQUAL_EQUAL;} - | {operator = OperatorIds.EQUAL_EQUAL_EQUAL;} + ( token = {operator = OperatorIds.EQUAL_EQUAL;} + | token = {operator = OperatorIds.DIF;} + | token = {operator = OperatorIds.DIF;} + | token = {operator = OperatorIds.BANG_EQUAL_EQUAL;} + | token = {operator = OperatorIds.EQUAL_EQUAL_EQUAL;} ) try { expr2 = RelationalExpression() @@ -1333,9 +1567,10 @@ Expression EqualityExpression() : } 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; + errorStart = token.sourceEnd +1; + errorEnd = token.sourceEnd +1; + expr2 = new ConstantIdentifier(SYNTAX_ERROR_CHAR,token.sourceEnd +1,token.sourceEnd +1); + processParseExceptionDebug(e); } { expr = new BinaryExpression(expr,expr2,operator); @@ -1387,8 +1622,10 @@ Expression AdditiveExpression() : { expr = MultiplicativeExpression() ( - ( {operator = OperatorIds.PLUS;} - | {operator = OperatorIds.MINUS;} ) + LOOKAHEAD(1) + ( {operator = OperatorIds.PLUS;} + | {operator = OperatorIds.MINUS;} + ) expr2 = MultiplicativeExpression() {expr = new BinaryExpression(expr,expr2,operator);} )* @@ -1405,10 +1642,10 @@ Expression MultiplicativeExpression() : expr = UnaryExpression() } catch (ParseException e) { if (errorMessage != null) throw e; - errorMessage = "unexpected token '"+e.currentToken.next.image+"'"; + errorMessage = "unexpected token '"+e.currentToken.next.image+'\''; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = PHPParser.token.sourceStart; + errorEnd = PHPParser.token.sourceEnd; throw e; } ( @@ -1426,42 +1663,72 @@ Expression MultiplicativeExpression() : */ Expression UnaryExpression() : { - Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Expression expr; } { - expr = UnaryExpressionNoPrefix() + /* expr = UnaryExpressionNoPrefix() //why did I had that ? {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} -| - expr = AtUnaryExpression() {return expr;} +| */ + expr = AtNotTildeUnaryExpression() {return expr;} } -Expression AtUnaryExpression() : +Expression AtNotTildeUnaryExpression() : { - Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Expression expr; + final Token token; } { - - expr = AtUnaryExpression() - {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);} + token = + expr = AtNotTildeUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);} +| + token = + expr = AtNotTildeUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.TWIDDLE,token.sourceStart);} +| + token = + expr = AtNotUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} | expr = UnaryExpressionNoPrefix() {return expr;} } +/** + * An expression prefixed (or not) by one or more @ and !. + * @return the expression + */ +Expression AtNotUnaryExpression() : +{ + final Expression expr; + final Token token; +} +{ + token = + expr = AtNotUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);} +| + token = + expr = AtNotUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} +| + expr = UnaryExpressionNoPrefix() + {return expr;} +} Expression UnaryExpressionNoPrefix() : { - Expression expr; - int operator; - final int pos = SimpleCharStream.getPosition(); + final Expression expr; + final Token token; } { - ( {operator = OperatorIds.PLUS;} - | {operator = OperatorIds.MINUS;}) - expr = UnaryExpression() - {return new PrefixedUnaryExpression(expr,operator,pos);} + token = expr = AtNotTildeUnaryExpression() {return new PrefixedUnaryExpression(expr, + OperatorIds.PLUS, + token.sourceStart);} +| + token = expr = AtNotTildeUnaryExpression() {return new PrefixedUnaryExpression(expr, + OperatorIds.MINUS, + token.sourceStart);} | expr = PreIncDecExpression() {return expr;} @@ -1475,23 +1742,24 @@ Expression PreIncDecExpression() : { final Expression expr; final int operator; - final int pos = SimpleCharStream.getPosition(); +final Token token; } { - ( {operator = OperatorIds.PLUS_PLUS;} - | {operator = OperatorIds.MINUS_MINUS;}) - expr = PrimaryExpression() - {return new PrefixedUnaryExpression(expr,operator,pos);} + ( + token = {operator = OperatorIds.PLUS_PLUS;} + | + token = {operator = OperatorIds.MINUS_MINUS;} + ) + expr = PrimaryExpression() + {return new PrefixedUnaryExpression(expr,operator,token.sourceStart);} } Expression UnaryExpressionNotPlusMinus() : { - Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Expression expr; } { - expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} -| LOOKAHEAD( (Type() | ) ) + LOOKAHEAD( (Type() | ) ) expr = CastExpression() {return expr;} | expr = PostfixExpression() {return expr;} | expr = Literal() {return expr;} @@ -1501,9 +1769,9 @@ Expression UnaryExpressionNotPlusMinus() : } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = expr.sourceEnd +1; + errorEnd = expr.sourceEnd +1; + processParseExceptionDebug(e); } {return expr;} } @@ -1512,203 +1780,279 @@ CastExpression CastExpression() : { final ConstantIdentifier type; final Expression expr; -final int pos = SimpleCharStream.getPosition(); +final Token token,token1; } { - - (type = Type() - | {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());}) + token1 = + ( + type = Type() + | + token = {type = new ConstantIdentifier(token);} + ) expr = UnaryExpression() - {return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());} + {return new CastExpression(type,expr,token1.sourceStart,expr.sourceEnd);} } Expression PostfixExpression() : { - Expression expr; + final Expression expr; int operator = -1; - final int pos = SimpleCharStream.getPosition(); + Token token = null; } { expr = PrimaryExpression() - [ {operator = OperatorIds.PLUS_PLUS;} - | {operator = OperatorIds.MINUS_MINUS;}] + [ + token = {operator = OperatorIds.PLUS_PLUS;} + | + token = {operator = OperatorIds.MINUS_MINUS;} + ] { if (operator == -1) { return expr; } - return new PostfixedUnaryExpression(expr,operator,pos); + return new PostfixedUnaryExpression(expr,operator,token.sourceEnd); } } Expression PrimaryExpression() : { - final Token identifier; Expression expr; - final int pos = SimpleCharStream.getPosition(); + Token token = null; } { - LOOKAHEAD(2) - identifier = expr = ClassIdentifier() - {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(), - pos, - SimpleCharStream.getPosition()), - expr, - ClassAccess.STATIC);} - (expr = PrimarySuffix(expr))* - {return expr;} -| - expr = PrimaryPrefix() - (expr = PrimarySuffix(expr))* + [token = ] expr = refPrimaryExpression(token) {return expr;} | expr = ArrayDeclarator() {return expr;} } -ArrayInitializer ArrayDeclarator() : -{ - final ArrayVariableDeclaration[] vars; - final int pos = SimpleCharStream.getPosition(); -} -{ - vars = ArrayInitializer() - {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());} -} - -Expression PrimaryPrefix() : -{ - final Expression expr; - final Token token; - final String var; - final int pos = SimpleCharStream.getPosition(); -} -{ - token = {return new ConstantIdentifier(token.image.toCharArray(), - pos, - SimpleCharStream.getPosition());} -| expr = ClassIdentifier() {return new PrefixedUnaryExpression(expr, - OperatorIds.NEW, - pos);} -| var = VariableDeclaratorId() {return new ConstantIdentifier(var.toCharArray(), - pos, - SimpleCharStream.getPosition());} -} - -PrefixedUnaryExpression classInstantiation() : +Expression refPrimaryExpression(final Token reference) : { Expression expr; - final StringBuffer buff; - final int pos = SimpleCharStream.getPosition(); + Expression expr2 = null; + final Token identifier; } { - expr = ClassIdentifier() - [ - {buff = new StringBuffer(expr.toStringExpression());} - expr = PrimaryExpression() - {buff.append(expr.toStringExpression()); - expr = new ConstantIdentifier(buff.toString().toCharArray(), - pos, - SimpleCharStream.getPosition());} - ] - {return new PrefixedUnaryExpression(expr, - OperatorIds.NEW, - pos);} + identifier = + { + expr = new ConstantIdentifier(identifier); + } + ( + expr2 = ClassIdentifier() + {expr = new ClassAccess(expr, + expr2, + ClassAccess.STATIC);} + )* + [ expr2 = Arguments(expr) ] + { + if (expr2 == null) { + if (reference != null) { + ParseException e = generateParseException(); + errorMessage = "you cannot use a constant by reference"; + errorLevel = ERROR; + errorStart = reference.sourceStart; + errorEnd = reference.sourceEnd; + processParseExceptionDebug(e); + } + return expr; + } + return expr2; + } +| + expr = VariableDeclaratorId() //todo use the reference parameter ... + [ expr = Arguments(expr) ] + {return expr;} +| + token = + expr = ClassIdentifier() + { + int start; + if (reference == null) { + start = token.sourceStart; + } else { + start = reference.sourceStart; + } + expr = new ClassInstantiation(expr, + reference != null, + start); + } + [ expr = Arguments(expr) ] + {return expr;} } -ConstantIdentifier ClassIdentifier(): +/** + * An array declarator. + * array(vars) + * @return an array + */ +ArrayInitializer ArrayDeclarator() : { - final String expr; + final ArrayVariableDeclaration[] vars; final Token token; - final int pos = SimpleCharStream.getPosition(); } { - token = {return new ConstantIdentifier(token.image.toCharArray(), - pos, - SimpleCharStream.getPosition());} -| expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(), - pos, - SimpleCharStream.getPosition());} + token = vars = ArrayInitializer() + {return new ArrayInitializer(vars, + token.sourceStart, + PHPParser.token.sourceEnd);} } -AbstractSuffixExpression PrimarySuffix(Expression prefix) : +Expression ClassIdentifier(): { - final AbstractSuffixExpression expr; + final Expression expr; + final Token token; } { - expr = Arguments(prefix) {return expr;} -| expr = VariableSuffix(prefix) {return expr;} + token = {return new ConstantIdentifier(token);} +| expr = Type() {return expr;} +| expr = VariableDeclaratorId() {return expr;} } -AbstractSuffixExpression VariableSuffix(Expression prefix) : +/** + * Used by Variabledeclaratorid and primarysuffix + */ +AbstractVariable VariableSuffix(final AbstractVariable prefix) : { - String expr = null; - final int pos = SimpleCharStream.getPosition(); Expression expression = null; + final Token classAccessToken,lbrace,rbrace; + Token token; + int pos; } { - + classAccessToken = try { - expr = VariableName() + ( + lbrace = expression = Expression() rbrace = + { + expression = new Variable(expression, + lbrace.sourceStart, + rbrace.sourceEnd); + } + | + token = + {expression = new ConstantIdentifier(token.image,token.sourceStart,token.sourceEnd);} + | + expression = Variable() + ) } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = classAccessToken.sourceEnd +1; + errorEnd = classAccessToken.sourceEnd +1; + processParseExceptionDebug(e); } {return new ClassAccess(prefix, - new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()), + expression, ClassAccess.NORMAL);} | - [ expression = Expression() | expression = Type() ] //Not good + token = {pos = token.sourceEnd+1;} + [ expression = Expression() {pos = expression.sourceEnd+1;} + | expression = Type() {pos = expression.sourceEnd+1;}] //Not good try { - + token = + {pos = token.sourceEnd;} } catch (ParseException e) { errorMessage = "']' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } - {return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());} + {return new ArrayDeclarator(prefix,expression,pos);} +| + token = {pos = token.sourceEnd+1;} + [ expression = Expression() {pos = expression.sourceEnd+1;} + | expression = Type() {pos = expression.sourceEnd+1;}] //Not good + try { + token = + {pos = token.sourceEnd;} + } catch (ParseException e) { + errorMessage = "']' expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } + {return new ArrayDeclarator(prefix,expression,pos);}//todo : check braces here } Literal Literal() : { final Token token; - final int pos; + StringLiteral literal; +} +{ + token = {return new NumberLiteral(token);} +| token = {return new NumberLiteral(token);} +| token = {return new StringLiteral(token);} +| token = {return new TrueLiteral(token);} +| token = {return new FalseLiteral(token);} +| token = {return new NullLiteral(token);} +| literal = evaluableString() {return literal;} +} + +StringLiteral evaluableString() : +{ + ArrayList list = new ArrayList(); + Token start,end; + Token token,lbrace,rbrace; + AbstractVariable var; + Expression expr; } { - 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);} + start = + ( + + ( + token = {list.add(new Variable(token.image, + token.sourceStart, + token.sourceEnd));} + | + lbrace = + token = + {list.add(new Variable(token.image, + token.sourceStart, + token.sourceEnd));} + rbrace = + ) + )* + end = + { + AbstractVariable[] vars = new AbstractVariable[list.size()]; + list.toArray(vars); + return new StringLiteral(SimpleCharStream.currentBuffer.substring(start.sourceEnd,end.sourceStart), + start.sourceStart, + end.sourceEnd, + vars); + } } -FunctionCall Arguments(Expression func) : +FunctionCall Arguments(final Expression func) : { Expression[] args = null; +final Token token,lparen; } { - [ args = ArgumentList() ] + lparen = [ args = ArgumentList() ] try { - + token = + {return new FunctionCall(func,args,token.sourceEnd);} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + if (args == null) { + errorStart = lparen.sourceEnd+1; + errorEnd = lparen.sourceEnd+2; + } else { + errorStart = args[args.length-1].sourceEnd+1; + errorEnd = args[args.length-1].sourceEnd+2; + } + processParseExceptionDebug(e); } - {return new FunctionCall(func,args,SimpleCharStream.getPosition());} + { + int sourceEnd = (args == null && args.length != 0) ? lparen.sourceEnd+1 : args[args.length-1].sourceEnd; + return new FunctionCall(func,args,sourceEnd);} } /** @@ -1720,30 +2064,34 @@ Expression[] ArgumentList() : { Expression arg; final ArrayList list = new ArrayList(); +int pos; +Token token; } { arg = Expression() - {list.add(arg);} - ( + {list.add(arg);pos = arg.sourceEnd;} + ( token = {pos = token.sourceEnd;} try { arg = Expression() - {list.add(arg);} + {list.add(arg); + pos = arg.sourceEnd;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos+1; + errorEnd = pos+1; + processParseException(e); } )* { - Expression[] arguments = new Expression[list.size()]; + final Expression[] arguments = new Expression[list.size()]; list.toArray(arguments); return arguments;} } /** * A Statement without break. + * @return a statement */ Statement StatementNoBreak() : { @@ -1752,34 +2100,11 @@ Statement StatementNoBreak() : } { LOOKAHEAD(2) - statement = Expression() - try { - - } catch (ParseException e) { - if (e.currentToken.next.kind != 4) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; - errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; - } - } - {return statement;} -| LOOKAHEAD(2) - statement = LabeledStatement() {return statement;} -| statement = Block() {return statement;} -| statement = EmptyStatement() {return statement;} -| statement = StatementExpression() - try { - - } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; - errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; - } - {return statement;} + statement = expressionStatement() {return statement;} +| LOOKAHEAD(1) + statement = LabeledStatement() {return statement;} +| statement = Block() {return statement;} +| statement = EmptyStatement() {return statement;} | statement = SwitchStatement() {return statement;} | statement = IfStatement() {return statement;} | statement = WhileStatement() {return statement;} @@ -1792,10 +2117,107 @@ Statement StatementNoBreak() : | [token=] statement = IncludeStatement() {if (token != null) { ((InclusionStatement)statement).silent = true; + statement.sourceStart = token.sourceStart; } return statement;} | statement = StaticStatement() {return statement;} | statement = GlobalStatement() {return statement;} +| statement = defineStatement() {currentSegment.add((Outlineable)statement);return statement;} +} + +/** + * A statement expression. + * expression ; + * @return an expression + */ +Statement expressionStatement() : +{ + final Statement statement; + final Token token; +} +{ + statement = Expression() + try { + token = + {statement.sourceEnd = token.sourceEnd;} + } catch (ParseException e) { + if (e.currentToken.next.kind != PHPParserConstants.PHPEND) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; + errorLevel = ERROR; + errorStart = statement.sourceEnd+1; + errorEnd = statement.sourceEnd+1; + processParseExceptionDebug(e); + } + } + {return statement;} +} + +Define defineStatement() : +{ + Expression defineName,defineValue; + final Token defineToken; + Token token; + int pos; +} +{ + defineToken = {pos = defineToken.sourceEnd+1;} + try { + token = + {pos = token.sourceEnd+1;} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } + try { + defineName = Expression() + {pos = defineName.sourceEnd+1;} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + defineName = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos); + } + try { + token = + {pos = defineName.sourceEnd+1;} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } + try { + defineValue = Expression() + {pos = defineValue.sourceEnd+1;} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + defineValue = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos); + } + try { + token = + {pos = token.sourceEnd+1;} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } + {return new Define(currentSegment, + defineName, + defineValue, + defineToken.sourceStart, + pos);} } /** @@ -1816,24 +2238,31 @@ Statement Statement() : HTMLBlock htmlBlock() : { final int startIndex = nodePtr; - AstNode[] blockNodes; - int nbNodes; + final AstNode[] blockNodes; + final int nbNodes; + final Token phpEnd; } { - (phpEchoBlock())* + phpEnd = + {htmlStart = phpEnd.sourceEnd;} + (phpEchoBlock())* try { ( | ) + {PHPParser.createNewHTMLCode();} } catch (ParseException e) { - errorMessage = "End of file unexpected, ' {keyword = InclusionStatement.REQUIRE;} - | {keyword = InclusionStatement.REQUIRE_ONCE;} - | {keyword = InclusionStatement.INCLUDE;} - | {keyword = InclusionStatement.INCLUDE_ONCE;}) + ( token = {keyword = InclusionStatement.REQUIRE;pos=token.sourceEnd;} + | token = {keyword = InclusionStatement.REQUIRE_ONCE;pos=token.sourceEnd;} + | token = {keyword = InclusionStatement.INCLUDE;pos=token.sourceEnd;} + | token = {keyword = InclusionStatement.INCLUDE_ONCE;pos=token.sourceEnd;}) try { expr = Expression() + {pos = expr.sourceEnd;} } catch (ParseException e) { if (errorMessage != null) { throw 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; - } - {inclusionStatement = new InclusionStatement(currentSegment, - keyword, - expr, - pos); - currentSegment.add(inclusionStatement); + errorStart = e.currentToken.next.sourceStart; + errorEnd = e.currentToken.next.sourceEnd; + expr = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos); + processParseExceptionDebug(e); } try { - + token2 = + {pos=token2.sourceEnd;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.next.sourceStart; + errorEnd = e.currentToken.next.sourceEnd; + processParseExceptionDebug(e); + } + { + inclusionStatement = new InclusionStatement(currentSegment, + keyword, + expr, + token.sourceStart, + pos); + currentSegment.add(inclusionStatement); + return inclusionStatement; } - {return inclusionStatement;} } PrintExpression PrintExpression() : { final Expression expr; - final int pos = SimpleCharStream.getPosition(); + final Token printToken; } { - expr = Expression() {return new PrintExpression(expr,pos,SimpleCharStream.getPosition());} + token = expr = Expression() + {return new PrintExpression(expr,token.sourceStart,expr.sourceEnd);} } ListExpression ListExpression() : { - String expr = null; - Expression expression = null; - ArrayList list = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); + Expression expr = null; + final Expression expression; + final ArrayList list = new ArrayList(); + int pos; + final Token listToken, rParen; + Token token; } { - + listToken = {pos = listToken.sourceEnd;} try { - + token = {pos = token.sourceEnd;} } 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; - throw e; + errorStart = listToken.sourceEnd+1; + errorEnd = listToken.sourceEnd+1; + processParseExceptionDebug(e); } [ expr = VariableDeclaratorId() - {list.add(expr);} + {list.add(expr);pos = expr.sourceEnd;} ] {if (expr == null) list.add(null);} ( try { - + token = + {pos = token.sourceEnd;} } 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; - throw e; + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } - expr = VariableDeclaratorId() - {list.add(expr);} + [expr = VariableDeclaratorId() {list.add(expr);pos = expr.sourceEnd;}] )* try { - + rParen = + {pos = rParen.sourceEnd;} } 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; - throw e; + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } [ expression = Expression() { - String[] strings = new String[list.size()]; - list.toArray(strings); - return new ListExpression(strings, + final AbstractVariable[] vars = new AbstractVariable[list.size()]; + list.toArray(vars); + return new ListExpression(vars, expression, - pos, - SimpleCharStream.getPosition());} + listToken.sourceStart, + expression.sourceEnd);} ] { - String[] strings = new String[list.size()]; - list.toArray(strings); - return new ListExpression(strings,pos,SimpleCharStream.getPosition());} + final AbstractVariable[] vars = new AbstractVariable[list.size()]; + list.toArray(vars); + return new ListExpression(vars,listToken.sourceStart,pos);} } /** @@ -1960,102 +2399,112 @@ EchoStatement EchoStatement() : { final ArrayList expressions = new ArrayList(); Expression expr; - final int pos = SimpleCharStream.getPosition(); + Token token; + Token token2 = null; } { - expr = Expression() + token = expr = Expression() {expressions.add(expr);} ( expr = Expression() {expressions.add(expr);} )* try { - - { - Expression[] exprs = new Expression[expressions.size()]; - expressions.toArray(exprs); - return new EchoStatement(exprs,pos);} + token2 = } catch (ParseException e) { if (e.currentToken.next.kind != 4) { errorMessage = "';' expected after 'echo' statement"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceEnd; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } } + { + final Expression[] exprs = new Expression[expressions.size()]; + expressions.toArray(exprs); + if (token2 == null) { + return new EchoStatement(exprs,token.sourceStart, exprs[exprs.length-1].sourceEnd); + } + return new EchoStatement(exprs,token.sourceStart, token2.sourceEnd); + } } GlobalStatement GlobalStatement() : { - final int pos = SimpleCharStream.getPosition(); - String expr; - ArrayList vars = new ArrayList(); - GlobalStatement global; + Variable expr; + final ArrayList vars = new ArrayList(); + final GlobalStatement global; + final Token token, token2; + int pos; } { - - expr = VariableDeclaratorId() - {vars.add(expr);} + token = + expr = Variable() + {vars.add(expr);pos = expr.sourceEnd+1;} ( - expr = VariableDeclaratorId() - {vars.add(expr);} + expr = Variable() + {vars.add(expr);pos = expr.sourceEnd+1;} )* try { - - { - String[] strings = new String[vars.size()]; - vars.toArray(strings); - global = new GlobalStatement(currentSegment, - strings, - pos, - SimpleCharStream.getPosition()); - currentSegment.add(global); - return global;} + token2 = + {pos = token2.sourceEnd+1;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } + { + final Variable[] variables = new Variable[vars.size()]; + vars.toArray(variables); + global = new GlobalStatement(currentSegment, + variables, + token.sourceStart, + pos); + currentSegment.add(global); + return global;} } StaticStatement StaticStatement() : { - final int pos = SimpleCharStream.getPosition(); final ArrayList vars = new ArrayList(); VariableDeclaration expr; + final Token token, token2; + int pos; } { - expr = VariableDeclarator() {vars.add(new String(expr.name));} - ( expr = VariableDeclarator() {vars.add(new String(expr.name));})* + token = expr = VariableDeclarator() {vars.add(expr);pos = expr.sourceEnd+1;} + ( + expr = VariableDeclarator() {vars.add(expr);pos = expr.sourceEnd+1;} + )* try { - - { - String[] strings = new String[vars.size()]; - vars.toArray(strings); - return new StaticStatement(strings, - pos, - SimpleCharStream.getPosition());} + token2 = + {pos = token2.sourceEnd+1;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseException(e); } + { + final VariableDeclaration[] variables = new VariableDeclaration[vars.size()]; + vars.toArray(variables); + return new StaticStatement(variables, + token.sourceStart, + pos);} } LabeledStatement LabeledStatement() : { - final int pos = SimpleCharStream.getPosition(); final Token label; final Statement statement; } { label = statement = Statement() - {return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());} + {return new LabeledStatement(label.image,statement,label.sourceStart,statement.sourceEnd);} } /** @@ -2067,35 +2516,46 @@ LabeledStatement LabeledStatement() : */ Block Block() : { - final int pos = SimpleCharStream.getPosition(); final ArrayList list = new ArrayList(); Statement statement; + final Token token, token2; + int pos,start; } { try { - + token = + {pos = token.sourceEnd+1;start=token.sourceStart;} } catch (ParseException e) { errorMessage = "'{' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; - } - ( statement = BlockStatement() {list.add(statement);} - | statement = htmlBlock() {list.add(statement);})* + pos = PHPParser.token.sourceEnd+1; + start=pos; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } + ( statement = BlockStatement() {list.add(statement);pos = statement.sourceEnd+1;} + | statement = htmlBlock() {if (statement != null) { + list.add(statement); + pos = statement.sourceEnd+1; + } + pos = PHPParser.token.sourceEnd+1; + } + )* try { - + token2 = + {pos = token2.sourceEnd+1;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } { - Statement[] statements = new Statement[list.size()]; + final Statement[] statements = new Statement[list.size()]; list.toArray(statements); - return new Block(statements,pos,SimpleCharStream.getPosition());} + return new Block(statements,start,pos);} } Statement BlockStatement() : @@ -2103,10 +2563,20 @@ Statement BlockStatement() : final Statement statement; } { - statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement); - return statement;} + try { + statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement); + return statement;} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.image +"', a statement was expected"; + errorLevel = ERROR; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + throw e; + } | statement = ClassDeclaration() {return statement;} | statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement); + currentSegment.add((MethodDeclaration) statement); + ((MethodDeclaration) statement).analyzeCode(); return statement;} } @@ -2120,141 +2590,162 @@ Statement BlockStatementNoBreak() : { statement = StatementNoBreak() {return statement;} | statement = ClassDeclaration() {return statement;} -| statement = MethodDeclaration() {return statement;} +| statement = MethodDeclaration() {currentSegment.add((MethodDeclaration) statement); + ((MethodDeclaration) statement).analyzeCode(); + return statement;} } -VariableDeclaration[] LocalVariableDeclaration() : +/** + * used only by ForInit() + */ +Expression[] LocalVariableDeclaration() : { final ArrayList list = new ArrayList(); - VariableDeclaration var; + Expression var; } { - var = LocalVariableDeclarator() + var = Expression() {list.add(var);} - ( var = LocalVariableDeclarator() {list.add(var);})* + ( var = Expression() {list.add(var);})* { - VariableDeclaration[] vars = new VariableDeclaration[list.size()]; + final Expression[] vars = new Expression[list.size()]; list.toArray(vars); - return vars;} + return vars; + } } +/** + * used only by LocalVariableDeclaration(). + */ VariableDeclaration LocalVariableDeclarator() : { - final String varName; + final Variable varName; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); } { - varName = VariableDeclaratorId() [ initializer = Expression() ] + varName = Variable() [ initializer = Expression() ] { if (initializer == null) { return new VariableDeclaration(currentSegment, - varName.toCharArray(), - pos, - SimpleCharStream.getPosition()); + varName, + varName.sourceStart, + varName.sourceEnd); } return new VariableDeclaration(currentSegment, - varName.toCharArray(), - initializer, - pos); + varName, + initializer, + VariableDeclaration.EQUAL, + varName.sourceStart); } } EmptyStatement EmptyStatement() : { - final int pos; + final Token token; } { - - {pos = SimpleCharStream.getPosition(); - return new EmptyStatement(pos-1,pos);} + token = + {return new EmptyStatement(token.sourceStart,token.sourceEnd);} } -Statement StatementExpression() : +/** + * used only by StatementExpressionList() which is used only by ForInit() and ForStatement() + */ +Expression StatementExpression() : { - Expression expr,expr2; - int operator; + final Expression expr; + final Token operator; } { expr = PreIncDecExpression() {return expr;} | 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);} + [ operator = {return new PostfixedUnaryExpression(expr, + OperatorIds.PLUS_PLUS, + operator.sourceEnd);} + | operator = {return new PostfixedUnaryExpression(expr, + OperatorIds.MINUS_MINUS, + operator.sourceEnd);} ] {return expr;} } SwitchStatement SwitchStatement() : { - final Expression variable; + Expression variable; final AbstractCase[] cases; - final int pos = SimpleCharStream.getPosition(); + final Token switchToken,lparenToken,rparenToken; + int pos; } { - + switchToken = {pos = switchToken.sourceEnd+1;} try { - + lparenToken = + {pos = lparenToken.sourceEnd+1;} } catch (ParseException e) { errorMessage = "'(' expected after 'switch'"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } try { - variable = Expression() + variable = Expression() {pos = variable.sourceEnd+1;} } catch (ParseException e) { if (errorMessage != null) { throw e; } errorMessage = "expression expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + variable = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos); } try { - + rparenToken = {pos = rparenToken.sourceEnd+1;} } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } - (cases = switchStatementBrace() | cases = switchStatementColon(pos, pos + 6)) - {return new SwitchStatement(variable,cases,pos,SimpleCharStream.getPosition());} + ( cases = switchStatementBrace() + | cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd)) + {return new SwitchStatement(variable, + cases, + switchToken.sourceStart, + PHPParser.token.sourceEnd);} } AbstractCase[] switchStatementBrace() : { AbstractCase cas; final ArrayList cases = new ArrayList(); + Token token; + int pos; } { - - ( cas = switchLabel0() {cases.add(cas);})* + token = {pos = token.sourceEnd;} + ( cas = switchLabel0() {cases.add(cas);pos = cas.sourceEnd;})* try { - - { - AbstractCase[] abcase = new AbstractCase[cases.size()]; - cases.toArray(abcase); - return abcase;} + token = + {pos = token.sourceEnd;} } catch (ParseException e) { errorMessage = "'}' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); + } + { + final AbstractCase[] abcase = new AbstractCase[cases.size()]; + cases.toArray(abcase); + return abcase; } } + /** * A Switch statement with : ... endswitch; * @param start the begin offset of the switch @@ -2264,9 +2755,11 @@ AbstractCase[] switchStatementColon(final int start, final int end) : { AbstractCase cas; final ArrayList cases = new ArrayList(); + Token token; + int pos; } { - + token = {pos = token.sourceEnd;} {try { setMarker(fileToParse, "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;", @@ -2277,28 +2770,29 @@ AbstractCase[] switchStatementColon(final int start, final int end) : } catch (CoreException e) { PHPeclipsePlugin.log(e); }} - ( cas = switchLabel0() {cases.add(cas);})* + ( cas = switchLabel0() {cases.add(cas);pos = cas.sourceEnd;})* try { - + token = {pos = token.sourceEnd;} } catch (ParseException e) { errorMessage = "'endswitch' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); } try { - - { - AbstractCase[] abcase = new AbstractCase[cases.size()]; - cases.toArray(abcase); - return abcase;} + token = {pos = token.sourceEnd;} } catch (ParseException e) { errorMessage = "';' expected after 'endswitch' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos+1; + errorEnd = pos+1; + processParseExceptionDebug(e); + } + { + final AbstractCase[] abcase = new AbstractCase[cases.size()]; + cases.toArray(abcase); + return abcase; } } @@ -2307,20 +2801,29 @@ AbstractCase switchLabel0() : final Expression expr; Statement statement; final ArrayList stmts = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); + final Token token = PHPParser.token; + final int start = PHPParser.token.next.sourceStart; } { expr = SwitchLabel() ( statement = BlockStatementNoBreak() {stmts.add(statement);} - | statement = htmlBlock() {stmts.add(statement);})* - [ statement = BreakStatement() {stmts.add(statement);}] + | statement = htmlBlock() {if (statement != null) {stmts.add(statement);}} + | statement = BreakStatement() {stmts.add(statement);})* + //[ statement = BreakStatement() {stmts.add(statement);}] { - Statement[] stmtsArray = new Statement[stmts.size()]; - stmts.toArray(stmtsArray); - if (expr == null) {//it's a default - return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition()); + final int listSize = stmts.size(); + final Statement[] stmtsArray = new Statement[listSize]; + stmts.toArray(stmtsArray); + if (expr == null) {//it's a default + final int end = PHPParser.token.next.sourceStart; + return new DefaultCase(stmtsArray,start,end); + } + if (listSize != 0) { + return new Case(expr,stmtsArray,expr.sourceStart,stmtsArray[listSize-1].sourceEnd); + } else { + return new Case(expr,stmtsArray,expr.sourceStart,expr.sourceEnd); + } } - return new Case(expr,stmtsArray,pos,SimpleCharStream.getPosition());} } /** @@ -2341,61 +2844,65 @@ Expression SwitchLabel() : if (errorMessage != null) throw e; errorMessage = "expression expected after 'case' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = token.sourceEnd +1; + errorEnd = token.sourceEnd +1; throw e; } try { - - {return expr;} + token = } catch (ParseException e) { errorMessage = "':' expected after case expression"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = expr.sourceEnd+1; + errorEnd = expr.sourceEnd+1; + processParseExceptionDebug(e); } + {return expr;} | token = <_DEFAULT> try { - {return null;} } catch (ParseException e) { errorMessage = "':' expected after 'default' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = token.sourceEnd+1; + errorEnd = token.sourceEnd+1; + processParseExceptionDebug(e); } + {return null;} } Break BreakStatement() : { Expression expression = null; - final int start = SimpleCharStream.getPosition(); + final Token token, token2; + int pos; } { - [ expression = Expression() ] + token = {pos = token.sourceEnd+1;} + [ expression = Expression() {pos = expression.sourceEnd+1;}] try { - + token2 = + {pos = token2.sourceEnd;} } 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; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } - {return new Break(expression, start, SimpleCharStream.getPosition());} + {return new Break(expression, token.sourceStart, pos);} } IfStatement IfStatement() : { - final int pos = SimpleCharStream.getPosition(); - Expression condition; - IfStatement ifStatement; + final Expression condition; + final IfStatement ifStatement; + Token token; } { - condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2) + token = condition = Condition("if") + ifStatement = IfStatement0(condition,token.sourceStart,token.sourceEnd) {return ifStatement;} } @@ -2410,41 +2917,41 @@ Expression Condition(final String keyword) : } catch (ParseException e) { errorMessage = "'(' expected after " + keyword + " keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length(); - errorEnd = errorStart +1; - processParseException(e); + errorStart = PHPParser.token.sourceEnd + 1; + errorEnd = PHPParser.token.sourceEnd + 1; + processParseExceptionDebug(e); } condition = Expression() try { - {return condition;} } catch (ParseException e) { errorMessage = "')' expected after " + keyword + " keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = condition.sourceEnd+1; + errorEnd = condition.sourceEnd+1; + processParseExceptionDebug(e); } + {return condition;} } -IfStatement IfStatement0(Expression condition, final int start,final int end) : +IfStatement IfStatement0(final Expression condition, final int start,final int end) : { Statement statement; - Statement stmt; + final Statement stmt; final Statement[] statementsArray; ElseIf elseifStatement; Else elseStatement = null; - ArrayList stmts; + final ArrayList stmts; final ArrayList elseIfList = new ArrayList(); - ElseIf[] elseIfs; + final ElseIf[] elseIfs; int pos = SimpleCharStream.getPosition(); - int endStatements; + final int endStatements; } { {stmts = new ArrayList();} ( statement = Statement() {stmts.add(statement);} - | statement = htmlBlock() {stmts.add(statement);})* + | statement = htmlBlock() {if (statement != null) {stmts.add(statement);}})* {endStatements = SimpleCharStream.getPosition();} (elseifStatement = ElseIfStatementColon() {elseIfList.add(elseifStatement);})* [elseStatement = ElseStatementColon()] @@ -2464,8 +2971,8 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) : } catch (ParseException e) { errorMessage = "'endif' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; throw e; } try { @@ -2473,8 +2980,8 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) : } catch (ParseException e) { errorMessage = "';' expected after 'endif' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; throw e; } { @@ -2492,10 +2999,10 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) : stmts.toArray(statementsArray); return new IfStatement(condition, new Block(statementsArray,pos,endStatements), - elseIfs, - elseStatement, - pos, - SimpleCharStream.getPosition()); + elseIfs, + elseStatement, + pos, + SimpleCharStream.getPosition()); } } @@ -2514,8 +3021,8 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) : } errorMessage = "unexpected token '"+e.currentToken.next.image+"', a statement was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; throw e; } ] @@ -2532,62 +3039,64 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) : ElseIf ElseIfStatementColon() : { - Expression condition; + final Expression condition; Statement statement; final ArrayList list = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); + final Token elseifToken; } { - condition = Condition("elseif") + elseifToken = condition = Condition("elseif") ( statement = Statement() {list.add(statement);} - | statement = htmlBlock() {list.add(statement);})* + | statement = htmlBlock() {if (statement != null) {list.add(statement);}})* { - Statement[] stmtsArray = new Statement[list.size()]; + final int sizeList = list.size(); + final Statement[] stmtsArray = new Statement[sizeList]; list.toArray(stmtsArray); - return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());} + return new ElseIf(condition,stmtsArray , + elseifToken.sourceStart, + stmtsArray[sizeList-1].sourceEnd);} } Else ElseStatementColon() : { Statement statement; final ArrayList list = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); + final Token elseToken; } { - ( statement = Statement() {list.add(statement);} - | statement = htmlBlock() {list.add(statement);})* + elseToken = ( statement = Statement() {list.add(statement);} + | statement = htmlBlock() {if (statement != null) {list.add(statement);}})* { - Statement[] stmtsArray = new Statement[list.size()]; + final int sizeList = list.size(); + final Statement[] stmtsArray = new Statement[sizeList]; list.toArray(stmtsArray); - return new Else(stmtsArray,pos,SimpleCharStream.getPosition());} + return new Else(stmtsArray,elseToken.sourceStart,stmtsArray[sizeList-1].sourceEnd);} } ElseIf ElseIfStatement() : { - Expression condition; - Statement statement; - final ArrayList list = new ArrayList(); - final int pos = SimpleCharStream.getPosition(); + final Expression condition; + //final Statement statement; + final Token elseifToken; + final Statement[] statement = new Statement[1]; } { - condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/} + elseifToken = condition = Condition("elseif") statement[0] = Statement() { - Statement[] stmtsArray = new Statement[list.size()]; - list.toArray(stmtsArray); - return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());} + return new ElseIf(condition,statement,elseifToken.sourceStart,statement[0].sourceEnd);} } WhileStatement WhileStatement() : { final Expression condition; final Statement action; - final int pos = SimpleCharStream.getPosition(); + final Token whileToken; } { - + whileToken = condition = Condition("while") - action = WhileStatement0(pos,pos + 5) - {return new WhileStatement(condition,action,pos,SimpleCharStream.getPosition());} + action = WhileStatement0(whileToken.sourceStart,whileToken.sourceEnd) + {return new WhileStatement(condition,action,whileToken.sourceStart,action.sourceEnd);} } Statement WhileStatement0(final int start, final int end) : @@ -2613,21 +3122,21 @@ Statement WhileStatement0(final int start, final int end) : } catch (ParseException e) { errorMessage = "'endwhile' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; throw e; } try { { - Statement[] stmtsArray = new Statement[stmts.size()]; + final Statement[] stmtsArray = new Statement[stmts.size()]; stmts.toArray(stmtsArray); return new Block(stmtsArray,pos,SimpleCharStream.getPosition());} } catch (ParseException e) { errorMessage = "';' expected after 'endwhile' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; throw e; } | @@ -2639,104 +3148,126 @@ DoStatement DoStatement() : { final Statement action; final Expression condition; - final int pos = SimpleCharStream.getPosition(); + final Token token; + Token token2 = null; } { - action = Statement() condition = Condition("while") + token = action = Statement() condition = Condition("while") try { - - {return new DoStatement(condition,action,pos,SimpleCharStream.getPosition());} + token2 = } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = condition.sourceEnd+1; + errorEnd = condition.sourceEnd+1; + processParseExceptionDebug(e); + } + { + if (token2 == null) { + return new DoStatement(condition,action,token.sourceStart,condition.sourceEnd); + } + return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd); } } ForeachStatement ForeachStatement() : { - Statement statement; - Expression expression; - final int pos = SimpleCharStream.getPosition(); - ArrayVariableDeclaration variable; + Statement statement = null; + Expression expression = null; + ArrayVariableDeclaration variable = null; + Token foreachToken; + Token lparenToken = null; + Token asToken = null; + Token rparenToken = null; + int pos; } { - - try { - + foreachToken = + try { + lparenToken = + {pos = lparenToken.sourceEnd+1;} } catch (ParseException e) { errorMessage = "'(' expected after 'foreach' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); + {pos = foreachToken.sourceEnd+1;} } try { expression = Expression() + {pos = expression.sourceEnd+1;} } catch (ParseException e) { errorMessage = "variable expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } try { - + asToken = + {pos = asToken.sourceEnd+1;} } catch (ParseException e) { errorMessage = "'as' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } try { variable = ArrayVariable() + {pos = variable.sourceEnd+1;} } catch (ParseException e) { + if (errorMessage != null) throw e; errorMessage = "variable expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } try { - + rparenToken = + {pos = rparenToken.sourceEnd+1;} } catch (ParseException e) { errorMessage = "')' expected after 'foreach' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } try { statement = Statement() + {pos = statement.sourceEnd+1;} } 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; + errorStart = e.currentToken.sourceStart; + errorEnd = e.currentToken.sourceEnd; + processParseExceptionDebug(e); } - {return new ForeachStatement(expression, + { + return new ForeachStatement(expression, variable, statement, - pos, - SimpleCharStream.getPosition());} + foreachToken.sourceStart, + pos);} } +/** + * a for declaration. + * @return a node representing the for statement + */ ForStatement ForStatement() : { -final Token token; -final int pos = SimpleCharStream.getPosition(); -Statement[] initializations = null; +final Token token,tokenEndFor,token2,tokenColon; +int pos; +Expression[] initializations = null; Expression condition = null; -Statement[] increments = null; +Expression[] increments = null; Statement action; final ArrayList list = new ArrayList(); -final int startBlock, endBlock; } { token = @@ -2745,119 +3276,161 @@ final int startBlock, endBlock; } catch (ParseException e) { errorMessage = "'(' expected after 'for' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = token.sourceEnd; + errorEnd = token.sourceEnd +1; + processParseExceptionDebug(e); } [ initializations = ForInit() ] [ condition = Expression() ] [ increments = StatementExpressionList() ] ( action = Statement() - {return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());} + {return new ForStatement(initializations, + condition, + increments, + action, + token.sourceStart, + action.sourceEnd);} | - - {startBlock = SimpleCharStream.getPosition();} - (action = Statement() {list.add(action);})* + tokenColon = {pos = tokenColon.sourceEnd+1;} + (action = Statement() {list.add(action);pos = action.sourceEnd+1;})* { try { setMarker(fileToParse, "Ugly syntax detected, you should for () {...} instead of for (): ... endfor;", - pos, - pos+token.image.length(), + token.sourceStart, + token.sourceEnd, INFO, "Line " + token.beginLine); } catch (CoreException e) { PHPeclipsePlugin.log(e); } } - {endBlock = SimpleCharStream.getPosition();} try { - + tokenEndFor = + {pos = tokenEndFor.sourceEnd+1;} } catch (ParseException e) { errorMessage = "'endfor' expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } try { - - { - Statement[] stmtsArray = new Statement[list.size()]; - list.toArray(stmtsArray); - return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());} + token2 = + {pos = token2.sourceEnd+1;} } catch (ParseException e) { errorMessage = "';' expected after 'endfor' keyword"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); } + { + final Statement[] stmtsArray = new Statement[list.size()]; + list.toArray(stmtsArray); + return new ForStatement(initializations, + condition, + increments, + new Block(stmtsArray, + stmtsArray[0].sourceStart, + stmtsArray[stmtsArray.length-1].sourceEnd), + token.sourceStart, + pos);} ) } -Statement[] ForInit() : +Expression[] ForInit() : { - Statement[] statements; + final Expression[] exprs; } { LOOKAHEAD(LocalVariableDeclaration()) - statements = LocalVariableDeclaration() - {return statements;} + exprs = LocalVariableDeclaration() + {return exprs;} | - statements = StatementExpressionList() - {return statements;} + exprs = StatementExpressionList() + {return exprs;} } -Statement[] StatementExpressionList() : +Expression[] StatementExpressionList() : { final ArrayList list = new ArrayList(); - Statement expr; + final Expression expr; } { - expr = StatementExpression() {list.add(expr);} - ( StatementExpression() {list.add(expr);})* + expr = Expression() {list.add(expr);} + ( Expression() {list.add(expr);})* { - Statement[] stmtsArray = new Statement[list.size()]; - list.toArray(stmtsArray); - return stmtsArray;} + final Expression[] exprsArray = new Expression[list.size()]; + list.toArray(exprsArray); + return exprsArray; + } } Continue ContinueStatement() : { Expression expr = null; - final int pos = SimpleCharStream.getPosition(); + final Token token; + Token token2 = null; } { - [ expr = Expression() ] + token = [ expr = Expression() ] try { - - {return new Continue(expr,pos,SimpleCharStream.getPosition());} + token2 = } catch (ParseException e) { errorMessage = "';' expected after 'continue' statement"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + if (expr == null) { + errorStart = token.sourceEnd+1; + errorEnd = token.sourceEnd+1; + } else { + errorStart = expr.sourceEnd+1; + errorEnd = expr.sourceEnd+1; + } + processParseExceptionDebug(e); + } + { + if (token2 == null) { + if (expr == null) { + return new Continue(expr,token.sourceStart,token.sourceEnd); + } + return new Continue(expr,token.sourceStart,expr.sourceEnd); + } + return new Continue(expr,token.sourceStart,token2.sourceEnd); } } ReturnStatement ReturnStatement() : { Expression expr = null; - final int pos = SimpleCharStream.getPosition(); + final Token token; + Token token2 = null; } { - [ expr = Expression() ] + token = [ expr = Expression() ] try { - - {return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());} + token2 = } catch (ParseException e) { errorMessage = "';' expected after 'return' statement"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + if (expr == null) { + errorStart = token.sourceEnd+1; + errorEnd = token.sourceEnd+1; + } else { + errorStart = expr.sourceEnd+1; + errorEnd = expr.sourceEnd+1; + } + processParseExceptionDebug(e); + } + { + if (token2 == null) { + if (expr == null) { + return new ReturnStatement(expr,token.sourceStart,token.sourceEnd); + } + return new ReturnStatement(expr,token.sourceStart,expr.sourceEnd); + } + return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd); } -} \ No newline at end of file +} +