X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index e9930a3..11e4e8a 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -29,7 +29,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,6 +38,7 @@ 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; /** @@ -60,8 +60,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 +68,8 @@ public final class PHPParser extends PHPParserSuperclass { private static int errorStart = -1; private static int errorEnd = -1; private static PHPDocument phpDocument; + + private static final char[] SYNTAX_ERROR_CHAR = {'s','y','n','t','a','x',' ','e','r','r','o','r'}; /** * The point where html starts. * It will be used by the token manager to create HTMLCode objects @@ -135,7 +135,9 @@ public final class PHPParser extends PHPParserSuperclass { parse(); phpDocument.nodes = new AstNode[nodes.length]; System.arraycopy(nodes,0,phpDocument.nodes,0,nodes.length); - phpDocument.toString(); + if (PHPeclipsePlugin.DEBUG) { + PHPeclipsePlugin.log(1,phpDocument.toString()); + } } catch (ParseException e) { processParseException(e); } @@ -186,31 +188,6 @@ public final class PHPParser extends PHPParserSuperclass { } } - /** - * Create markers according to the external parser output - */ - private static void createMarkers(final String output, final IFile file) throws CoreException { - // delete all markers - file.deleteMarkers(IMarker.PROBLEM, false, 0); - - int indx = 0; - int brIndx; - boolean flag = true; - while ((brIndx = output.indexOf("
", indx)) != -1) { - // newer php error output (tested with 4.2.3) - scanLine(output, file, indx, brIndx); - indx = brIndx + 6; - flag = false; - } - if (flag) { - while ((brIndx = output.indexOf("
", indx)) != -1) { - // older php error output (tested with 4.2.3) - scanLine(output, file, indx, brIndx); - indx = brIndx + 4; - } - } - } - private static void scanLine(final String output, final IFile file, final int indx, @@ -293,13 +270,32 @@ public final class PHPParser extends PHPParserSuperclass { */ public static final void createNewHTMLCode() { final int currentPosition = SimpleCharStream.getPosition(); - if (currentPosition == htmlStart) { + if (currentPosition == htmlStart || currentPosition > SimpleCharStream.currentBuffer.length()) { return; } final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray(); pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); } + /** + * Create a new task. + */ + public static final void createNewTask() { + final int currentPosition = SimpleCharStream.getPosition(); + final String todo = SimpleCharStream.currentBuffer.substring(currentPosition+1, + SimpleCharStream.currentBuffer.indexOf("\n", + currentPosition)-1); + try { + setMarker(fileToParse, + "todo : " + todo, + SimpleCharStream.getBeginLine(), + TASK, + "Line "+SimpleCharStream.getBeginLine()); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } + private static final void parse() throws ParseException { phpFile(); } @@ -340,34 +336,30 @@ PARSER_END(PHPParser) SPECIAL_TOKEN : { "//" : IN_SINGLE_LINE_COMMENT -| - "#" : IN_SINGLE_LINE_COMMENT -| - <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT -| - "/*" : IN_MULTI_LINE_COMMENT +| "#" : IN_SINGLE_LINE_COMMENT +| <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT +| "/*" : IN_MULTI_LINE_COMMENT } SPECIAL_TOKEN : { : PHPPARSING +| "?>" : DEFAULT } - SPECIAL_TOKEN : + SPECIAL_TOKEN : { - " > : DEFAULT + "todo" {PHPParser.createNewTask();} } - -SPECIAL_TOKEN : + SPECIAL_TOKEN : { - : PHPPARSING + "*/" : PHPPARSING } - -SPECIAL_TOKEN : + SPECIAL_TOKEN : { - : PHPPARSING + "*/" : PHPPARSING } @@ -400,6 +392,7 @@ MORE : | | | +| | | "> | @@ -465,8 +458,8 @@ MORE : { | -| -| +| +| | | | @@ -507,32 +500,9 @@ MORE : <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ > | | | )> -| -| -| +| +| +| } /* IDENTIFIERS */ @@ -604,7 +574,7 @@ MORE : TOKEN : { - < DOLLAR_ID: > + > } void phpFile() : @@ -612,7 +582,7 @@ void phpFile() : { try { (PhpBlock())* - + {PHPParser.createNewHTMLCode();} } catch (TokenMgrError e) { PHPeclipsePlugin.log(e); errorStart = SimpleCharStream.getPosition(); @@ -631,11 +601,13 @@ void phpFile() : void PhpBlock() : { final int start = SimpleCharStream.getPosition(); + final PHPEchoBlock phpEchoBlock; } { - phpEchoBlock() + phpEchoBlock = phpEchoBlock() + {pushOnAstNodes(phpEchoBlock);} | - [ + [ | {try { setMarker(fileToParse, @@ -656,7 +628,7 @@ void PhpBlock() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + processParseException(e); } } @@ -686,41 +658,46 @@ ClassDeclaration ClassDeclaration() : final Token className; Token superclassName = null; final int pos; + char[] classNameImage = SYNTAX_ERROR_CHAR; + char[] superclassNameImage = null; } { + {pos = SimpleCharStream.getPosition();} try { - {pos = SimpleCharStream.getPosition();} className = + {classNameImage = className.image.toCharArray();} } 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; + processParseException(e); } [ try { superclassName = + {superclassNameImage = superclassName.image.toCharArray();} } 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; + processParseException(e); + superclassNameImage = SYNTAX_ERROR_CHAR; } ] { - if (superclassName == null) { + if (superclassNameImage == null) { classDeclaration = new ClassDeclaration(currentSegment, - className.image.toCharArray(), + classNameImage, pos, 0); } else { classDeclaration = new ClassDeclaration(currentSegment, - className.image.toCharArray(), - superclassName.image.toCharArray(), + classNameImage, + superclassNameImage, pos, 0); } @@ -767,8 +744,8 @@ void ClassBodyDeclaration(ClassDeclaration classDeclaration) : FieldDeclaration field; } { - method = MethodDeclaration() {method.setParent(classDeclaration);} -| field = FieldDeclaration() + method = MethodDeclaration() {classDeclaration.addMethod(method);} +| field = FieldDeclaration() {classDeclaration.addField(field);} } /** @@ -784,12 +761,10 @@ FieldDeclaration FieldDeclaration() : { variableDeclaration = VariableDeclarator() {arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name)); - currentSegment.add(variableDeclaration);} + outlineInfo.addVariable(new String(variableDeclaration.name));} ( variableDeclaration = VariableDeclarator() {arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name)); - currentSegment.add(variableDeclaration);} + outlineInfo.addVariable(new String(variableDeclaration.name));} )* try { @@ -798,7 +773,7 @@ FieldDeclaration FieldDeclaration() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + processParseException(e); } {list = new VariableDeclaration[arrayList.size()]; @@ -850,22 +825,26 @@ VariableDeclaration VariableDeclarator() : String VariableDeclaratorId() : { String expr; - Expression expression; + Expression expression = null; final StringBuffer buff = new StringBuffer(); final int pos = SimpleCharStream.getPosition(); ConstantIdentifier ex; } { try { - expr = Variable() {buff.append(expr);} + expr = Variable() ( LOOKAHEAD(2) {ex = new ConstantIdentifier(expr.toCharArray(), pos, SimpleCharStream.getPosition());} expression = VariableSuffix(ex) - {buff.append(expression.toStringExpression());} )* - {return buff.toString();} + { + if (expression == null) { + return expr; + } + return expression.toStringExpression(); + } } catch (ParseException e) { errorMessage = "'$' expected for variable identifier"; errorLevel = ERROR; @@ -875,6 +854,10 @@ String VariableDeclaratorId() : } } +/** + * Return a variablename without the $. + * @return a variable name + */ String Variable(): { final StringBuffer buff; @@ -885,20 +868,24 @@ String Variable(): { token = [ expression = Expression() ] { - if (expression == null && !assigning) { + if (expression == null) { return token.image.substring(1); } buff = new StringBuffer(token.image); - buff.append('{'); + buff.append("{"); buff.append(expression.toStringExpression()); - buff.append('}'); + buff.append("}"); return buff.toString(); } | expr = VariableName() - {return "$" + expr;} + {return expr;} } +/** + * A Variable name (without the $) + * @return a variable name String + */ String VariableName(): { final StringBuffer buff; @@ -919,15 +906,15 @@ String VariableName(): return token.image; } buff = new StringBuffer(token.image); - buff.append('{'); + buff.append("{"); buff.append(expression.toStringExpression()); - buff.append('}'); + buff.append("}"); return buff.toString(); } | expr = VariableName() { - buff = new StringBuffer('$'); + buff = new StringBuffer("$"); buff.append(expr); return buff.toString(); } @@ -1006,6 +993,7 @@ MethodDeclaration MethodDeclaration() : { final MethodDeclaration functionDeclaration; final Block block; + final OutlineableWithChildren seg = currentSegment; } { @@ -1020,20 +1008,11 @@ MethodDeclaration MethodDeclaration() : errorEnd = SimpleCharStream.getPosition() + 1; 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;} } /** @@ -1047,16 +1026,27 @@ MethodDeclaration MethodDeclarator() : Token reference = null; final Hashtable formalParameters; final int pos = SimpleCharStream.getPosition(); + char[] identifierChar = SYNTAX_ERROR_CHAR; } { - [reference = ] identifier = + [reference = ] + try { + identifier = + {identifierChar = identifier.image.toCharArray();} + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); + } formalParameters = FormalParameters() {return new MethodDeclaration(currentSegment, - identifier.image.toCharArray(), - formalParameters, - reference != null, - pos, - SimpleCharStream.getPosition());} + identifierChar, + formalParameters, + reference != null, + pos, + SimpleCharStream.getPosition());} } /** @@ -1076,7 +1066,7 @@ Hashtable FormalParameters() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + processParseException(e); } [ var = FormalParameter() {parameters.put(new String(var.name),var);} @@ -1092,7 +1082,7 @@ Hashtable FormalParameters() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + processParseException(e); } {return parameters;} } @@ -1119,37 +1109,39 @@ ConstantIdentifier Type() : {final int pos;} { {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.STRING, - pos,pos-6);} + return new ConstantIdentifier(Types.STRING,pos,pos-6);} | {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.BOOL, - pos,pos-4);} + return new ConstantIdentifier(Types.BOOL,pos,pos-4);} | {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.BOOLEAN, - pos,pos-7);} + return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);} | {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.REAL, - pos,pos-4);} + return new ConstantIdentifier(Types.REAL,pos,pos-4);} | {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.DOUBLE, - pos,pos-5);} + return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);} | {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.FLOAT, - pos,pos-5);} + return new ConstantIdentifier(Types.FLOAT,pos,pos-5);} | {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.INT, - pos,pos-3);} + return new ConstantIdentifier(Types.INT,pos,pos-3);} | {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.INTEGER, - pos,pos-7);} + return new ConstantIdentifier(Types.INTEGER,pos,pos-7);} | {pos = SimpleCharStream.getPosition(); - return new ConstantIdentifier(Types.OBJECT, - pos,pos-6);} + return new ConstantIdentifier(Types.OBJECT,pos,pos-6);} } Expression Expression() : { final Expression expr; + Token bangToken = null; + final int pos = SimpleCharStream.getPosition(); +} +{ + expr = Expression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} +| expr = ExpressionNoBang() {return expr;} +} + +Expression ExpressionNoBang() : +{ + final Expression expr; } { expr = PrintExpression() {return expr;} @@ -1166,7 +1158,7 @@ Expression Expression() : VarAssignation varAssignation() : { String varName; - final Expression expression; + final Expression initializer; final int assignOperator; final int pos = SimpleCharStream.getPosition(); } @@ -1174,7 +1166,7 @@ VarAssignation varAssignation() : varName = VariableDeclaratorId() assignOperator = AssignmentOperator() try { - expression = Expression() + initializer = Expression() } catch (ParseException e) { if (errorMessage != null) { throw e; @@ -1186,7 +1178,7 @@ VarAssignation varAssignation() : throw e; } {return new VarAssignation(varName.toCharArray(), - expression, + initializer, assignOperator, pos, SimpleCharStream.getPosition());} @@ -1478,8 +1470,8 @@ final int operator; final int pos = SimpleCharStream.getPosition(); } { - ( {operator = OperatorIds.PLUS_PLUS;} - | {operator = OperatorIds.MINUS_MINUS;}) + ( {operator = OperatorIds.PLUS_PLUS;} + | {operator = OperatorIds.MINUS_MINUS;}) expr = PrimaryExpression() {return new PrefixedUnaryExpression(expr,operator,pos);} } @@ -1490,8 +1482,8 @@ Expression UnaryExpressionNotPlusMinus() : final int pos = SimpleCharStream.getPosition(); } { - expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} -| LOOKAHEAD( (Type() | ) ) +// expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} + LOOKAHEAD( (Type() | ) ) expr = CastExpression() {return expr;} | expr = PostfixExpression() {return expr;} | expr = Literal() {return expr;} @@ -1530,8 +1522,8 @@ Expression PostfixExpression() : } { expr = PrimaryExpression() - [ {operator = OperatorIds.PLUS_PLUS;} - | {operator = OperatorIds.MINUS_MINUS;}] + [ {operator = OperatorIds.PLUS_PLUS;} + | {operator = OperatorIds.MINUS_MINUS;}] { if (operator == -1) { return expr; @@ -1554,17 +1546,26 @@ Expression PrimaryExpression() : SimpleCharStream.getPosition()), expr, ClassAccess.STATIC);} - (expr = PrimarySuffix(expr))* + ( + LOOKAHEAD(PrimarySuffix()) + expr = PrimarySuffix(expr))* {return expr;} | expr = PrimaryPrefix() - (expr = PrimarySuffix(expr))* + ( + LOOKAHEAD(PrimarySuffix()) + expr = PrimarySuffix(expr))* {return expr;} | expr = ArrayDeclarator() {return expr;} } +/** + * An array declarator. + * array(vars) + * @return an array + */ ArrayInitializer ArrayDeclarator() : { final ArrayVariableDeclaration[] vars; @@ -1589,9 +1590,10 @@ Expression PrimaryPrefix() : | expr = ClassIdentifier() {return new PrefixedUnaryExpression(expr, OperatorIds.NEW, pos);} -| var = VariableDeclaratorId() {return new ConstantIdentifier(var.toCharArray(), - pos, - SimpleCharStream.getPosition());} +| var = VariableDeclaratorId() {return new VariableDeclaration(currentSegment, + var.toCharArray(), + pos, + SimpleCharStream.getPosition());} } PrefixedUnaryExpression classInstantiation() : @@ -1756,7 +1758,7 @@ Statement StatementNoBreak() : try { } catch (ParseException e) { - if (e.currentToken.next.kind != 4) { + if (e.currentToken.next.kind != PHPParserConstants.PHPEND) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; @@ -1796,6 +1798,69 @@ Statement StatementNoBreak() : return statement;} | statement = StaticStatement() {return statement;} | statement = GlobalStatement() {return statement;} +| statement = defineStatement() {currentSegment.add((Outlineable)statement);return statement;} +} + +Define defineStatement() : +{ + final int start = SimpleCharStream.getPosition(); + Expression defineName,defineValue; +} +{ + + try { + + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); + } + try { + defineName = Expression() + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + throw e; + } + try { + + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); + } + try { + ( defineValue = PrintExpression() + | LOOKAHEAD(varAssignation()) + defineValue = varAssignation() + | defineValue = ConditionalExpression()) + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + throw e; + } + try { + + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); + } + {return new Define(currentSegment, + defineName, + defineValue, + start, + SimpleCharStream.getPosition());} } /** @@ -1824,17 +1889,18 @@ HTMLBlock htmlBlock() : try { ( | ) } catch (ParseException e) { - errorMessage = "End of file unexpected, ' - { - Expression[] exprs = new Expression[expressions.size()]; - expressions.toArray(exprs); - return new EchoStatement(exprs,pos);} } catch (ParseException e) { if (e.currentToken.next.kind != 4) { errorMessage = "';' expected after 'echo' statement"; @@ -1983,6 +2045,9 @@ EchoStatement EchoStatement() : throw e; } } + {Expression[] exprs = new Expression[expressions.size()]; + expressions.toArray(exprs); + return new EchoStatement(exprs,pos);} } GlobalStatement GlobalStatement() : @@ -2102,9 +2167,21 @@ Statement BlockStatement() : final Statement statement; } { - statement = Statement() {return statement;} + try { + statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement); + return statement;} + } catch (ParseException e) { + if (errorMessage != null) throw e; + errorMessage = "statement expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + throw e; + } | statement = ClassDeclaration() {return statement;} -| statement = MethodDeclaration() {return statement;} +| statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement); + currentSegment.add((MethodDeclaration) statement); + return statement;} } /** @@ -2117,7 +2194,8 @@ Statement BlockStatementNoBreak() : { statement = StatementNoBreak() {return statement;} | statement = ClassDeclaration() {return statement;} -| statement = MethodDeclaration() {return statement;} +| statement = MethodDeclaration() {currentSegment.add((MethodDeclaration) statement); + return statement;} } VariableDeclaration[] LocalVariableDeclaration() : @@ -2167,7 +2245,7 @@ EmptyStatement EmptyStatement() : return new EmptyStatement(pos-1,pos);} } -Statement StatementExpression() : +Expression StatementExpression() : { Expression expr,expr2; int operator; @@ -2176,10 +2254,10 @@ Statement StatementExpression() : expr = PreIncDecExpression() {return expr;} | expr = PrimaryExpression() - [ {return new PostfixedUnaryExpression(expr, + [ {return new PostfixedUnaryExpression(expr, OperatorIds.PLUS_PLUS, SimpleCharStream.getPosition());} - | {return new PostfixedUnaryExpression(expr, + | {return new PostfixedUnaryExpression(expr, OperatorIds.MINUS_MINUS, SimpleCharStream.getPosition());} | operator = AssignmentOperator() expr2 = Expression() @@ -2414,14 +2492,14 @@ Expression Condition(final String keyword) : 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; + processParseException(e); } + {return condition;} } IfStatement IfStatement0(Expression condition, final int start,final int end) : @@ -2489,10 +2567,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()); } } @@ -2728,9 +2806,9 @@ ForStatement ForStatement() : { final Token token; final int pos = SimpleCharStream.getPosition(); -Statement[] initializations = null; +Expression[] initializations = null; Expression condition = null; -Statement[] increments = null; +Expression[] increments = null; Statement action; final ArrayList list = new ArrayList(); final int startBlock, endBlock; @@ -2794,31 +2872,31 @@ final int startBlock, endBlock; ) } -Statement[] ForInit() : +Expression[] ForInit() : { - Statement[] statements; + 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; + Expression expr; } { expr = StatementExpression() {list.add(expr);} ( StatementExpression() {list.add(expr);})* { - Statement[] stmtsArray = new Statement[list.size()]; - list.toArray(stmtsArray); - return stmtsArray;} + Expression[] exprsArray = new Expression[list.size()]; + list.toArray(exprsArray); + return exprsArray;} } Continue ContinueStatement() :