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 9e3fc1d..b49b15a 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -48,8 +48,9 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration; * You can test the parser with the PHPParserTestCase2.java * @author Matthieu Casanova */ -public class PHPParser extends PHPParserSuperclass { +public final class PHPParser extends PHPParserSuperclass { + /** The file that is parsed. */ private static IFile fileToParse; /** The current segment */ @@ -58,24 +59,30 @@ public class PHPParser extends PHPParserSuperclass { private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$ private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$ PHPOutlineInfo outlineInfo; + + /** 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 */ private static String errorMessage; + private static int errorStart = -1; + private static int errorEnd = -1; + public PHPParser() { } - public void setFileToParse(IFile fileToParse) { + public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; } - public PHPParser(IFile fileToParse) { + public PHPParser(final IFile fileToParse) { this(new StringReader("")); this.fileToParse = fileToParse; } - public void phpParserTester(String strEval) throws CoreException, ParseException { + public static final void phpParserTester(final String strEval) throws CoreException, ParseException { PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); - StringReader stream = new StringReader(strEval); + final StringReader stream = new StringReader(strEval); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } @@ -83,8 +90,8 @@ public class PHPParser extends PHPParserSuperclass { phpTest(); } - public void htmlParserTester(String strEval) throws CoreException, ParseException { - StringReader stream = new StringReader(strEval); + public static final void htmlParserTester(final String strEval) throws CoreException, ParseException { + final StringReader stream = new StringReader(strEval); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } @@ -92,10 +99,10 @@ public class PHPParser extends PHPParserSuperclass { phpFile(); } - public PHPOutlineInfo parseInfo(Object parent, String s) { + public final PHPOutlineInfo parseInfo(final Object parent, final String s) { outlineInfo = new PHPOutlineInfo(parent); currentSegment = outlineInfo.getDeclarations(); - StringReader stream = new StringReader(s); + final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } @@ -124,15 +131,27 @@ public class PHPParser extends PHPParserSuperclass { /** * Create marker for the parse error + * @param e the ParseException */ - private static void setMarker(ParseException e) { + private static void setMarker(final ParseException e) { try { - setMarker(fileToParse, - errorMessage, - jj_input_stream.tokenBegin, - jj_input_stream.tokenBegin + e.currentToken.image.length(), - errorLevel, - "Line " + e.currentToken.beginLine); + if (errorStart == -1) { + setMarker(fileToParse, + errorMessage, + jj_input_stream.tokenBegin, + jj_input_stream.tokenBegin + e.currentToken.image.length(), + errorLevel, + "Line " + e.currentToken.beginLine); + } else { + setMarker(fileToParse, + errorMessage, + errorStart, + errorEnd, + errorLevel, + "Line " + e.currentToken.beginLine); + errorStart = -1; + errorEnd = -1; + } } catch (CoreException e2) { PHPeclipsePlugin.log(e2); } @@ -141,12 +160,12 @@ public class PHPParser extends PHPParserSuperclass { /** * Create markers according to the external parser output */ - private static void createMarkers(String output, IFile file) throws CoreException { + 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 = 0; + int brIndx; boolean flag = true; while ((brIndx = output.indexOf("
", indx)) != -1) { // newer php error output (tested with 4.2.3) @@ -163,7 +182,10 @@ public class PHPParser extends PHPParserSuperclass { } } - private static void scanLine(String output, IFile file, int indx, int brIndx) throws CoreException { + 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); char ch; @@ -201,8 +223,12 @@ public class PHPParser extends PHPParserSuperclass { } } - public void parse(String s) throws CoreException { - ReInit(new StringReader(s)); + public final void parse(final String s) throws CoreException { + final StringReader stream = new StringReader(s); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); try { parse(); } catch (ParseException e) { @@ -214,15 +240,15 @@ public class PHPParser extends PHPParserSuperclass { * Call the php parse command ( php -l -f <filename> ) * and create markers according to the external parser output */ - public static void phpExternalParse(IFile file) { - IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); - String filename = file.getLocation().toString(); + public static void phpExternalParse(final IFile file) { + final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); + final String filename = file.getLocation().toString(); - String[] arguments = { filename }; - MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); - String command = form.format(arguments); + final String[] arguments = { filename }; + final MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); + final String command = form.format(arguments); - String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: "); + final String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: "); try { // parse the buffer to find the errors and warnings @@ -232,7 +258,7 @@ public class PHPParser extends PHPParserSuperclass { } } - public void parse() throws ParseException { + public static final void parse() throws ParseException { phpFile(); } } @@ -241,7 +267,9 @@ PARSER_END(PHPParser) TOKEN : { - : PHPPARSING + : PHPPARSING +| : PHPPARSING +| { input_stream.backup(1); } : IN_FORMAL_COMMENT | "/*" : IN_MULTI_LINE_COMMENT } - -SPECIAL_TOKEN : + SPECIAL_TOKEN : +{ + : PHPPARSING +} + + SPECIAL_TOKEN : { - " > : PHPPARSING + " > : DEFAULT } @@ -311,68 +345,76 @@ MORE : | | | +| } /* LANGUAGE CONSTRUCT */ TOKEN : { - -| -| -| -| -| -| -| -| "> -| -| "> + +| +| +| +| +| +| +| +| "> +| +| "> } + TOKEN : +{ + +} /* RESERVED WORDS AND LITERALS */ TOKEN : { - < BREAK: "break" > -| < CASE: "case" > -| < CONST: "const" > -| < CONTINUE: "continue" > -| < _DEFAULT: "default" > -| < DO: "do" > -| < EXTENDS: "extends" > -| < FALSE: "false" > -| < FOR: "for" > -| < GOTO: "goto" > -| < NEW: "new" > -| < NULL: "null" > -| < RETURN: "return" > -| < SUPER: "super" > -| < SWITCH: "switch" > -| < THIS: "this" > -| < TRUE: "true" > -| < WHILE: "while" > -| < ENDWHILE : "endwhile" > + +| +| +| <_DEFAULT : "default"> +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| } /* TYPES */ TOKEN : { - -| -| + +| +| | -| -| -| -| +| +| +| +| | } TOKEN : { - < _ORL : "OR" > -| < _ANDL: "AND"> + <_ORL : "OR"> +| <_ANDL : "AND"> } /* LITERALS */ @@ -454,76 +496,79 @@ MORE : TOKEN : { - < LPAREN: "(" > -| < RPAREN: ")" > -| < LBRACE: "{" > -| < RBRACE: "}" > -| < LBRACKET: "[" > -| < RBRACKET: "]" > -| < SEMICOLON: ";" > -| < COMMA: "," > -| < DOT: "." > + +| +| +| +| +| +| +| +| } -/* OPERATORS */ +/* COMPARATOR */ TOKEN : { - -| -| " > -| -| -| -| -| -| =" > -| -| -| -| -| -| -| -| -| -| -| -| -| -| >" > -| >>" > -| -| >=" > -| -| -| "> +| +| +| ="> +| "> +| +| } +/* ASSIGNATION */ TOKEN : { - < DOLLAR_ID: > + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| >"> +| >>"> +| >="> +} -/* - * Program structuring syntax follows. - */ + TOKEN : +{ + < DOLLAR_ID: > +} void phpTest() : {} @@ -536,8 +581,8 @@ void phpFile() : {} { try { - ( Php() )* - + (PhpBlock())* + } catch (TokenMgrError e) { errorMessage = e.getMessage(); errorLevel = ERROR; @@ -545,6 +590,36 @@ void phpFile() : } } +void PhpBlock() : +{ + final int start = jj_input_stream.bufpos; +} +{ + Expression() [ ] +| + [ + | + {try { + setMarker(fileToParse, + "You should use ' + } catch (ParseException e) { + errorMessage = "'?>' expected"; + errorLevel = ERROR; + throw e; + } +} + void Php() : {} { @@ -553,20 +628,42 @@ void Php() : void ClassDeclaration() : { - PHPClassDeclaration classDeclaration; - Token className; - int pos = jj_input_stream.bufpos; + final PHPClassDeclaration classDeclaration; + final Token className; + final int pos; } { - className = [ ] + + try { + {pos = jj_input_stream.bufpos;} + className = + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; + errorLevel = ERROR; + throw e; + } + [ + + try { + + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; + errorLevel = ERROR; + throw e; + } + ] { - classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); - currentSegment.add(classDeclaration); - currentSegment = classDeclaration; + if (currentSegment != null) { + classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); + currentSegment.add(classDeclaration); + currentSegment = classDeclaration; + } } ClassBody() { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + } } } @@ -604,10 +701,18 @@ void FieldDeclaration() : } { variableDeclaration = VariableDeclarator() - {currentSegment.add(variableDeclaration);} + { + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } + } ( - variableDeclaration = VariableDeclarator() - {currentSegment.add(variableDeclaration);} + variableDeclaration = VariableDeclarator() + { + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } + } )* try { @@ -620,9 +725,9 @@ void FieldDeclaration() : PHPVarDeclaration VariableDeclarator() : { - String varName; - String varValue = null; - int pos = jj_input_stream.bufpos; + final String varName; + String varValue; + final int pos = jj_input_stream.bufpos; } { varName = VariableDeclaratorId() @@ -630,24 +735,20 @@ PHPVarDeclaration VariableDeclarator() : try { varValue = VariableInitializer() + {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; throw e; } ] - { - if (varValue == null) { - return new PHPVarDeclaration(currentSegment,varName,pos); - } - return new PHPVarDeclaration(currentSegment,varName,pos,varValue); - } + {return new PHPVarDeclaration(currentSegment,varName,pos);} } String VariableDeclaratorId() : { String expr; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { try { @@ -667,7 +768,7 @@ String VariableDeclaratorId() : String Variable(): { String expr = null; - Token token; + final Token token; } { token = [ expr = Expression() ] @@ -685,7 +786,7 @@ String Variable(): String VariableName(): { String expr = null; -Token token; +final Token token; } { expr = Expression() @@ -713,8 +814,8 @@ Token token; String VariableInitializer() : { - String expr; - Token token; + final String expr; + final Token token; } { expr = Literal() @@ -736,7 +837,7 @@ String VariableInitializer() : String ArrayVariable() : { String expr; -StringBuffer buff = new StringBuffer(); +final StringBuffer buff = new StringBuffer(); } { expr = Expression() @@ -748,8 +849,8 @@ StringBuffer buff = new StringBuffer(); String ArrayInitializer() : { -String expr = null; -StringBuffer buff = new StringBuffer("("); +String expr; +final StringBuffer buff = new StringBuffer("("); } { [ expr = ArrayVariable() @@ -766,26 +867,40 @@ StringBuffer buff = new StringBuffer("("); void MethodDeclaration() : { - PHPFunctionDeclaration functionDeclaration; + final PHPFunctionDeclaration functionDeclaration; } { - functionDeclaration = MethodDeclarator() + + try { + functionDeclaration = MethodDeclarator() + } catch (ParseException e) { + if (errorMessage != null) { + throw e; + } + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; + errorLevel = ERROR; + throw e; + } { - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; + if (currentSegment != null) { + currentSegment.add(functionDeclaration); + currentSegment = functionDeclaration; + } } Block() { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + } } } PHPFunctionDeclaration MethodDeclarator() : { - Token identifier; - StringBuffer methodDeclaration = new StringBuffer(); - String formalParameters; - int pos = jj_input_stream.bufpos; + final Token identifier; + final StringBuffer methodDeclaration = new StringBuffer(); + final String formalParameters; + final int pos = jj_input_stream.bufpos; } { [ {methodDeclaration.append("&");} ] @@ -833,8 +948,8 @@ String FormalParameters() : String FormalParameter() : { - PHPVarDeclaration variableDeclaration; - StringBuffer buff = new StringBuffer(); + final PHPVarDeclaration variableDeclaration; + final StringBuffer buff = new StringBuffer(); } { [ {buff.append("&");}] variableDeclaration = VariableDeclarator() @@ -870,36 +985,37 @@ String Type() : | {return "integer";} +| + + {return "object";} } String Expression() : { - String expr; - String assignOperator = null; - String expr2 = null; + final String expr; + final String assignOperator; + final String expr2; } { expr = PrintExpression() {return expr;} | + expr = ListExpression() + {return expr;} +| expr = ConditionalExpression() [ assignOperator = AssignmentOperator() try { expr2 = Expression() + {return expr + assignOperator + expr2;} } catch (ParseException e) { errorMessage = "expression expected"; errorLevel = ERROR; throw e; } ] - { - if (expr2 == null) { - return expr; - } else { - return expr + assignOperator + expr2; - } - } + {return expr;} } String AssignmentOperator() : @@ -935,7 +1051,7 @@ String AssignmentOperator() : String ConditionalExpression() : { - String expr; + final String expr; String expr2 = null; String expr3 = null; } @@ -954,19 +1070,16 @@ String ConditionalOrExpression() : { String expr; Token operator; - String expr2 = null; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = ConditionalAndExpression() - { - buff.append(expr); - } + {buff.append(expr);} ( - (operator = | operator = <_ORL>) expr2 = ConditionalAndExpression() + (operator = | operator = <_ORL>) expr = ConditionalAndExpression() { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* { @@ -978,77 +1091,55 @@ String ConditionalAndExpression() : { String expr; Token operator; - String expr2 = null; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = ConcatExpression() - { - buff.append(expr); - } + {buff.append(expr);} ( - (operator = | operator = <_ANDL>) expr2 = ConcatExpression() + (operator = | operator = <_ANDL>) expr = ConcatExpression() { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* - { - return buff.toString(); - } + {return buff.toString();} } String ConcatExpression() : { String expr; - String expr2 = null; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = InclusiveOrExpression() - { - buff.append(expr); - } + {buff.append(expr);} ( - expr2 = InclusiveOrExpression() - { - buff.append("."); - buff.append(expr2); - } + expr = InclusiveOrExpression() + {buff.append(".").append(expr);} )* - { - return buff.toString(); - } + {return buff.toString();} } String InclusiveOrExpression() : { String expr; - String expr2 = null; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = ExclusiveOrExpression() - { - buff.append(expr); - } + {buff.append(expr);} ( - expr2 = ExclusiveOrExpression() - { - buff.append("|"); - buff.append(expr2); - } + expr = ExclusiveOrExpression() + {buff.append("|").append(expr);} )* - { - return buff.toString(); - } + {return buff.toString();} } String ExclusiveOrExpression() : { String expr; - String expr2 = null; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = AndExpression() @@ -1056,10 +1147,10 @@ String ExclusiveOrExpression() : buff.append(expr); } ( - expr2 = AndExpression() + expr = AndExpression() { buff.append("^"); - buff.append(expr2); + buff.append(expr); } )* { @@ -1070,8 +1161,7 @@ String ExclusiveOrExpression() : String AndExpression() : { String expr; - String expr2 = null; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = EqualityExpression() @@ -1079,37 +1169,40 @@ String AndExpression() : buff.append(expr); } ( - expr2 = EqualityExpression() + expr = EqualityExpression() { - buff.append("&"); - buff.append(expr2); + buff.append("&").append(expr); } )* - { - return buff.toString(); - } + {return buff.toString();} } String EqualityExpression() : { String expr; Token operator; - String expr2; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = RelationalExpression() {buff.append(expr);} ( ( operator = + | operator = | operator = | operator = | operator = ) - expr2 = RelationalExpression() + try { + expr = RelationalExpression() + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'"; + errorLevel = ERROR; + throw e; + } { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* {return buff.toString();} @@ -1119,18 +1212,14 @@ String RelationalExpression() : { String expr; Token operator; - String expr2; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = ShiftExpression() {buff.append(expr);} ( - ( operator = | operator = | operator = | operator = ) expr2 = ShiftExpression() - { - buff.append(operator.image); - buff.append(expr2); - } + ( operator = | operator = | operator = | operator = ) expr = ShiftExpression() + {buff.append(operator.image).append(expr);} )* {return buff.toString();} } @@ -1139,17 +1228,16 @@ String ShiftExpression() : { String expr; Token operator; - String expr2; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = AdditiveExpression() {buff.append(expr);} ( - (operator = | operator = | operator = ) expr2 = AdditiveExpression() + (operator = | operator = | operator = ) expr = AdditiveExpression() { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* {return buff.toString();} @@ -1159,17 +1247,16 @@ String AdditiveExpression() : { String expr; Token operator; - String expr2; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = MultiplicativeExpression() {buff.append(expr);} ( - ( operator = | operator = ) expr2 = MultiplicativeExpression() + ( operator = | operator = ) expr = MultiplicativeExpression() { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* {return buff.toString();} @@ -1177,17 +1264,17 @@ String AdditiveExpression() : String MultiplicativeExpression() : { - String expr, expr2; + String expr; Token operator; final StringBuffer buff = new StringBuffer();} { expr = UnaryExpression() {buff.append(expr);} ( - ( operator = | operator = | operator = ) expr2 = UnaryExpression() + ( operator = | operator = | operator = ) expr = UnaryExpression() { buff.append(operator.image); - buff.append(expr2); + buff.append(expr); } )* {return buff.toString();} @@ -1198,8 +1285,8 @@ String MultiplicativeExpression() : */ String UnaryExpression() : { - String expr; - Token token; + final String expr; + final Token token; final StringBuffer buff = new StringBuffer(); } { @@ -1217,8 +1304,8 @@ String UnaryExpression() : String UnaryExpressionNoPrefix() : { - String expr; - Token token; + final String expr; + final Token token; } { ( token = | token = ) expr = UnaryExpression() @@ -1239,7 +1326,7 @@ String UnaryExpressionNoPrefix() : String PreIncrementExpression() : { -String expr; +final String expr; } { expr = PrimaryExpression() @@ -1248,7 +1335,7 @@ String expr; String PreDecrementExpression() : { -String expr; +final String expr; } { expr = PrimaryExpression() @@ -1257,7 +1344,7 @@ String expr; String UnaryExpressionNotPlusMinus() : { - String expr; + final String expr; } { expr = UnaryExpression() @@ -1273,14 +1360,20 @@ String UnaryExpressionNotPlusMinus() : expr = Literal() {return expr;} | - expr = Expression() + expr = Expression() + try { + + } catch (ParseException e) { + errorMessage = "')' expected"; + errorLevel = ERROR; + throw e; + } {return "("+expr+")";} } String CastExpression() : { -String type; -String expr; +final String type, expr; } { type = Type() expr = UnaryExpression() @@ -1289,7 +1382,7 @@ String expr; String PostfixExpression() : { - String expr; + final String expr; Token operator = null; } { @@ -1304,7 +1397,7 @@ String PostfixExpression() : String PrimaryExpression() : { - Token identifier; + final Token identifier; String expr; final StringBuffer buff = new StringBuffer(); } @@ -1328,7 +1421,7 @@ String PrimaryExpression() : String ArrayDeclarator() : { - String expr; + final String expr; } { expr = ArrayInitializer() @@ -1337,8 +1430,8 @@ String ArrayDeclarator() : String PrimaryPrefix() : { - String expr; - Token token = null; + final String expr; + final Token token; } { token = @@ -1355,8 +1448,8 @@ String PrimaryPrefix() : String ClassIdentifier(): { - String expr; - Token token; + final String expr; + final Token token; } { token = @@ -1368,7 +1461,7 @@ String ClassIdentifier(): String PrimarySuffix() : { - String expr; + final String expr; } { expr = Arguments() @@ -1383,7 +1476,14 @@ String VariableSuffix() : String expr = null; } { - expr = VariableName() + + try { + expr = VariableName() + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; + errorLevel = ERROR; + throw e; + } {return "->" + expr;} | [ expr = Expression() ] @@ -1404,8 +1504,8 @@ String VariableSuffix() : String Literal() : { - String expr; - Token token; + final String expr; + final Token token; } { token = @@ -1450,7 +1550,7 @@ String expr = null; try { } catch (ParseException e) { - errorMessage = "')' expected to close the argument list"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; errorLevel = ERROR; throw e; } @@ -1465,7 +1565,7 @@ String expr = null; String ArgumentList() : { String expr; -StringBuffer buff = new StringBuffer(); +final StringBuffer buff = new StringBuffer(); } { expr = Expression() @@ -1479,23 +1579,22 @@ StringBuffer buff = new StringBuffer(); throw e; } { - buff.append(",").append("expr"); + buff.append(",").append(expr); } )* {return buff.toString();} } -/* - * Statement syntax follows. +/** + * A Statement without break */ - -void Statement() : +void StatementNoBreak() : {} { LOOKAHEAD(2) Expression() try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1528,7 +1627,7 @@ void Statement() : | ForStatement() | - BreakStatement() + ForeachStatement() | ContinueStatement() | @@ -1543,17 +1642,32 @@ void Statement() : GlobalStatement() } +/** + * A Normal statement + */ +void Statement() : +{} +{ + StatementNoBreak() +| + BreakStatement() +} + void IncludeStatement() : { - String expr; - int pos = jj_input_stream.bufpos; + final String expr; + final int pos = jj_input_stream.bufpos; } { expr = Expression() - {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr));} + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); + } + } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1562,9 +1676,13 @@ void IncludeStatement() : | expr = Expression() - {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr));} + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr)); + } + } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1573,9 +1691,13 @@ void IncludeStatement() : | expr = Expression() - {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr));} + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); + } + } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1584,9 +1706,13 @@ void IncludeStatement() : | expr = Expression() - {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr));} + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr)); + } + } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1596,8 +1722,8 @@ void IncludeStatement() : String PrintExpression() : { - StringBuffer buff = new StringBuffer("print "); - String expr; + final StringBuffer buff = new StringBuffer("print "); + final String expr; } { expr = Expression() @@ -1607,12 +1733,53 @@ String PrintExpression() : } } +String ListExpression() : +{ + final StringBuffer buff = new StringBuffer("list("); + String expr; +} +{ + + try { + + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected"; + errorLevel = ERROR; + throw e; + } + [ + expr = VariableDeclaratorId() + {buff.append(expr);} + ] + [ + try { + + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected"; + errorLevel = ERROR; + throw e; + } + expr = VariableDeclaratorId() + {buff.append(",").append(expr);} + ] + {buff.append(")");} + try { + + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected"; + errorLevel = ERROR; + throw e; + } + [ expr = Expression() {buff.append("(").append(expr);}] + {return buff.toString();} +} + void EchoStatement() : {} { Expression() ( Expression())* try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected after 'echo' statement"; errorLevel = ERROR; @@ -1625,7 +1792,7 @@ void GlobalStatement() : { VariableDeclaratorId() ( VariableDeclaratorId())* try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1638,7 +1805,7 @@ void StaticStatement() : { VariableDeclarator() ( VariableDeclarator())* try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1663,7 +1830,13 @@ void Block() : throw e; } ( BlockStatement() )* - + try { + + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected"; + errorLevel = ERROR; + throw e; + } } void BlockStatement() : @@ -1676,10 +1849,29 @@ void BlockStatement() : MethodDeclaration() } +/** + * A Block statement that will not contain any 'break' + */ +void BlockStatementNoBreak() : +{} +{ + StatementNoBreak() +| + ClassDeclaration() +| + MethodDeclaration() +} + void LocalVariableDeclaration() : {} { - VariableDeclarator() ( VariableDeclarator() )* + LocalVariableDeclarator() ( LocalVariableDeclarator() )* +} + +void LocalVariableDeclarator() : +{} +{ + VariableDeclaratorId() [ Expression() ] } void EmptyStatement() : @@ -1706,33 +1898,121 @@ void StatementExpression() : } void SwitchStatement() : -{} { - Expression() - ( SwitchLabel() ( BlockStatement() )* )* - + Token breakToken = null; + int line; +} +{ + + try { + + } catch (ParseException e) { + errorMessage = "'(' expected after 'switch'"; + errorLevel = ERROR; + throw e; + } + Expression() + try { + + } catch (ParseException e) { + errorMessage = "')' expected"; + errorLevel = ERROR; + throw e; + } + try { + + } catch (ParseException e) { + errorMessage = "'{' expected"; + errorLevel = ERROR; + throw e; + } + ( + line = SwitchLabel() + ( BlockStatementNoBreak() )* + [ breakToken = BreakStatement() ] + { + try { + if (breakToken == null) { + setMarker(fileToParse, + "You should use put a 'break' at the end of your statement", + line, + INFO, + "Line " + line); + } + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } + )* + try { + + } catch (ParseException e) { + errorMessage = "'}' expected"; + errorLevel = ERROR; + throw e; + } } -void SwitchLabel() : -{} +Token BreakStatement() : +{ + final Token token; +} +{ + token = [ Expression() ] + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'break' keyword"; + errorLevel = ERROR; + throw e; + } + {return token;} +} + +int SwitchLabel() : { - Expression() + final Token token; +} +{ + token = + try { + Expression() + } catch (ParseException e) { + if (errorMessage != null) throw e; + errorMessage = "expression expected after 'case' keyword"; + errorLevel = ERROR; + throw e; + } + try { + + } catch (ParseException e) { + errorMessage = "':' expected after case expression"; + errorLevel = ERROR; + throw e; + } + {return token.beginLine;} | - <_DEFAULT> + token = <_DEFAULT> + try { + + } catch (ParseException e) { + errorMessage = "':' expected after 'default' keyword"; + errorLevel = ERROR; + throw e; + } + {return token.beginLine;} } void IfStatement() : -/* - * The disambiguating algorithm of JavaCC automatically binds dangling - * else's to the innermost if statement. The LOOKAHEAD specification - * is to tell JavaCC that we know what we are doing. - */ -{} { - Condition("if") Statement() ( LOOKAHEAD(1) ElseIfStatement() )* [ LOOKAHEAD(1) Statement() ] + final Token token; + final int pos = jj_input_stream.bufpos; +} +{ + token = Condition("if") IfStatement0(pos,pos+token.image.length()) } -void Condition(String keyword) : +void Condition(final String keyword) : {} { try { @@ -1752,6 +2032,51 @@ void Condition(String keyword) : } } +void IfStatement0(final int start,final int end) : +{} +{ + (Statement())* (ElseIfStatementColon())* [ElseStatementColon()] + + {try { + setMarker(fileToParse, + "Ugly syntax detected, you should if () {...} instead of if (): ... endif;", + start, + end, + INFO, + "Line " + token.beginLine); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + }} + try { + + } catch (ParseException e) { + errorMessage = "'endif' expected"; + errorLevel = ERROR; + throw e; + } + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'endif' keyword"; + errorLevel = ERROR; + throw e; + } +| + Statement() ( LOOKAHEAD(1) ElseIfStatement() )* [ LOOKAHEAD(1) Statement() ] +} + +void ElseIfStatementColon() : +{} +{ + Condition("elseif") (Statement())* +} + +void ElseStatementColon() : +{} +{ + (Statement())* +} + void ElseIfStatement() : {} { @@ -1759,19 +2084,39 @@ void ElseIfStatement() : } void WhileStatement() : -{} { - Condition("while") WhileStatement0() + final Token token; + final int pos = jj_input_stream.bufpos; +} +{ + token = Condition("while") WhileStatement0(pos,pos + token.image.length()) } -void WhileStatement0() : +void WhileStatement0(final int start, final int end) : {} { - (Statement())* + (Statement())* + {try { + setMarker(fileToParse, + "Ugly syntax detected, you should while () {...} instead of while (): ... endwhile;", + start, + end, + INFO, + "Line " + token.beginLine); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + }} try { - ( | "?>") + } catch (ParseException e) { - errorMessage = "';' expected"; + errorMessage = "'endwhile' expected"; + errorLevel = ERROR; + throw e; + } + try { + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) + } catch (ParseException e) { + errorMessage = "';' expected after 'endwhile' keyword"; errorLevel = ERROR; throw e; } @@ -1784,7 +2129,7 @@ void DoStatement() : { Statement() Condition("while") try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1792,10 +2137,103 @@ void DoStatement() : } } -void ForStatement() : +void ForeachStatement() : {} { - [ ForInit() ] [ Expression() ] [ ForUpdate() ] Statement() + + try { + + } catch (ParseException e) { + errorMessage = "'(' expected after 'foreach' keyword"; + errorLevel = ERROR; + throw e; + } + try { + Variable() + } catch (ParseException e) { + errorMessage = "variable expected"; + errorLevel = ERROR; + throw e; + } + [ VariableSuffix() ] + try { + + } catch (ParseException e) { + errorMessage = "'as' expected"; + errorLevel = ERROR; + throw e; + } + try { + Variable() + } catch (ParseException e) { + errorMessage = "variable expected"; + errorLevel = ERROR; + throw e; + } + [ Expression() ] + try { + + } catch (ParseException e) { + errorMessage = "')' expected after 'foreach' keyword"; + errorLevel = ERROR; + throw e; + } + try { + Statement() + } catch (ParseException e) { + if (errorMessage != null) throw e; + errorMessage = "statement expected"; + errorLevel = ERROR; + throw e; + } +} + +void ForStatement() : +{ +final Token token; +final int pos = jj_input_stream.bufpos; +} +{ + token = + try { + + } catch (ParseException e) { + errorMessage = "'(' expected after 'for' keyword"; + errorLevel = ERROR; + throw e; + } + [ ForInit() ] [ Expression() ] [ StatementExpressionList() ] + ( + Statement() + | + (Statement())* + { + try { + setMarker(fileToParse, + "Ugly syntax detected, you should for () {...} instead of for (): ... endfor;", + pos, + pos+token.image.length(), + INFO, + "Line " + token.beginLine); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } + try { + + } catch (ParseException e) { + errorMessage = "'endfor' expected"; + errorLevel = ERROR; + throw e; + } + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'endfor' keyword"; + errorLevel = ERROR; + throw e; + } + ) } void ForInit() : @@ -1813,26 +2251,28 @@ void StatementExpressionList() : StatementExpression() ( StatementExpression() )* } -void ForUpdate() : -{} -{ - StatementExpressionList() -} - -void BreakStatement() : -{} -{ - [ ] -} - void ContinueStatement() : {} { - [ ] + [ ] + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'continue' statement"; + errorLevel = ERROR; + throw e; + } } void ReturnStatement() : {} { - [ Expression() ] + [ Expression() ] + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'return' statement"; + errorLevel = ERROR; + throw e; + } } \ No newline at end of file