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 a6bce7c..7c68a46 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. @@ -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; @@ -104,45 +103,33 @@ 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 + */ + private static void setMarker(ParseException e) { + try { + setMarker(fileToParse, errorMessage, jj_input_stream.tokenBegin,jj_input_stream.tokenBegin+e.currentToken.image.length(), errorLevel); + } catch (CoreException e2) { + PHPeclipsePlugin.log(e2); } } @@ -214,12 +201,7 @@ 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); } } @@ -568,7 +550,21 @@ void ClassDeclaration() : 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,23 +576,50 @@ void ClassBodyDeclaration() : } void FieldDeclaration() : -{} { - VariableDeclarator() ( VariableDeclarator() )* + PHPVarDeclaration variableDeclaration; +} +{ + variableDeclaration = VariableDeclarator() + {currentSegment.add(variableDeclaration);} + ( + variableDeclaration = VariableDeclarator() + {currentSegment.add(variableDeclaration);} + )* + try { + + } catch (ParseException e) { + errorMessage = "';' expected after variable declaration"; + errorLevel = ERROR; + throw e; + } } -String VariableDeclarator() : +PHPVarDeclaration VariableDeclarator() : { - String expr; - StringBuffer buff = new StringBuffer(); + String varName; + String varValue = null; + int pos; } { - expr = VariableDeclaratorId() - {buff.append(expr);} - [ expr = VariableInitializer() - {buff.append("=").append(expr);} + varName = VariableDeclaratorId() + {pos = jj_input_stream.tokenBegin;} + [ + + try { + varValue = VariableInitializer() + } catch (ParseException e) { + errorMessage = "Literal expression expected in variable initializer"; + errorLevel = ERROR; + throw e; + } ] - {return buff.toString();} + { + if (varValue == null) { + return new PHPVarDeclaration(currentSegment,varName,pos); + } + return new PHPVarDeclaration(currentSegment,varName,pos,varValue); + } } String VariableDeclaratorId() : @@ -605,12 +628,18 @@ String VariableDeclaratorId() : StringBuffer buff = new StringBuffer(); } { - expr = Variable() - {buff.append(expr);} - ( LOOKAHEAD(2) expr = VariableSuffix() - {buff.append(expr);} - )* - {return buff.toString();} + 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; + } } String Variable(): @@ -646,9 +675,18 @@ Token token; return token.image; } return token + "{" + expr + "}"; - }| + } +| expr = VariableName() {return "$" + expr;} +| + token = [expr = VariableName()] + { + if (expr == null) { + return token.image; + } + return token.image + expr; + } } String VariableInitializer() : @@ -656,7 +694,7 @@ String VariableInitializer() : String expr; } { - expr = Expression() + expr = Literal() {return expr;} } @@ -701,7 +739,7 @@ void MethodDeclaration() : currentSegment.add(functionDeclaration); currentSegment = functionDeclaration; } - ( Block() | ) + Block() { currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); } @@ -715,10 +753,12 @@ PHPFunctionDeclaration MethodDeclarator() : int pos = jj_input_stream.bufpos; } { - [ {methodDeclaration.append("&");}] - identifier = formalParameters = FormalParameters() + [ {methodDeclaration.append("&");} ] + identifier = + {methodDeclaration.append(identifier);} + formalParameters = FormalParameters() { - methodDeclaration.append(identifier).append(formalParameters); + methodDeclaration.append(formalParameters); return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos); } } @@ -726,13 +766,30 @@ PHPFunctionDeclaration MethodDeclarator() : String FormalParameters() : { String expr; - StringBuffer buff = new StringBuffer("("); + final StringBuffer buff = new StringBuffer("("); } { - [ expr = FormalParameter() {buff.append(expr);} - ( expr = FormalParameter() - {buff.append(",").append(expr);} - )* ] + 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(); @@ -741,13 +798,13 @@ String FormalParameters() : String FormalParameter() : { - String expr; + PHPVarDeclaration variableDeclaration; StringBuffer buff = new StringBuffer(); } { - [ {buff.append("&");}] expr = VariableDeclarator() + [ {buff.append("&");}] variableDeclaration = VariableDeclarator() { - buff.append(expr); + buff.append(variableDeclaration.toString()); return buff.toString(); } } @@ -1076,10 +1133,9 @@ String AdditiveExpression() : String MultiplicativeExpression() : { - String expr; + String expr, expr2; Token operator; - String expr2; - StringBuffer buff = new StringBuffer();} + final StringBuffer buff = new StringBuffer();} { expr = UnaryExpression() {buff.append(expr);} @@ -1096,7 +1152,7 @@ String MultiplicativeExpression() : String UnaryExpression() : { String expr; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { expr = UnaryExpression() @@ -1115,7 +1171,7 @@ String UnaryExpression() : {return expr;} | expr = UnaryExpressionNotPlusMinus() - {return buff.toString();} + {return expr;} } String PreIncrementExpression() : @@ -1187,7 +1243,7 @@ String PrimaryExpression() : { Token identifier; String expr; - StringBuffer buff = new StringBuffer(); + final StringBuffer buff = new StringBuffer(); } { LOOKAHEAD(2) @@ -1199,12 +1255,8 @@ String PrimaryExpression() : )* {return buff.toString();} | - expr = PrimaryPrefix() - {buff.append(expr);} - ( - expr = PrimarySuffix() - {buff.append(expr);} - )* + expr = PrimaryPrefix() {buff.append(expr);} + ( expr = PrimarySuffix() {buff.append(expr);} )* {return buff.toString();} | expr = ArrayInitializer() @@ -1225,7 +1277,7 @@ String PrimaryPrefix() : if (token == null) { return "new " + expr; } - return "new " + expr; + return "new &" + expr; } | expr = VariableDeclaratorId() @@ -1407,7 +1459,7 @@ void Statement() : | EchoStatement() | - IncludeStatement() + [] IncludeStatement() | StaticStatement() | @@ -1415,15 +1467,35 @@ void Statement() : } void IncludeStatement() : -{} { - Expression() ( | "?>") + Token token; + String expr; + int pos; +} +{ + token = + {pos = token.beginLine;} + expr = Expression() + {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr));} + ( | "?>") | - Expression() ( | "?>") + token = + {pos = token.beginLine;} + expr = Expression() + {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr));} + ( | "?>") | - Expression() ( | "?>") + token = + {pos = token.beginLine;} + expr = Expression() + {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr));} + ( | "?>") | - Expression() ( | "?>") + token = + {pos = token.beginLine;} + expr = Expression() + {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr));} + ( | "?>") } String PrintExpression() : @@ -1473,7 +1545,15 @@ void LabeledStatement() : void Block() : {} { - ( BlockStatement() )* + try { + + } catch (ParseException e) { + errorMessage = "'{' expected"; + errorLevel = ERROR; + throw e; + } + ( BlockStatement() )* + } void BlockStatement() :