X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index a6b5489..bc7c112 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -8,145 +8,170 @@ import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; +import java.util.Enumeration; import java.io.StringReader; +import java.io.*; import java.text.MessageFormat; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; +import net.sourceforge.phpdt.internal.compiler.parser.*; +import net.sourceforge.phpdt.internal.compiler.ast.*; /** * A new php parser. - * This php parser is inspired by the Java 1.2 grammar example + * This php parser is inspired by the Java 1.2 grammar example * given with JavaCC. You can get JavaCC at http://www.webgain.com * You can test the parser with the PHPParserTestCase2.java * @author Matthieu Casanova */ -public class PHPParser extends PHPParserSuperclass implements PHPParserConstants { - - private static PHPParser me; +public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants { + /** The file that is parsed. */ private static IFile fileToParse; + /** The current segment. */ + private static PHPSegmentWithChildren currentSegment; + 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; + static PHPOutlineInfo outlineInfo; + + private static PHPFunctionDeclaration currentFunction; + 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 */ private static String errorMessage; - public PHPParser() { - } + private static int errorStart = -1; + private static int errorEnd = -1; - public static PHPParser getInstance(IFile fileToParse) { - if (me == null) { - me = new PHPParser(fileToParse); - } else { - me.setFileToParse(fileToParse); - } - return me; - } + //ast stack + private final static int AstStackIncrement = 100; + /** The stack of node. */ + private static AstNode[] astStack; + /** The cursor in expression stack. */ + private static int expressionPtr; - public void setFileToParse(IFile fileToParse) { + public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; } - public static PHPParser getInstance(java.io.Reader stream) { - if (me == null) { - me = new PHPParser(stream); - } else { - me.ReInit(stream); - } - return me; + public PHPParser() { } - 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); } ReInit(new StringReader(strEval)); + astStack = new AstNode[AstStackIncrement]; phpTest(); } - public void htmlParserTester(String strEval) throws CoreException, ParseException { - StringReader stream = new StringReader(strEval); + public static final void htmlParserTester(final File fileName) throws CoreException, ParseException { + try { + final Reader stream = new FileReader(fileName); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); + astStack = new AstNode[AstStackIncrement]; + phpFile(); + } catch (FileNotFoundException e) { + e.printStackTrace(); //To change body of catch statement use Options | File Templates. + } + } + + 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); } ReInit(stream); + astStack = new AstNode[AstStackIncrement]; phpFile(); } - public PHPOutlineInfo parseInfo(Object parent, String s) { + public final PHPOutlineInfo parseInfo(final Object parent, final String s) { outlineInfo = new PHPOutlineInfo(parent); - StringReader stream = new StringReader(s); + currentSegment = outlineInfo.getDeclarations(); + final StringReader stream = new StringReader(s); if (jj_input_stream == null) { jj_input_stream = new SimpleCharStream(stream, 1, 1); } ReInit(stream); + astStack = new AstNode[AstStackIncrement]; 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"; + errorStart = jj_input_stream.getPosition(); + errorEnd = errorStart + 1; } + 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; + /** + * Create marker for the parse error + * @param e the ParseException + */ + private static void setMarker(final ParseException e) { + try { + 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; } - MarkerUtilities.setLineNumber(attributes, lineNumber); - MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); + } 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) @@ -163,7 +188,10 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } } - 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,12 +229,17 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } } - 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); + astStack = new AstNode[AstStackIncrement]; try { parse(); } catch (ParseException e) { - PHPeclipsePlugin.log(e); + processParseException(e); } } @@ -214,15 +247,15 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants * 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,38 +265,199 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } } - public void parse() throws ParseException { + private static final void parse() throws ParseException { phpFile(); } -/***************************************** - * THE JAVA LANGUAGE GRAMMAR STARTS HERE * - *****************************************/ - -/* - * Program structuring syntax follows. - */ static final public void phpTest() throws ParseException { Php(); jj_consume_token(0); } static final public void phpFile() throws ParseException { - label_1: - while (true) { + try { + label_1: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTSHORT: + case PHPSTARTLONG: + case PHPECHOSTART: + case PHPEND: + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + ; + break; + default: + jj_la1[0] = jj_gen; + break label_1; + } + PhpBlock(); + } + jj_consume_token(0); + } catch (TokenMgrError e) { + PHPeclipsePlugin.log(e); + errorStart = SimpleCharStream.getPosition(); + errorEnd = errorStart + 1; + errorMessage = e.getMessage(); + errorLevel = ERROR; + {if (true) throw generateParseException();} + } + } + +/** + * A php block is a + * or + * or + */ + static final public void PhpBlock() throws ParseException { + final int start = jj_input_stream.getPosition(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPECHOSTART: + phpEchoBlock(); + break; + case PHPSTARTSHORT: + case PHPSTARTLONG: + case PHPEND: + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PHPSTART: - ; + case PHPSTARTSHORT: + case PHPSTARTLONG: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTLONG: + jj_consume_token(PHPSTARTLONG); + break; + case PHPSTARTSHORT: + jj_consume_token(PHPSTARTSHORT); + try { + setMarker(fileToParse, + "You should use '' expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + break; + default: + jj_la1[3] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } - jj_consume_token(0); + } + + static final public void phpEchoBlock() throws ParseException { + jj_consume_token(PHPECHOSTART); + Expression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + default: + jj_la1[4] = jj_gen; + ; + } + jj_consume_token(PHPEND); } static final public void Php() throws ParseException { @@ -274,6 +468,8 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case FUNCTION: case IF: case ARRAY: + case BREAK: + case LIST: case PRINT: case ECHO: case INCLUDE: @@ -282,17 +478,17 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case REQUIRE_ONCE: case GLOBAL: case STATIC: - case BREAK: case CONTINUE: case DO: - case FALSE: case FOR: case NEW: case NULL: case RETURN: case SWITCH: case TRUE: + case FALSE: case WHILE: + case FOREACH: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -307,11 +503,12 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case DECR: case PLUS: case MINUS: + case BIT_AND: case DOLLAR_ID: ; break; default: - jj_la1[1] = jj_gen; + jj_la1[5] = jj_gen; break label_2; } BlockStatement(); @@ -319,22 +516,58 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants } static final public void ClassDeclaration() throws ParseException { + final PHPClassDeclaration classDeclaration; + final Token className; + final int pos; jj_consume_token(CLASS); - jj_consume_token(IDENTIFIER); + try { + pos = jj_input_stream.getPosition(); + className = jj_consume_token(IDENTIFIER); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EXTENDS: jj_consume_token(EXTENDS); - jj_consume_token(IDENTIFIER); + try { + jj_consume_token(IDENTIFIER); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } break; default: - jj_la1[2] = jj_gen; + jj_la1[6] = jj_gen; ; } + if (currentSegment != null) { + classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); + currentSegment.add(classDeclaration); + currentSegment = classDeclaration; + } ClassBody(); + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); + } } static final public void ClassBody() throws ParseException { - jj_consume_token(LBRACE); + try { + jj_consume_token(LBRACE); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } label_3: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -343,14 +576,25 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[3] = jj_gen; + jj_la1[7] = jj_gen; break label_3; } ClassBodyDeclaration(); } - jj_consume_token(RBRACE); + try { + jj_consume_token(RBRACE); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', 'var', 'function' or '}' expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } } +/** + * A class can contain only methods and fields. + */ static final public void ClassBodyDeclaration() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FUNCTION: @@ -360,15 +604,23 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants FieldDeclaration(); break; default: - jj_la1[4] = jj_gen; + jj_la1[8] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } +/** + * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;. + */ static final public void FieldDeclaration() throws ParseException { + PHPVarDeclaration variableDeclaration; jj_consume_token(VAR); - VariableDeclarator(); + variableDeclaration = VariableDeclarator(); + outlineInfo.addVariable(variableDeclaration.getVariable().getName()); + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -376,136 +628,273 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[5] = jj_gen; + jj_la1[9] = jj_gen; break label_4; } jj_consume_token(COMMA); - VariableDeclarator(); + variableDeclaration = VariableDeclarator(); + if (currentSegment != null) { + currentSegment.add(variableDeclaration); + } + } + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} } - jj_consume_token(SEMICOLON); } - static final public void VariableDeclarator() throws ParseException { - VariableDeclaratorId(); + static final public PHPVarDeclaration VariableDeclarator() throws ParseException { + final String varName, varValue; + final int pos = jj_input_stream.getPosition(); + varName = VariableDeclaratorId(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); - VariableInitializer(); + try { + varValue = VariableInitializer(); + {if (true) return new PHPVarDeclaration(currentSegment,varName,pos,varValue);} + } catch (ParseException e) { + errorMessage = "Literal expression expected in variable initializer"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } break; default: - jj_la1[6] = jj_gen; + jj_la1[10] = jj_gen; ; } + {if (true) return new PHPVarDeclaration(currentSegment,varName,pos);} + throw new Error("Missing return statement in function"); } - static final public void VariableDeclaratorId() throws ParseException { - Variable(); - label_5: - while (true) { - if (jj_2_1(2)) { - ; - } else { - break label_5; + static final public String VariableDeclaratorId() throws ParseException { + String expr; + final StringBuffer buff = new StringBuffer(); + try { + expr = Variable(); + buff.append(expr); + label_5: + while (true) { + if (jj_2_1(2)) { + ; + } else { + break label_5; + } + expr = VariableSuffix(); + buff.append(expr); } - VariableSuffix(); + {if (true) return buff.toString();} + } catch (ParseException e) { + errorMessage = "'$' expected for variable identifier"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} } + throw new Error("Missing return statement in function"); } - static final public void Variable() throws ParseException { + static final public String Variable() throws ParseException { + String expr = null; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR_ID: - jj_consume_token(DOLLAR_ID); - label_6: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACE: - ; - break; - default: - jj_la1[7] = jj_gen; - break label_6; - } + token = jj_consume_token(DOLLAR_ID); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACE: jj_consume_token(LBRACE); - Expression(); + expr = Expression(); jj_consume_token(RBRACE); + break; + default: + jj_la1[11] = jj_gen; + ; + } + if (expr == null && !assigning) { + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); + if (var != null) { + var.getVariable().setUsed(true); + } } + {if (true) return token.image.substring(1);} + } + {if (true) return token + "{" + expr + "}";} break; case DOLLAR: jj_consume_token(DOLLAR); - VariableName(); + expr = VariableName(); + {if (true) return expr;} break; default: - jj_la1[8] = jj_gen; + jj_la1[12] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void VariableName() throws ParseException { + static final public String VariableName() throws ParseException { +String expr = null; +final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: jj_consume_token(LBRACE); - Expression(); + expr = Expression(); jj_consume_token(RBRACE); + {if (true) return "{"+expr+"}";} break; case IDENTIFIER: - jj_consume_token(IDENTIFIER); - label_7: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACE: - ; - break; - default: - jj_la1[9] = jj_gen; - break label_7; - } + token = jj_consume_token(IDENTIFIER); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACE: jj_consume_token(LBRACE); - Expression(); + expr = Expression(); jj_consume_token(RBRACE); + break; + default: + jj_la1[13] = jj_gen; + ; + } + if (expr == null) { + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image); + if (var != null) { + var.getVariable().setUsed(true); + } } + {if (true) return token.image;} + } + {if (true) return token + "{" + expr + "}";} break; case DOLLAR: jj_consume_token(DOLLAR); - VariableName(); + expr = VariableName(); + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(expr); + if (var != null) { + var.getVariable().setUsed(true); + } + } + {if (true) return "$" + expr;} + break; + case DOLLAR_ID: + token = jj_consume_token(DOLLAR_ID); + if (currentFunction != null) { + PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); + if (var != null) { + var.getVariable().setUsed(true); + } + } + {if (true) return token.image + expr;} break; default: - jj_la1[10] = jj_gen; + jj_la1[14] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void VariableInitializer() throws ParseException { - Expression(); - } - - static final public void ArrayVariable() throws ParseException { - Expression(); - label_8: - while (true) { + static final public String VariableInitializer() throws ParseException { + final String expr; + final Token token; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + expr = Literal(); + {if (true) return expr;} + break; + case MINUS: + jj_consume_token(MINUS); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAYASSIGN: - ; + case INTEGER_LITERAL: + token = jj_consume_token(INTEGER_LITERAL); + break; + case FLOATING_POINT_LITERAL: + token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[11] = jj_gen; - break label_8; + jj_la1[15] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } + {if (true) return "-" + token.image;} + break; + case PLUS: + jj_consume_token(PLUS); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INTEGER_LITERAL: + token = jj_consume_token(INTEGER_LITERAL); + break; + case FLOATING_POINT_LITERAL: + token = jj_consume_token(FLOATING_POINT_LITERAL); + break; + default: + jj_la1[16] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + {if (true) return "+" + token.image;} + break; + case ARRAY: + expr = ArrayDeclarator(); + {if (true) return expr;} + break; + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + {if (true) return token.image;} + break; + default: + jj_la1[17] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + throw new Error("Missing return statement in function"); + } + + static final public String ArrayVariable() throws ParseException { +String expr; +final StringBuffer buff = new StringBuffer(); + expr = Expression(); + buff.append(expr); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAYASSIGN: jj_consume_token(ARRAYASSIGN); - Expression(); + expr = Expression(); + buff.append("=>").append(expr); + break; + default: + jj_la1[18] = jj_gen; + ; } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void ArrayInitializer() throws ParseException { + static final public String ArrayInitializer() throws ParseException { +String expr; +final StringBuffer buff = new StringBuffer("("); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: + case LIST: case PRINT: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -518,251 +907,412 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case DECR: case PLUS: case MINUS: + case BIT_AND: case DOLLAR_ID: - ArrayVariable(); - label_9: + expr = ArrayVariable(); + buff.append(expr); + label_6: while (true) { if (jj_2_2(2)) { ; } else { - break label_9; + break label_6; } jj_consume_token(COMMA); - ArrayVariable(); + expr = ArrayVariable(); + buff.append(",").append(expr); } break; default: - jj_la1[12] = jj_gen; + jj_la1[19] = jj_gen; + ; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + jj_consume_token(COMMA); + buff.append(","); + break; + default: + jj_la1[20] = jj_gen; ; } jj_consume_token(RPAREN); + buff.append(")"); + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } +/** + * A Method Declaration. + * function MetodDeclarator() Block() + */ static final public void MethodDeclaration() throws ParseException { - jj_consume_token(FUNCTION); - MethodDeclarator(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACE: - Block(); - break; - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - default: - jj_la1[13] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + final PHPFunctionDeclaration functionDeclaration; + Token functionToken; + functionToken = jj_consume_token(FUNCTION); + try { + functionDeclaration = MethodDeclarator(); + outlineInfo.addVariable(functionDeclaration.getName()); + } catch (ParseException e) { + if (errorMessage != null) { + {if (true) throw e;} + } + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + if (currentSegment != null) { + currentSegment.add(functionDeclaration); + currentSegment = functionDeclaration; + } + currentFunction = functionDeclaration; + Block(); + Hashtable parameters = currentFunction.getParameters(); + Enumeration vars = parameters.elements(); + while (vars.hasMoreElements()) { + PHPVarDeclaration o = (PHPVarDeclaration) vars.nextElement(); + if (!o.getVariable().isUsed()) { + try { + setMarker(fileToParse, + "Parameter "+o.getVariable().getName()+" is never used in function", + functionToken.beginLine, + WARNING, + "Line " + token.beginLine); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } + } + currentFunction = null; + if (currentSegment != null) { + currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); } } - static final public void MethodDeclarator() throws ParseException { +/** + * A MethodDeclarator. + * [&] IDENTIFIER(parameters ...). + * @return a function description for the outline + */ + static final public PHPFunctionDeclaration MethodDeclarator() throws ParseException { + final Token identifier; + final StringBuffer methodDeclaration = new StringBuffer(); + final Hashtable formalParameters; + final int pos = jj_input_stream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: jj_consume_token(BIT_AND); + methodDeclaration.append("&"); break; default: - jj_la1[14] = jj_gen; + jj_la1[21] = jj_gen; ; } - jj_consume_token(IDENTIFIER); - FormalParameters(); + identifier = jj_consume_token(IDENTIFIER); + formalParameters = FormalParameters(); + methodDeclaration.append(identifier); + {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters);} + throw new Error("Missing return statement in function"); } - static final public void FormalParameters() throws ParseException { - jj_consume_token(LPAREN); +/** + * FormalParameters follows method identifier. + * (FormalParameter()) + */ + static final public Hashtable FormalParameters() throws ParseException { + String expr; + final StringBuffer buff = new StringBuffer("("); + PHPVarDeclaration var; + final Hashtable parameters = new Hashtable(); + try { + jj_consume_token(LPAREN); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR: case BIT_AND: case DOLLAR_ID: - FormalParameter(); - label_10: + var = FormalParameter(); + parameters.put(var.getVariable().getName(),var); + label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[15] = jj_gen; - break label_10; + jj_la1[22] = jj_gen; + break label_7; } jj_consume_token(COMMA); - FormalParameter(); + var = FormalParameter(); + parameters.put(var.getVariable().getName(),var); } break; default: - jj_la1[16] = jj_gen; + jj_la1[23] = jj_gen; ; } - jj_consume_token(RPAREN); + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { + errorMessage = "')' expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + {if (true) return parameters;} + throw new Error("Missing return statement in function"); } - static final public void FormalParameter() throws ParseException { +/** + * A formal parameter. + * $varname[=value] (,$varname[=value]) + */ + static final public PHPVarDeclaration FormalParameter() throws ParseException { + final PHPVarDeclaration variableDeclaration; + Token token = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: - jj_consume_token(BIT_AND); + token = jj_consume_token(BIT_AND); break; default: - jj_la1[17] = jj_gen; + jj_la1[24] = jj_gen; ; } - VariableDeclarator(); + variableDeclaration = VariableDeclarator(); + if (token != null) { + variableDeclaration.getVariable().setReference(true); + } + {if (true) return variableDeclaration;} + throw new Error("Missing return statement in function"); } - static final public void Type() throws ParseException { + static final public String Type() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STRING: jj_consume_token(STRING); + {if (true) return "string";} break; case BOOL: jj_consume_token(BOOL); + {if (true) return "bool";} break; case BOOLEAN: jj_consume_token(BOOLEAN); + {if (true) return "boolean";} break; case REAL: jj_consume_token(REAL); + {if (true) return "real";} break; case DOUBLE: jj_consume_token(DOUBLE); + {if (true) return "double";} break; case FLOAT: jj_consume_token(FLOAT); + {if (true) return "float";} break; case INT: jj_consume_token(INT); + {if (true) return "int";} break; case INTEGER: jj_consume_token(INTEGER); + {if (true) return "integer";} + break; + case OBJECT: + jj_consume_token(OBJECT); + {if (true) return "object";} break; default: - jj_la1[18] = jj_gen; + jj_la1[25] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } -/* - * Expression syntax follows. - */ - static final public void Expression() throws ParseException { + static final public String Expression() throws ParseException { + final String expr; + final String assignOperator; + final String expr2; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PRINT: - PrintExpression(); + expr = PrintExpression(); + {if (true) return expr;} break; - case ARRAY: - case FALSE: - case NEW: - case NULL: - case TRUE: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case AT: - case DOLLAR: - case BANG: - case INCR: - case DECR: - case PLUS: - case MINUS: - case DOLLAR_ID: - ConditionalExpression(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ASSIGN: - case PLUSASSIGN: - case MINUSASSIGN: - case STARASSIGN: - case SLASHASSIGN: - case ANDASSIGN: - case ORASSIGN: - case XORASSIGN: - case DOTASSIGN: - case REMASSIGN: - case LSHIFTASSIGN: - case RSIGNEDSHIFTASSIGN: - case RUNSIGNEDSHIFTASSIGN: - AssignmentOperator(); - Expression(); - break; - default: - jj_la1[19] = jj_gen; - ; - } + case LIST: + expr = ListExpression(); + {if (true) return expr;} break; default: - jj_la1[20] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + jj_la1[26] = jj_gen; + if (jj_2_3(2147483647)) { + expr = varAssignation(); + {if (true) return expr;} + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case NEW: + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + expr = ConditionalExpression(); + {if (true) return expr;} + break; + default: + jj_la1[27] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + } + throw new Error("Missing return statement in function"); + } + +/** + * A Variable assignation. + * varName (an assign operator) any expression + */ + static final public String varAssignation() throws ParseException { + String varName,assignOperator,expr2; + PHPVarDeclaration variable; + final int pos = SimpleCharStream.getPosition(); + varName = VariableDeclaratorId(); + assignOperator = AssignmentOperator(); + try { + expr2 = Expression(); + } catch (ParseException e) { + if (errorMessage != null) { + {if (true) throw e;} + } + errorMessage = "expression expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} } + {if (true) return varName + assignOperator + expr2;} + throw new Error("Missing return statement in function"); } - static final public void AssignmentOperator() throws ParseException { + static final public String AssignmentOperator() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); + {if (true) return "=";} break; case STARASSIGN: jj_consume_token(STARASSIGN); + {if (true) return "*=";} break; case SLASHASSIGN: jj_consume_token(SLASHASSIGN); + {if (true) return "/=";} break; case REMASSIGN: jj_consume_token(REMASSIGN); + {if (true) return "%=";} break; case PLUSASSIGN: jj_consume_token(PLUSASSIGN); + {if (true) return "+=";} break; case MINUSASSIGN: jj_consume_token(MINUSASSIGN); + {if (true) return "-=";} break; case LSHIFTASSIGN: jj_consume_token(LSHIFTASSIGN); + {if (true) return "<<=";} break; case RSIGNEDSHIFTASSIGN: jj_consume_token(RSIGNEDSHIFTASSIGN); - break; - case RUNSIGNEDSHIFTASSIGN: - jj_consume_token(RUNSIGNEDSHIFTASSIGN); + {if (true) return ">>=";} break; case ANDASSIGN: jj_consume_token(ANDASSIGN); + {if (true) return "&=";} break; case XORASSIGN: jj_consume_token(XORASSIGN); + {if (true) return "|=";} break; case ORASSIGN: jj_consume_token(ORASSIGN); + {if (true) return "|=";} break; case DOTASSIGN: jj_consume_token(DOTASSIGN); + {if (true) return ".=";} + break; + case TILDEEQUAL: + jj_consume_token(TILDEEQUAL); + {if (true) return "~=";} break; default: - jj_la1[21] = jj_gen; + jj_la1[28] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void ConditionalExpression() throws ParseException { - ConditionalOrExpression(); + static final public String ConditionalExpression() throws ParseException { + final String expr; + String expr2 = null; + String expr3 = null; + expr = ConditionalOrExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HOOK: jj_consume_token(HOOK); - Expression(); + expr2 = Expression(); jj_consume_token(COLON); - ConditionalExpression(); + expr3 = ConditionalExpression(); break; default: - jj_la1[22] = jj_gen; + jj_la1[29] = jj_gen; ; } + if (expr3 == null) { + {if (true) return expr;} + } else { + {if (true) return expr + "?" + expr2 + ":" + expr3;} + } + throw new Error("Missing return statement in function"); } - static final public void ConditionalOrExpression() throws ParseException { - ConditionalAndExpression(); - label_11: + static final public String ConditionalOrExpression() throws ParseException { + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); + expr = ConditionalAndExpression(); + buff.append(expr); + label_8: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case _ORL: @@ -770,28 +1320,36 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[23] = jj_gen; - break label_11; + jj_la1[30] = jj_gen; + break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SC_OR: - jj_consume_token(SC_OR); + operator = jj_consume_token(SC_OR); break; case _ORL: - jj_consume_token(_ORL); + operator = jj_consume_token(_ORL); break; default: - jj_la1[24] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - ConditionalAndExpression(); + expr = ConditionalAndExpression(); + buff.append(operator.image); + buff.append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void ConditionalAndExpression() throws ParseException { - ConcatExpression(); - label_12: + static final public String ConditionalAndExpression() throws ParseException { + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); + expr = ConcatExpression(); + buff.append(expr); + label_9: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case _ANDL: @@ -799,125 +1357,186 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[25] = jj_gen; - break label_12; + jj_la1[32] = jj_gen; + break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SC_AND: - jj_consume_token(SC_AND); + operator = jj_consume_token(SC_AND); break; case _ANDL: - jj_consume_token(_ANDL); + operator = jj_consume_token(_ANDL); break; default: - jj_la1[26] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - ConcatExpression(); + expr = ConcatExpression(); + buff.append(operator.image); + buff.append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void ConcatExpression() throws ParseException { - InclusiveOrExpression(); - label_13: + static final public String ConcatExpression() throws ParseException { + String expr; + final StringBuffer buff = new StringBuffer(); + expr = InclusiveOrExpression(); + buff.append(expr); + label_10: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOT: ; break; default: - jj_la1[27] = jj_gen; - break label_13; + jj_la1[34] = jj_gen; + break label_10; } jj_consume_token(DOT); - InclusiveOrExpression(); + expr = InclusiveOrExpression(); + buff.append(".").append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void InclusiveOrExpression() throws ParseException { - ExclusiveOrExpression(); - label_14: + static final public String InclusiveOrExpression() throws ParseException { + String expr; + final StringBuffer buff = new StringBuffer(); + expr = ExclusiveOrExpression(); + buff.append(expr); + label_11: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_OR: ; break; default: - jj_la1[28] = jj_gen; - break label_14; + jj_la1[35] = jj_gen; + break label_11; } jj_consume_token(BIT_OR); - ExclusiveOrExpression(); + expr = ExclusiveOrExpression(); + buff.append("|").append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void ExclusiveOrExpression() throws ParseException { - AndExpression(); - label_15: + static final public String ExclusiveOrExpression() throws ParseException { + String expr; + final StringBuffer buff = new StringBuffer(); + expr = AndExpression(); + buff.append(expr); + label_12: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case XOR: ; break; default: - jj_la1[29] = jj_gen; - break label_15; + jj_la1[36] = jj_gen; + break label_12; } jj_consume_token(XOR); - AndExpression(); + expr = AndExpression(); + buff.append("^"); + buff.append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void AndExpression() throws ParseException { - EqualityExpression(); - label_16: + static final public String AndExpression() throws ParseException { + String expr; + final StringBuffer buff = new StringBuffer(); + expr = EqualityExpression(); + buff.append(expr); + label_13: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: ; break; default: - jj_la1[30] = jj_gen; - break label_16; + jj_la1[37] = jj_gen; + break label_13; } jj_consume_token(BIT_AND); - EqualityExpression(); + expr = EqualityExpression(); + buff.append("&").append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void EqualityExpression() throws ParseException { - RelationalExpression(); - label_17: + static final public String EqualityExpression() throws ParseException { + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); + expr = RelationalExpression(); + buff.append(expr); + label_14: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EQ: case NE: + case DIF: + case BANGDOUBLEEQUAL: + case TRIPLEEQUAL: ; break; default: - jj_la1[31] = jj_gen; - break label_17; + jj_la1[38] = jj_gen; + break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EQ: - jj_consume_token(EQ); + operator = jj_consume_token(EQ); + break; + case DIF: + operator = jj_consume_token(DIF); break; case NE: - jj_consume_token(NE); + operator = jj_consume_token(NE); + break; + case BANGDOUBLEEQUAL: + operator = jj_consume_token(BANGDOUBLEEQUAL); + break; + case TRIPLEEQUAL: + operator = jj_consume_token(TRIPLEEQUAL); break; default: - jj_la1[32] = jj_gen; + jj_la1[39] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - RelationalExpression(); + try { + expr = RelationalExpression(); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + buff.append(operator.image); + buff.append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void RelationalExpression() throws ParseException { - ShiftExpression(); - label_18: + static final public String RelationalExpression() throws ParseException { + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); + expr = ShiftExpression(); + buff.append(expr); + label_15: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case GT: @@ -927,34 +1546,41 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[33] = jj_gen; - break label_18; + jj_la1[40] = jj_gen; + break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: - jj_consume_token(LT); + operator = jj_consume_token(LT); break; case GT: - jj_consume_token(GT); + operator = jj_consume_token(GT); break; case LE: - jj_consume_token(LE); + operator = jj_consume_token(LE); break; case GE: - jj_consume_token(GE); + operator = jj_consume_token(GE); break; default: - jj_la1[34] = jj_gen; + jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - ShiftExpression(); + expr = ShiftExpression(); + buff.append(operator.image).append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void ShiftExpression() throws ParseException { - AdditiveExpression(); - label_19: + static final public String ShiftExpression() throws ParseException { + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); + expr = AdditiveExpression(); + buff.append(expr); + label_16: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LSHIFT: @@ -963,31 +1589,39 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[35] = jj_gen; - break label_19; + jj_la1[42] = jj_gen; + break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LSHIFT: - jj_consume_token(LSHIFT); + operator = jj_consume_token(LSHIFT); break; case RSIGNEDSHIFT: - jj_consume_token(RSIGNEDSHIFT); + operator = jj_consume_token(RSIGNEDSHIFT); break; case RUNSIGNEDSHIFT: - jj_consume_token(RUNSIGNEDSHIFT); + operator = jj_consume_token(RUNSIGNEDSHIFT); break; default: - jj_la1[36] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - AdditiveExpression(); + expr = AdditiveExpression(); + buff.append(operator.image); + buff.append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void AdditiveExpression() throws ParseException { - MultiplicativeExpression(); - label_20: + static final public String AdditiveExpression() throws ParseException { + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); + expr = MultiplicativeExpression(); + buff.append(expr); + label_17: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -995,28 +1629,44 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[37] = jj_gen; - break label_20; + jj_la1[44] = jj_gen; + break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: - jj_consume_token(PLUS); + operator = jj_consume_token(PLUS); break; case MINUS: - jj_consume_token(MINUS); + operator = jj_consume_token(MINUS); break; default: - jj_la1[38] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - MultiplicativeExpression(); + expr = MultiplicativeExpression(); + buff.append(operator.image); + buff.append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void MultiplicativeExpression() throws ParseException { - UnaryExpression(); - label_21: + static final public String MultiplicativeExpression() throws ParseException { + String expr; + Token operator; + final StringBuffer buff = new StringBuffer(); + try { + expr = UnaryExpression(); + } catch (ParseException e) { + errorMessage = "unexpected token '"+e.currentToken.next.image+"'"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + buff.append(expr); + label_18: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STAR: @@ -1025,61 +1675,121 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[39] = jj_gen; - break label_21; + jj_la1[46] = jj_gen; + break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STAR: - jj_consume_token(STAR); + operator = jj_consume_token(STAR); break; case SLASH: - jj_consume_token(SLASH); + operator = jj_consume_token(SLASH); break; case REM: - jj_consume_token(REM); + operator = jj_consume_token(REM); break; default: - jj_la1[40] = jj_gen; + jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - UnaryExpression(); + expr = UnaryExpression(); + buff.append(operator.image); + buff.append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void UnaryExpression() throws ParseException { +/** + * An unary expression starting with @, & or nothing + */ + static final public String UnaryExpression() throws ParseException { + final String expr; + final Token token; + final StringBuffer buff = new StringBuffer(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BIT_AND: + token = jj_consume_token(BIT_AND); + expr = UnaryExpressionNoPrefix(); + if (token == null) { + {if (true) return expr;} + } + {if (true) return token.image + expr;} + break; + case ARRAY: + case NEW: + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: case AT: - jj_consume_token(AT); - UnaryExpression(); + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case DOLLAR_ID: + label_19: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AT: + ; + break; + default: + jj_la1[48] = jj_gen; + break label_19; + } + jj_consume_token(AT); + buff.append("@"); + } + expr = UnaryExpressionNoPrefix(); + {if (true) return buff.append(expr).toString();} break; + default: + jj_la1[49] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + throw new Error("Missing return statement in function"); + } + + static final public String UnaryExpressionNoPrefix() throws ParseException { + final String expr; + final Token token; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: case MINUS: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: - jj_consume_token(PLUS); + token = jj_consume_token(PLUS); break; case MINUS: - jj_consume_token(MINUS); + token = jj_consume_token(MINUS); break; default: - jj_la1[41] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - UnaryExpression(); + expr = UnaryExpression(); + {if (true) return token.image + expr;} break; case INCR: - PreIncrementExpression(); - break; case DECR: - PreDecrementExpression(); + expr = PreIncDecExpression(); + {if (true) return expr;} break; case ARRAY: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1088,35 +1798,50 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case DOLLAR: case BANG: case DOLLAR_ID: - UnaryExpressionNotPlusMinus(); + expr = UnaryExpressionNotPlusMinus(); + {if (true) return expr;} break; default: - jj_la1[42] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void PreIncrementExpression() throws ParseException { - jj_consume_token(INCR); - PrimaryExpression(); - } - - static final public void PreDecrementExpression() throws ParseException { - jj_consume_token(DECR); - PrimaryExpression(); + static final public String PreIncDecExpression() throws ParseException { +final String expr; +final Token token; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INCR: + token = jj_consume_token(INCR); + break; + case DECR: + token = jj_consume_token(DECR); + break; + default: + jj_la1[52] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr = PrimaryExpression(); + {if (true) return token.image + expr;} + throw new Error("Missing return statement in function"); } - static final public void UnaryExpressionNotPlusMinus() throws ParseException { + static final public String UnaryExpressionNotPlusMinus() throws ParseException { + final String expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BANG: jj_consume_token(BANG); - UnaryExpression(); + expr = UnaryExpression(); + {if (true) return "!" + expr;} break; default: - jj_la1[43] = jj_gen; - if (jj_2_3(2147483647)) { - CastExpression(); + jj_la1[53] = jj_gen; + if (jj_2_4(2147483647)) { + expr = CastExpression(); + {if (true) return expr;} } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: @@ -1124,67 +1849,113 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case IDENTIFIER: case DOLLAR: case DOLLAR_ID: - PostfixExpression(); + expr = PostfixExpression(); + {if (true) return expr;} break; - case FALSE: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: - Literal(); + expr = Literal(); + {if (true) return expr;} break; case LPAREN: jj_consume_token(LPAREN); - Expression(); - jj_consume_token(RPAREN); + expr = Expression(); + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { + errorMessage = "')' expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + {if (true) return "("+expr+")";} break; default: - jj_la1[44] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } } + throw new Error("Missing return statement in function"); } - static final public void CastExpression() throws ParseException { + static final public String CastExpression() throws ParseException { +final String type, expr; jj_consume_token(LPAREN); - Type(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + type = Type(); + break; + case ARRAY: + jj_consume_token(ARRAY); + type = "array"; + break; + default: + jj_la1[55] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } jj_consume_token(RPAREN); - UnaryExpression(); + expr = UnaryExpression(); + {if (true) return "(" + type + ")" + expr;} + throw new Error("Missing return statement in function"); } - static final public void PostfixExpression() throws ParseException { - PrimaryExpression(); + static final public String PostfixExpression() throws ParseException { + final String expr; + Token operator = null; + expr = PrimaryExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCR: case DECR: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCR: - jj_consume_token(INCR); + operator = jj_consume_token(INCR); break; case DECR: - jj_consume_token(DECR); + operator = jj_consume_token(DECR); break; default: - jj_la1[45] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[46] = jj_gen; + jj_la1[57] = jj_gen; ; } + if (operator == null) { + {if (true) return expr;} + } + {if (true) return expr + operator.image;} + throw new Error("Missing return statement in function"); } - static final public void PrimaryExpression() throws ParseException { - if (jj_2_4(2)) { - jj_consume_token(IDENTIFIER); + static final public String PrimaryExpression() throws ParseException { + final Token identifier; + String expr; + final StringBuffer buff = new StringBuffer(); + if (jj_2_5(2)) { + identifier = jj_consume_token(IDENTIFIER); jj_consume_token(STATICCLASSACCESS); - ClassIdentifier(); - label_22: + expr = ClassIdentifier(); + buff.append(identifier.image).append("::").append(expr); + label_20: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CLASSACCESS: @@ -1193,19 +1964,22 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[47] = jj_gen; - break label_22; + jj_la1[58] = jj_gen; + break label_20; } - PrimarySuffix(); + expr = PrimarySuffix(); + buff.append(expr); } + {if (true) return buff.toString();} } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case NEW: case IDENTIFIER: case DOLLAR: case DOLLAR_ID: - PrimaryPrefix(); - label_23: + expr = PrimaryPrefix(); + buff.append(expr); + label_21: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CLASSACCESS: @@ -1214,91 +1988,160 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants ; break; default: - jj_la1[48] = jj_gen; - break label_23; + jj_la1[59] = jj_gen; + break label_21; } - PrimarySuffix(); + expr = PrimarySuffix(); + buff.append(expr); } + {if (true) return buff.toString();} break; case ARRAY: - jj_consume_token(ARRAY); - ArrayInitializer(); + expr = ArrayDeclarator(); + {if (true) return "array" + expr;} break; default: - jj_la1[49] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } + throw new Error("Missing return statement in function"); + } + + static final public String ArrayDeclarator() throws ParseException { + final String expr; + jj_consume_token(ARRAY); + expr = ArrayInitializer(); + {if (true) return "array" + expr;} + throw new Error("Missing return statement in function"); } - static final public void PrimaryPrefix() throws ParseException { + static final public String PrimaryPrefix() throws ParseException { + final String expr; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: - jj_consume_token(IDENTIFIER); + token = jj_consume_token(IDENTIFIER); + {if (true) return token.image;} break; case NEW: jj_consume_token(NEW); - ClassIdentifier(); + expr = ClassIdentifier(); + {if (true) return "new " + expr;} break; case DOLLAR: case DOLLAR_ID: - VariableDeclaratorId(); + expr = VariableDeclaratorId(); + {if (true) return expr;} break; default: - jj_la1[50] = jj_gen; + jj_la1[61] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); + } + + static final public String classInstantiation() throws ParseException { + String expr; + final StringBuffer buff = new StringBuffer("new "); + jj_consume_token(NEW); + expr = ClassIdentifier(); + buff.append(expr); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case NEW: + case IDENTIFIER: + case DOLLAR: + case DOLLAR_ID: + expr = PrimaryExpression(); + buff.append(expr); + break; + default: + jj_la1[62] = jj_gen; + ; + } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } - static final public void ClassIdentifier() throws ParseException { + static final public String ClassIdentifier() throws ParseException { + final String expr; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: - jj_consume_token(IDENTIFIER); + token = jj_consume_token(IDENTIFIER); + {if (true) return token.image;} break; case DOLLAR: case DOLLAR_ID: - VariableDeclaratorId(); + expr = VariableDeclaratorId(); + {if (true) return expr;} break; default: - jj_la1[51] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void PrimarySuffix() throws ParseException { + static final public String PrimarySuffix() throws ParseException { + final String expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: - Arguments(); + expr = Arguments(); + {if (true) return expr;} break; case CLASSACCESS: case LBRACKET: - VariableSuffix(); + expr = VariableSuffix(); + {if (true) return expr;} break; default: - jj_la1[52] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void VariableSuffix() throws ParseException { + static final public String VariableSuffix() throws ParseException { + String expr = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CLASSACCESS: jj_consume_token(CLASSACCESS); - VariableName(); + try { + expr = VariableName(); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + {if (true) return "->" + expr;} break; case LBRACKET: jj_consume_token(LBRACKET); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: + case LIST: case PRINT: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1311,75 +2154,137 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case DECR: case PLUS: case MINUS: + case BIT_AND: case DOLLAR_ID: - Expression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + expr = Expression(); + break; + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + expr = Type(); + break; + default: + jj_la1[65] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } break; default: - jj_la1[53] = jj_gen; + jj_la1[66] = jj_gen; ; } - jj_consume_token(RBRACKET); + try { + jj_consume_token(RBRACKET); + } catch (ParseException e) { + errorMessage = "']' expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + if(expr == null) { + {if (true) return "[]";} + } + {if (true) return "[" + expr + "]";} break; default: - jj_la1[54] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void Literal() throws ParseException { + static final public String Literal() throws ParseException { + final String expr; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INTEGER_LITERAL: - jj_consume_token(INTEGER_LITERAL); + token = jj_consume_token(INTEGER_LITERAL); + {if (true) return token.image;} break; case FLOATING_POINT_LITERAL: - jj_consume_token(FLOATING_POINT_LITERAL); + token = jj_consume_token(FLOATING_POINT_LITERAL); + {if (true) return token.image;} break; case STRING_LITERAL: - jj_consume_token(STRING_LITERAL); + token = jj_consume_token(STRING_LITERAL); + {if (true) return token.image;} break; - case FALSE: case TRUE: - BooleanLiteral(); + case FALSE: + expr = BooleanLiteral(); + {if (true) return expr;} break; case NULL: - NullLiteral(); + jj_consume_token(NULL); + {if (true) return "null";} break; default: - jj_la1[55] = jj_gen; + jj_la1[68] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void BooleanLiteral() throws ParseException { + static final public String BooleanLiteral() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case TRUE: jj_consume_token(TRUE); + {if (true) return "true";} break; case FALSE: jj_consume_token(FALSE); + {if (true) return "false";} break; default: - jj_la1[56] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void NullLiteral() throws ParseException { - jj_consume_token(NULL); - } - - static final public void Arguments() throws ParseException { + static final public String Arguments() throws ParseException { +String expr = null; jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: + case LIST: case PRINT: - case FALSE: case NEW: case NULL: case TRUE: + case FALSE: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -1392,52 +2297,79 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case DECR: case PLUS: case MINUS: + case BIT_AND: case DOLLAR_ID: - ArgumentList(); + expr = ArgumentList(); break; default: - jj_la1[57] = jj_gen; + jj_la1[70] = jj_gen; ; } - jj_consume_token(RPAREN); + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + if (expr == null) { + {if (true) return "()";} + } + {if (true) return "(" + expr + ")";} + throw new Error("Missing return statement in function"); } - static final public void ArgumentList() throws ParseException { - Expression(); - label_24: + static final public String ArgumentList() throws ParseException { +String expr; +final StringBuffer buff = new StringBuffer(); + expr = Expression(); + buff.append(expr); + label_22: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[58] = jj_gen; - break label_24; + jj_la1[71] = jj_gen; + break label_22; } jj_consume_token(COMMA); - Expression(); + try { + expr = Expression(); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } + buff.append(",").append(expr); } + {if (true) return buff.toString();} + throw new Error("Missing return statement in function"); } -/* - * Statement syntax follows. +/** + * A Statement without break. */ - static final public void Statement() throws ParseException { - if (jj_2_5(2)) { + static final public void StatementNoBreak() throws ParseException { + if (jj_2_6(2)) { Expression(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: + try { jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); - break; - default: - jj_la1[59] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + } catch (ParseException e) { + if (e.currentToken.next.kind != 4) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; + errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; + {if (true) throw e;} + } } - } else if (jj_2_6(2)) { + } else if (jj_2_7(2)) { LabeledStatement(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1458,8 +2390,10 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants try { jj_consume_token(SEMICOLON); } catch (ParseException e) { - errorMessage = "';' expected after expression"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; + errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = jj_input_stream.getPosition() + 1; {if (true) throw e;} } break; @@ -1478,8 +2412,8 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case FOR: ForStatement(); break; - case BREAK: - BreakStatement(); + case FOREACH: + ForeachStatement(); break; case CONTINUE: ContinueStatement(); @@ -1494,6 +2428,15 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case REQUIRE: case INCLUDE_ONCE: case REQUIRE_ONCE: + case AT: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AT: + jj_consume_token(AT); + break; + default: + jj_la1[72] = jj_gen; + ; + } IncludeStatement(); break; case STATIC: @@ -1503,91 +2446,239 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants GlobalStatement(); break; default: - jj_la1[60] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } } - static final public void IncludeStatement() throws ParseException { +/** + * A Normal statement. + */ + static final public void Statement() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: case REQUIRE: - jj_consume_token(REQUIRE); - Expression(); + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + StatementNoBreak(); + break; + case BREAK: + BreakStatement(); + break; + default: + jj_la1[74] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + +/** + * An html block inside a php syntax. + */ + static final public void htmlBlock() throws ParseException { + jj_consume_token(PHPEND); + label_23: + while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - case 127: - jj_consume_token(127); + case PHPECHOSTART: + ; break; default: - jj_la1[61] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + jj_la1[75] = jj_gen; + break label_23; } - break; - case REQUIRE_ONCE: - jj_consume_token(REQUIRE_ONCE); - Expression(); + phpEchoBlock(); + } + try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); + case PHPSTARTLONG: + jj_consume_token(PHPSTARTLONG); break; - case 127: - jj_consume_token(127); + case PHPSTARTSHORT: + jj_consume_token(PHPSTARTSHORT); break; default: - jj_la1[62] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + } catch (ParseException e) { + errorMessage = "End of file unexpected, '= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 95; i++) { + for (int i = 0; i < 126; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< jj_gen) { @@ -4024,6 +6450,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants case 4: jj_3_5(); break; case 5: jj_3_6(); break; case 6: jj_3_7(); break; + case 7: jj_3_8(); break; } } p = p.next;