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 9bf7ec4..34ee7b7 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -38,6 +38,8 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; import net.sourceforge.phpdt.internal.compiler.parser.PHPSegmentWithChildren; import net.sourceforge.phpdt.internal.compiler.parser.PHPFunctionDeclaration; import net.sourceforge.phpdt.internal.compiler.parser.PHPClassDeclaration; +import net.sourceforge.phpdt.internal.compiler.parser.PHPVarDeclaration; +import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration; /** * A new php parser. @@ -46,7 +48,7 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPClassDeclaration; * You can test the parser with the PHPParserTestCase2.java * @author Matthieu Casanova */ -public class PHPParser extends PHPParserSuperclass { +public final class PHPParser extends PHPParserSuperclass { private static IFile fileToParse; @@ -55,9 +57,6 @@ 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$ - public static final int ERROR = 2; - public static final int WARNING = 1; - public static final int INFO = 0; PHPOutlineInfo outlineInfo; private static int errorLevel = ERROR; private static String errorMessage; @@ -65,18 +64,18 @@ public class PHPParser extends PHPParserSuperclass { 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); } @@ -84,8 +83,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); } @@ -93,10 +92,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); } @@ -104,57 +103,51 @@ public class PHPParser extends PHPParserSuperclass { try { parse(); } catch (ParseException e) { - if (errorMessage == null) { - PHPeclipsePlugin.log(e); - } else { - setMarker(errorMessage, e.currentToken.beginLine, errorLevel); - errorMessage = null; - } + processParseException(e); } return outlineInfo; } - /** - * Create marker for the parse error + * 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 */ - private static void setMarker(String message, int lineNumber, int errorLevel) { - try { - setMarker(fileToParse, message, lineNumber, errorLevel); - } catch (CoreException e) { + private static void processParseException(final ParseException e) { + if (errorMessage == null) { PHPeclipsePlugin.log(e); + errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it"; } + setMarker(e); + errorMessage = null; } - public static void setMarker(IFile file, String message, int lineNumber, int errorLevel) throws CoreException { - if (file != null) { - Hashtable attributes = new Hashtable(); - MarkerUtilities.setMessage(attributes, message); - switch (errorLevel) { - case ERROR : - attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); - break; - case WARNING : - attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); - break; - case INFO : - attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); - break; - } - MarkerUtilities.setLineNumber(attributes, lineNumber); - MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); + /** + * Create marker for the parse error + * @param e the ParseException + */ + 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); + } catch (CoreException e2) { + PHPeclipsePlugin.log(e2); } } /** * 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) @@ -171,7 +164,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; @@ -209,17 +205,16 @@ 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) { - if (errorMessage == null) { - PHPeclipsePlugin.log(e); - } else { - setMarker(errorMessage, e.currentToken.beginLine, errorLevel); - errorMessage = null; - } + processParseException(e); } } @@ -227,15 +222,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 @@ -245,7 +240,7 @@ public class PHPParser extends PHPParserSuperclass { } } - public void parse() throws ParseException { + public static final void parse() throws ParseException { phpFile(); } } @@ -254,7 +249,9 @@ PARSER_END(PHPParser) TOKEN : { - : PHPPARSING + : PHPPARSING +| : PHPPARSING +| -SPECIAL_TOKEN : + SPECIAL_TOKEN : +{ + : PHPPARSING +} + + SPECIAL_TOKEN : { - " > : PHPPARSING + " > : DEFAULT } @@ -324,68 +325,72 @@ MORE : | | | +| } /* LANGUAGE CONSTRUCT */ 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 */ @@ -416,20 +421,30 @@ MORE : < STRING_LITERAL: ( | | )> | < STRING_1: "\"" - ( (~["\""]) - | "\\\"" + ( + ~["\""] + | + "\\\"" )* "\"" > | < STRING_2: "'" - ( (~["'"]))* + ( + ~["'"] + | + "\\'" + )* "'" > | < STRING_3: "`" - ( (~["`"]))* + ( + ~["`"] + | + "\\`" + )* "`" > } @@ -449,7 +464,7 @@ MORE : > | < #SPECIAL: - "_" + "_" | ["\u007f"-"\u00ff"] > } @@ -457,74 +472,79 @@ MORE : TOKEN : { - < LPAREN: "(" > -| < RPAREN: ")" > -| < LBRACE: "{" > -| < RBRACE: "}" > -| < LBRACKET: "[" > -| < RBRACKET: "]" > -| < SEMICOLON: ";" > -| < COMMA: "," > -| < DOT: "." > + +| +| +| +| +| +| +| +| } -/* OPERATORS */ +/* COMPARATOR */ TOKEN : { - -| -| < ASSIGN: "=" > -| < GT: ">" > -| < LT: "<" > -| < BANG: "!" > -| < HOOK: "?" > -| < COLON: ":" > -| < EQ: "==" > -| < LE: "<=" > -| < GE: ">=" > -| < NE: "!=" > -| < SC_OR: "||" > -| < SC_AND: "&&" > -| < INCR: "++" > -| < DECR: "--" > -| < PLUS: "+" > -| < MINUS: "-" > -| < STAR: "*" > -| < SLASH: "/" > -| < BIT_AND: "&" > -| < BIT_OR: "|" > -| < XOR: "^" > -| < REM: "%" > -| < LSHIFT: "<<" > -| < RSIGNEDSHIFT: ">>" > -| < RUNSIGNEDSHIFT: ">>>" > -| < PLUSASSIGN: "+=" > -| < MINUSASSIGN: "-=" > -| < STARASSIGN: "*=" > -| < SLASHASSIGN: "/=" > -| < ANDASSIGN: "&=" > -| < ORASSIGN: "|=" > -| < XORASSIGN: "^=" > -| < DOTASSIGN: ".=" > -| < REMASSIGN: "%=" > -| < LSHIFTASSIGN: "<<=" > -| < RSIGNEDSHIFTASSIGN: ">>=" > -| < RUNSIGNEDSHIFTASSIGN: ">>>=" > + "> +| +| +| ="> +| "> +| +| } +/* ASSIGNATION */ TOKEN : { - < DOLLAR_ID: > + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| >"> +| >>"> +| >="> +} -/* - * Program structuring syntax follows. - */ + TOKEN : +{ + < DOLLAR_ID: > +} void phpTest() : {} @@ -536,8 +556,43 @@ void phpTest() : void phpFile() : {} { - ( Php() )* - + try { + (PhpBlock())* + + } catch (TokenMgrError e) { + errorMessage = e.getMessage(); + errorLevel = ERROR; + throw generateParseException(); + } +} + +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() : @@ -548,27 +603,45 @@ void Php() : void ClassDeclaration() : { - PHPClassDeclaration classDeclaration; - Token className; - int pos = jj_input_stream.bufpos; + final PHPClassDeclaration classDeclaration; + final Token className; + final int pos = jj_input_stream.bufpos; } { className = [ ] { - 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(); + } } } void ClassBody() : {} { - ( ClassBodyDeclaration() )* + try { + + } catch (ParseException e) { + errorMessage = "'{' expected"; + errorLevel = ERROR; + throw e; + } + ( ClassBodyDeclaration() )* + try { + + } catch (ParseException e) { + errorMessage = "'var', 'function' or '}' expected"; + errorLevel = ERROR; + throw e; + } } void ClassBodyDeclaration() : @@ -580,352 +653,824 @@ void ClassBodyDeclaration() : } void FieldDeclaration() : -{} { - VariableDeclarator() ( VariableDeclarator() )* + PHPVarDeclaration variableDeclaration; +} +{ + variableDeclaration = VariableDeclarator() + { + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } + } + ( + variableDeclaration = VariableDeclarator() + { + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } + } + )* + try { + + } catch (ParseException e) { + errorMessage = "';' expected after variable declaration"; + errorLevel = ERROR; + throw e; + } } -void VariableDeclarator() : -{} +PHPVarDeclaration VariableDeclarator() : { - VariableDeclaratorId() [ VariableInitializer() ] + final String varName; + String varValue = null; + final int pos = jj_input_stream.bufpos; +} +{ + varName = VariableDeclaratorId() + [ + + try { + varValue = VariableInitializer() + {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} + } catch (ParseException e) { + errorMessage = "Literal expression expected in variable initializer"; + errorLevel = ERROR; + throw e; + } + ] + {return new PHPVarDeclaration(currentSegment,varName,pos);} } -void VariableDeclaratorId() : -{} +String VariableDeclaratorId() : +{ + String expr; + final StringBuffer buff = new StringBuffer(); +} { - Variable() ( LOOKAHEAD(2) VariableSuffix() )* + try { + expr = Variable() + {buff.append(expr);} + ( LOOKAHEAD(2) expr = VariableSuffix() + {buff.append(expr);} + )* + {return buff.toString();} + } catch (ParseException e) { + errorMessage = "'$' expected for variable identifier"; + errorLevel = ERROR; + throw e; + } } -void Variable(): -{} +String Variable(): +{ + String expr = null; + final Token token; +} { - ( Expression() ) * + token = [ expr = Expression() ] + { + if (expr == null) { + return token.image; + } + return token + "{" + expr + "}"; + } | - VariableName() + expr = VariableName() + {return "$" + expr;} } String VariableName(): -{} { - Expression() +String expr = null; +final Token token; +} +{ + expr = Expression() + {return "{"+expr+"}";} +| + token = [ expr = Expression() ] + { + if (expr == null) { + return token.image; + } + return token + "{" + expr + "}"; + } | - ( Expression() ) * + expr = VariableName() + {return "$" + expr;} | - VariableName() + token = [expr = VariableName()] + { + if (expr == null) { + return token.image; + } + return token.image + expr; + } } -void VariableInitializer() : -{} +String VariableInitializer() : { - Expression() + final String expr; + final Token token; +} +{ + expr = Literal() + {return expr;} +| + (token = | token = ) + {return "-" + token.image;} +| + (token = | token = ) + {return "+" + token.image;} +| + expr = ArrayDeclarator() + {return expr;} +| + token = + {return token.image;} } -void ArrayVariable() : -{} +String ArrayVariable() : { - Expression() ( Expression())* +String expr; +final StringBuffer buff = new StringBuffer(); +} +{ + expr = Expression() + {buff.append(expr);} + [ expr = Expression() + {buff.append("=>").append(expr);}] + {return buff.toString();} } -void ArrayInitializer() : -{} +String ArrayInitializer() : +{ +String expr; +final StringBuffer buff = new StringBuffer("("); +} { - [ ArrayVariable() ( LOOKAHEAD(2) ArrayVariable() )* ] + [ expr = ArrayVariable() + {buff.append(expr);} + ( LOOKAHEAD(2) expr = ArrayVariable() + {buff.append(",").append(expr);} + )* ] + + { + buff.append(")"); + return buff.toString(); + } } void MethodDeclaration() : { - PHPFunctionDeclaration functionDeclaration; + final PHPFunctionDeclaration functionDeclaration; } { functionDeclaration = MethodDeclarator() { - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; + if (currentSegment != null) { + currentSegment.add(functionDeclaration); + currentSegment = functionDeclaration; + } } - ( Block() | ) + Block() { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + } } } PHPFunctionDeclaration MethodDeclarator() : { - Token bit_and = null; - 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; } { - [ bit_and = ] - identifier = FormalParameters() + [ {methodDeclaration.append("&");} ] + identifier = + {methodDeclaration.append(identifier);} + formalParameters = FormalParameters() { - if (bit_and != null) { - methodDeclaration.append("&"); - } - methodDeclaration.append(identifier); + methodDeclaration.append(formalParameters); return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos); } } -void FormalParameters() : -{} +String FormalParameters() : { - [ FormalParameter() ( FormalParameter() )* ] + String expr; + final StringBuffer buff = new StringBuffer("("); +} +{ + try { + + } catch (ParseException e) { + errorMessage = "Formal parameter expected after function identifier"; + errorLevel = ERROR; + jj_consume_token(token.kind); + } + [ expr = FormalParameter() + {buff.append(expr);} + ( + expr = FormalParameter() + {buff.append(",").append(expr);} + )* + ] + try { + + } catch (ParseException e) { + errorMessage = "')' expected"; + errorLevel = ERROR; + throw e; + } + { + buff.append(")"); + return buff.toString(); + } } -void FormalParameter() : -{} +String FormalParameter() : { - [] VariableDeclarator() + final PHPVarDeclaration variableDeclaration; + final StringBuffer buff = new StringBuffer(); +} +{ + [ {buff.append("&");}] variableDeclaration = VariableDeclarator() + { + buff.append(variableDeclaration.toString()); + return buff.toString(); + } } -void Type() : +String Type() : {} { + {return "string";} | + {return "bool";} | + {return "boolean";} | + {return "real";} | + {return "double";} | + {return "float";} | + {return "int";} | + {return "integer";} +| + + {return "object";} } -void Expression() : -{} +String Expression() : { - PrintExpression() + final String expr; + final String assignOperator; + final String expr2; +} +{ + expr = PrintExpression() + {return expr;} | - ConditionalExpression() + expr = ConditionalExpression() [ - AssignmentOperator() Expression() + assignOperator = AssignmentOperator() + try { + expr2 = Expression() + {return expr + assignOperator + expr2;} + } catch (ParseException e) { + errorMessage = "expression expected"; + errorLevel = ERROR; + throw e; + } ] + {return expr;} +} + +String AssignmentOperator() : +{} +{ + +{return "=";} +| +{return "*=";} +| +{return "/=";} +| +{return "%=";} +| +{return "+=";} +| +{return "-=";} +| +{return "<<=";} +| +{return ">>=";} +| +{return "&=";} +| +{return "|=";} +| +{return "|=";} +| +{return ".=";} +| +{return "~=";} +} + +String ConditionalExpression() : +{ + final String expr; + String expr2 = null; + String expr3 = null; +} +{ + expr = ConditionalOrExpression() [ expr2 = Expression() expr3 = ConditionalExpression() ] +{ + if (expr3 == null) { + return expr; + } else { + return expr + "?" + expr2 + ":" + expr3; + } +} } -void AssignmentOperator() : -{} +String ConditionalOrExpression() : { - | | | | | | | | | | | | + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); } - -void ConditionalExpression() : -{} { - ConditionalOrExpression() [ Expression() ConditionalExpression() ] + expr = ConditionalAndExpression() + {buff.append(expr);} + ( + (operator = | operator = <_ORL>) expr = ConditionalAndExpression() + { + buff.append(operator.image); + buff.append(expr); + } + )* + { + return buff.toString(); + } } -void ConditionalOrExpression() : -{} +String ConditionalAndExpression() : { - ConditionalAndExpression() ( ( | <_ORL>) ConditionalAndExpression() )* + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); } - -void ConditionalAndExpression() : -{} { - ConcatExpression() ( ( | <_ANDL>) ConcatExpression() )* + expr = ConcatExpression() + {buff.append(expr);} + ( + (operator = | operator = <_ANDL>) expr = ConcatExpression() + { + buff.append(operator.image); + buff.append(expr); + } + )* + {return buff.toString();} } -void ConcatExpression() : -{} +String ConcatExpression() : { - InclusiveOrExpression() ( InclusiveOrExpression() )* + String expr; + final StringBuffer buff = new StringBuffer(); +} +{ + expr = InclusiveOrExpression() + {buff.append(expr);} + ( + expr = InclusiveOrExpression() + {buff.append(".").append(expr);} + )* + {return buff.toString();} } -void InclusiveOrExpression() : -{} +String InclusiveOrExpression() : { - ExclusiveOrExpression() ( ExclusiveOrExpression() )* + String expr; + final StringBuffer buff = new StringBuffer(); +} +{ + expr = ExclusiveOrExpression() + {buff.append(expr);} + ( + expr = ExclusiveOrExpression() + {buff.append("|").append(expr);} + )* + {return buff.toString();} } -void ExclusiveOrExpression() : -{} +String ExclusiveOrExpression() : { - AndExpression() ( AndExpression() )* + String expr; + final StringBuffer buff = new StringBuffer(); +} +{ + expr = AndExpression() + { + buff.append(expr); + } + ( + expr = AndExpression() + { + buff.append("^"); + buff.append(expr); + } + )* + { + return buff.toString(); + } } -void AndExpression() : -{} +String AndExpression() : { - EqualityExpression() ( EqualityExpression() )* + String expr; + final StringBuffer buff = new StringBuffer(); +} +{ + expr = EqualityExpression() + { + buff.append(expr); + } + ( + expr = EqualityExpression() + { + buff.append("&").append(expr); + } + )* + {return buff.toString();} } -void EqualityExpression() : -{} +String EqualityExpression() : { - RelationalExpression() ( ( | ) RelationalExpression() )* + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); +} +{ + expr = RelationalExpression() + {buff.append(expr);} + ( + ( operator = + | operator = + | operator = + | operator = + | operator = + ) + expr = RelationalExpression() + { + buff.append(operator.image); + buff.append(expr); + } + )* + {return buff.toString();} } -void RelationalExpression() : -{} +String RelationalExpression() : +{ + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); +} { - ShiftExpression() ( ( | | | ) ShiftExpression() )* + expr = ShiftExpression() + {buff.append(expr);} + ( + ( operator = | operator = | operator = | operator = ) expr = ShiftExpression() + {buff.append(operator.image).append(expr);} + )* + {return buff.toString();} } -void ShiftExpression() : -{} +String ShiftExpression() : { - AdditiveExpression() ( ( | | ) AdditiveExpression() )* + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); +} +{ + expr = AdditiveExpression() + {buff.append(expr);} + ( + (operator = | operator = | operator = ) expr = AdditiveExpression() + { + buff.append(operator.image); + buff.append(expr); + } + )* + {return buff.toString();} } -void AdditiveExpression() : -{} +String AdditiveExpression() : { - MultiplicativeExpression() ( ( | ) MultiplicativeExpression() )* + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); +} +{ + expr = MultiplicativeExpression() + {buff.append(expr);} + ( + ( operator = | operator = ) expr = MultiplicativeExpression() + { + buff.append(operator.image); + buff.append(expr); + } + )* + {return buff.toString();} } -void MultiplicativeExpression() : -{} +String MultiplicativeExpression() : { - UnaryExpression() ( ( | | ) UnaryExpression() )* + String expr; + Token operator; + final StringBuffer buff = new StringBuffer();} +{ + expr = UnaryExpression() + {buff.append(expr);} + ( + ( operator = | operator = | operator = ) expr = UnaryExpression() + { + buff.append(operator.image); + buff.append(expr); + } + )* + {return buff.toString();} } -void UnaryExpression() : -{} +/** + * An unary expression starting with @, & or nothing + */ +String UnaryExpression() : +{ + final String expr; + final Token token; + final StringBuffer buff = new StringBuffer(); +} { - UnaryExpression() + token = expr = UnaryExpressionNoPrefix() + { + if (token == null) { + return expr; + } + return token.image + expr; + } | - ( | ) UnaryExpression() + ( {buff.append("@");})* expr = UnaryExpressionNoPrefix() + {return buff.append(expr).toString();} +} + +String UnaryExpressionNoPrefix() : +{ + final String expr; + final Token token; +} +{ + ( token = | token = ) expr = UnaryExpression() + { + return token.image + expr; + } | - PreIncrementExpression() + expr = PreIncrementExpression() + {return expr;} | - PreDecrementExpression() + expr = PreDecrementExpression() + {return expr;} | - UnaryExpressionNotPlusMinus() + expr = UnaryExpressionNotPlusMinus() + {return expr;} } -void PreIncrementExpression() : -{} + +String PreIncrementExpression() : { - PrimaryExpression() +final String expr; +} +{ + expr = PrimaryExpression() + {return "++"+expr;} } -void PreDecrementExpression() : -{} +String PreDecrementExpression() : +{ +final String expr; +} { - PrimaryExpression() + expr = PrimaryExpression() + {return "--"+expr;} } -void UnaryExpressionNotPlusMinus() : -{} +String UnaryExpressionNotPlusMinus() : +{ + final String expr; +} { - UnaryExpression() + expr = UnaryExpression() + {return "!" + expr;} | LOOKAHEAD( Type() ) - CastExpression() + expr = CastExpression() + {return expr;} | - PostfixExpression() + expr = PostfixExpression() + {return expr;} | - Literal() + expr = Literal() + {return expr;} | - Expression() + expr = Expression() + {return "("+expr+")";} } -void CastExpression() : -{} +String CastExpression() : +{ +final String type, expr; +} { - Type() UnaryExpression() + type = Type() expr = UnaryExpression() + {return "(" + type + ")" + expr;} } -void PostfixExpression() : -{} +String PostfixExpression() : { - PrimaryExpression() [ | ] + final String expr; + Token operator = null; +} +{ + expr = PrimaryExpression() [ operator = | operator = ] + { + if (operator == null) { + return expr; + } + return expr + operator.image; + } } -void PrimaryExpression() : -{} +String PrimaryExpression() : +{ + final Token identifier; + String expr; + final StringBuffer buff = new StringBuffer(); +} { LOOKAHEAD(2) - ClassIdentifier() (PrimarySuffix())* + identifier = expr = ClassIdentifier() + {buff.append(identifier.image).append("::").append(expr);} + ( + expr = PrimarySuffix() + {buff.append(expr);} + )* + {return buff.toString();} | - PrimaryPrefix() ( PrimarySuffix() )* + expr = PrimaryPrefix() {buff.append(expr);} + ( expr = PrimarySuffix() {buff.append(expr);} )* + {return buff.toString();} | - ArrayInitializer() + expr = ArrayDeclarator() + {return "array" + expr;} } -void PrimaryPrefix() : -{} +String ArrayDeclarator() : +{ + final String expr; +} { - + expr = ArrayInitializer() + {return "array" + expr;} +} + +String PrimaryPrefix() : +{ + final String expr; + final Token token; +} +{ + token = + {return token.image;} | - [] ClassIdentifier() + expr = ClassIdentifier() + { + return "new " + expr; + } | - VariableDeclaratorId() + expr = VariableDeclaratorId() + {return expr;} } -void ClassIdentifier(): -{} +String ClassIdentifier(): { - + final String expr; + final Token token; +} +{ + token = + {return token.image;} | - VariableDeclaratorId() + expr = VariableDeclaratorId() + {return expr;} } -void PrimarySuffix() : -{} +String PrimarySuffix() : +{ + final String expr; +} { - Arguments() + expr = Arguments() + {return expr;} | - VariableSuffix() + expr = VariableSuffix() + {return expr;} } -void VariableSuffix() : -{} +String VariableSuffix() : +{ + String expr = null; +} { - VariableName() + expr = VariableName() + {return "->" + expr;} | - [ Expression() ] + [ expr = Expression() ] + try { + + } catch (ParseException e) { + errorMessage = "']' expected"; + errorLevel = ERROR; + throw e; + } + { + if(expr == null) { + return "[]"; + } + return "[" + expr + "]"; + } } -void Literal() : -{} +String Literal() : +{ + final String expr; + final Token token; +} { - + token = + {return token.image;} | - + token = + {return token.image;} | - try { - - } catch (TokenMgrError e) { - errorMessage = "unterminated string"; - errorLevel = ERROR; - throw generateParseException(); - } + token = + {return token.image;} | - BooleanLiteral() + expr = BooleanLiteral() + {return expr;} | - NullLiteral() + expr = NullLiteral() + {return expr;} } -void BooleanLiteral() : +String BooleanLiteral() : {} { + {return "true";} | + {return "false";} } -void NullLiteral() : +String NullLiteral() : {} { + {return "null";} } -void Arguments() : -{} +String Arguments() : +{ +String expr = null; +} { - [ ArgumentList() ] + [ expr = ArgumentList() ] try { } catch (ParseException e) { @@ -933,21 +1478,35 @@ void Arguments() : errorLevel = ERROR; throw e; } + { + if (expr == null) { + return "()"; + } + return "(" + expr + ")"; + } } -void ArgumentList() : -{} +String ArgumentList() : { - Expression() +String expr; +final StringBuffer buff = new StringBuffer(); +} +{ + expr = Expression() + {buff.append(expr);} ( try { - Expression() + expr = Expression() } catch (ParseException e) { errorMessage = "expression expected after a comma in argument list"; errorLevel = ERROR; throw e; } + { + buff.append(",").append(expr); + } )* + {return buff.toString();} } /* @@ -958,7 +1517,14 @@ void Statement() : {} { LOOKAHEAD(2) - Expression() ( | "?>") + Expression() + try { + ( | ) + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | LOOKAHEAD(2) LabeledStatement() @@ -986,6 +1552,8 @@ void Statement() : | ForStatement() | + ForeachStatement() +| BreakStatement() | ContinueStatement() @@ -994,7 +1562,7 @@ void Statement() : | EchoStatement() | - IncludeStatement() + [] IncludeStatement() | StaticStatement() | @@ -1002,21 +1570,83 @@ void Statement() : } void IncludeStatement() : -{} { - Expression() ( | "?>") + final String expr; + final int pos = jj_input_stream.bufpos; +} +{ + + expr = Expression() + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr)); + } + } + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | - Expression() ( | "?>") + + expr = Expression() + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr)); + } + } + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | - Expression() ( | "?>") + + expr = Expression() + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr)); + } + } + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } | - Expression() ( | "?>") + + expr = Expression() + { + if (currentSegment != null) { + currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr)); + } + } + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } } -void PrintExpression() : -{} +String PrintExpression() : +{ + final StringBuffer buff = new StringBuffer("print "); + final String expr; +} { - Expression() + expr = Expression() + { + buff.append(expr); + return buff.toString(); + } } void EchoStatement() : @@ -1035,13 +1665,27 @@ void EchoStatement() : void GlobalStatement() : {} { - VariableDeclaratorId() ( VariableDeclaratorId())* ( | "?>") + VariableDeclaratorId() ( VariableDeclaratorId())* + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } } void StaticStatement() : {} { - VariableDeclarator() ( VariableDeclarator())* ( | "?>") + VariableDeclarator() ( VariableDeclarator())* + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } } void LabeledStatement() : @@ -1053,7 +1697,15 @@ void LabeledStatement() : void Block() : {} { - ( BlockStatement() )* + try { + + } catch (ParseException e) { + errorMessage = "'{' expected"; + errorLevel = ERROR; + throw e; + } + ( BlockStatement() )* + } void BlockStatement() : @@ -1069,7 +1721,13 @@ void BlockStatement() : void LocalVariableDeclaration() : {} { - VariableDeclarator() ( VariableDeclarator() )* + LocalVariableDeclarator() ( LocalVariableDeclarator() )* +} + +void LocalVariableDeclarator() : +{} +{ + VariableDeclaratorId() [ Expression() ] } void EmptyStatement() : @@ -1079,11 +1737,6 @@ void EmptyStatement() : } void StatementExpression() : -/* - * The last expansion of this production accepts more than the legal - * Java expansions for StatementExpression. This expansion does not - * use PostfixExpression for performance reasons. - */ {} { PreIncrementExpression() @@ -1117,17 +1770,15 @@ void SwitchLabel() : } 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 { @@ -1147,6 +1798,52 @@ 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 'endif' keyword"; + errorLevel = ERROR; + throw e; + } +| + Statement() ( LOOKAHEAD(1) ElseIfStatement() )* [ LOOKAHEAD(1) Statement() ] +} + +void ElseIfStatementColon() : +{} +{ + Condition("elseif") (Statement())* +} + +void ElseStatementColon() : +{} +{ + (Statement())* +} + void ElseIfStatement() : {} { @@ -1154,15 +1851,42 @@ 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 = "'endwhile' expected"; + errorLevel = ERROR; + throw e; + } + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected after 'endwhile' keyword"; + errorLevel = ERROR; + throw e; + } | Statement() } @@ -1170,13 +1894,113 @@ void WhileStatement0() : void DoStatement() : {} { - Statement() Condition("while") ( | "?>") + Statement() Condition("while") + try { + ( | "?>") + } catch (ParseException e) { + errorMessage = "';' expected"; + errorLevel = ERROR; + throw e; + } +} + +void ForeachStatement() : +{} +{ + + 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() : -{} { - [ ForInit() ] [ Expression() ] [ ForUpdate() ] Statement() +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() ] [ ForUpdate() ] + ( + 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 'endfor' keyword"; + errorLevel = ERROR; + throw e; + } + ) } void ForInit() :