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 515e143..bc7c112 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -8,77 +8,109 @@ 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.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;
+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 {
+public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants {
+ /** The file that is parsed. */
private static IFile fileToParse;
- /** The current segment */
+ /** 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$
- 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;
+
+ //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 PHPParser(IFile fileToParse) {
+ public PHPParser() {
+ }
+
+ 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);
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);
}
ReInit(stream);
+ astStack = new AstNode[AstStackIncrement];
try {
parse();
} catch (ParseException e) {
@@ -96,6 +128,8 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
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;
@@ -103,15 +137,27 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
/**
* Create marker for the parse error
+ * @param e the ParseException
*/
- private static void setMarker(ParseException e) {
+ private static void setMarker(final ParseException e) {
try {
- setMarker(fileToParse,
- errorMessage,
- jj_input_stream.tokenBegin,
- jj_input_stream.tokenBegin + e.currentToken.image.length(),
- errorLevel,
- "Line " + e.currentToken.beginLine);
+ if (errorStart == -1) {
+ setMarker(fileToParse,
+ errorMessage,
+ jj_input_stream.tokenBegin,
+ jj_input_stream.tokenBegin + e.currentToken.image.length(),
+ errorLevel,
+ "Line " + e.currentToken.beginLine);
+ } else {
+ setMarker(fileToParse,
+ errorMessage,
+ errorStart,
+ errorEnd,
+ errorLevel,
+ "Line " + e.currentToken.beginLine);
+ errorStart = -1;
+ errorEnd = -1;
+ }
} catch (CoreException e2) {
PHPeclipsePlugin.log(e2);
}
@@ -120,12 +166,12 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
/**
* 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)
@@ -142,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;
@@ -180,12 +229,13 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
}
}
- public void parse(String s) throws CoreException {
- StringReader stream = 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) {
@@ -197,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
@@ -215,17 +265,10 @@ 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);
@@ -236,25 +279,187 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
label_1:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PHPSTART:
+ 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;
}
- jj_consume_token(PHPSTART);
- Php();
- jj_consume_token(PHPEND);
+ 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 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();
+ }
+ }
+
+ 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 {
label_2:
while (true) {
@@ -263,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:
@@ -271,16 +478,15 @@ 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:
@@ -302,7 +508,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
;
break;
default:
- jj_la1[1] = jj_gen;
+ jj_la1[5] = jj_gen;
break label_2;
}
BlockStatement();
@@ -310,18 +516,35 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
}
static final public void ClassDeclaration() throws ParseException {
- PHPClassDeclaration classDeclaration;
- Token className;
- int pos = jj_input_stream.bufpos;
+ final PHPClassDeclaration classDeclaration;
+ final Token className;
+ final int pos;
jj_consume_token(CLASS);
- className = 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) {
@@ -339,8 +562,10 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
try {
jj_consume_token(LBRACE);
} catch (ParseException e) {
- errorMessage = "'{' expected";
+ 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:
@@ -351,7 +576,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
;
break;
default:
- jj_la1[3] = jj_gen;
+ jj_la1[7] = jj_gen;
break label_3;
}
ClassBodyDeclaration();
@@ -359,12 +584,17 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
try {
jj_consume_token(RBRACE);
} catch (ParseException e) {
- errorMessage = "'var', 'function' or '}' expected";
+ 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:
@@ -374,16 +604,20 @@ 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);
variableDeclaration = VariableDeclarator();
+ outlineInfo.addVariable(variableDeclaration.getVariable().getName());
if (currentSegment != null) {
currentSegment.add(variableDeclaration);
}
@@ -394,7 +628,7 @@ 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);
@@ -406,45 +640,46 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
try {
jj_consume_token(SEMICOLON);
} catch (ParseException e) {
- errorMessage = "';' expected after variable declaration";
+ 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;}
}
}
static final public PHPVarDeclaration VariableDeclarator() throws ParseException {
- String varName;
- String varValue = null;
- int pos = jj_input_stream.bufpos;
+ 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);
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 (varValue == null) {
- {if (true) return new PHPVarDeclaration(currentSegment,varName,pos);}
- }
- {if (true) return new PHPVarDeclaration(currentSegment,varName,pos,varValue);}
+ {if (true) return new PHPVarDeclaration(currentSegment,varName,pos);}
throw new Error("Missing return statement in function");
}
static final public String VariableDeclaratorId() throws ParseException {
String expr;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
try {
expr = Variable();
- buff.append(expr);
+ buff.append(expr);
label_5:
while (true) {
if (jj_2_1(2)) {
@@ -453,12 +688,14 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
break label_5;
}
expr = VariableSuffix();
- buff.append(expr);
+ buff.append(expr);
}
{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");
@@ -466,7 +703,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
static final public String Variable() throws ParseException {
String expr = null;
- Token token;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DOLLAR_ID:
token = jj_consume_token(DOLLAR_ID);
@@ -477,21 +714,27 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
jj_consume_token(RBRACE);
break;
default:
- jj_la1[7] = jj_gen;
+ jj_la1[11] = jj_gen;
;
}
- if (expr == null) {
- {if (true) return token.image;}
+ 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);
expr = VariableName();
- {if (true) return "$" + expr;}
+ {if (true) return expr;}
break;
default:
- jj_la1[8] = jj_gen;
+ jj_la1[12] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -500,7 +743,7 @@ public class PHPParser extends PHPParserSuperclass implements PHPParserConstants
static final public String VariableName() throws ParseException {
String expr = null;
-Token token;
+final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACE:
jj_consume_token(LBRACE);
@@ -517,10 +760,16 @@ Token token;
jj_consume_token(RBRACE);
break;
default:
- jj_la1[9] = jj_gen;
+ 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 + "}";}
@@ -528,28 +777,26 @@ Token token;
case DOLLAR:
jj_consume_token(DOLLAR);
expr = VariableName();
- {if (true) return "$" + expr;}
+ 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);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IDENTIFIER:
- case LBRACE:
- case DOLLAR:
- case DOLLAR_ID:
- expr = VariableName();
- break;
- default:
- jj_la1[10] = jj_gen;
- ;
+ if (currentFunction != null) {
+ PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1));
+ if (var != null) {
+ var.getVariable().setUsed(true);
}
- if (expr == null) {
- {if (true) return token.image;}
- }
- {if (true) return token.image + expr;}
+ }
+ {if (true) return token.image + expr;}
break;
default:
- jj_la1[11] = jj_gen;
+ jj_la1[14] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -557,12 +804,12 @@ Token token;
}
static final public String VariableInitializer() throws ParseException {
- String expr;
- Token token;
+ final String expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case FALSE:
case NULL:
case TRUE:
+ case FALSE:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
@@ -579,7 +826,7 @@ Token token;
token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[12] = jj_gen;
+ jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -595,7 +842,7 @@ Token token;
token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[13] = jj_gen;
+ jj_la1[16] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -610,7 +857,7 @@ Token token;
{if (true) return token.image;}
break;
default:
- jj_la1[14] = jj_gen;
+ jj_la1[17] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -619,7 +866,7 @@ Token token;
static final public String ArrayVariable() throws ParseException {
String expr;
-StringBuffer buff = new StringBuffer();
+final StringBuffer buff = new StringBuffer();
expr = Expression();
buff.append(expr);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -629,7 +876,7 @@ StringBuffer buff = new StringBuffer();
buff.append("=>").append(expr);
break;
default:
- jj_la1[15] = jj_gen;
+ jj_la1[18] = jj_gen;
;
}
{if (true) return buff.toString();}
@@ -637,16 +884,17 @@ StringBuffer buff = new StringBuffer();
}
static final public String ArrayInitializer() throws ParseException {
-String expr = null;
-StringBuffer buff = new StringBuffer("(");
+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:
@@ -676,7 +924,16 @@ StringBuffer buff = new StringBuffer("(");
}
break;
default:
- jj_la1[16] = 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);
@@ -685,58 +942,105 @@ StringBuffer buff = new StringBuffer("(");
throw new Error("Missing return statement in function");
}
+/**
+ * A Method Declaration.
+ * function MetodDeclarator() Block()
+ */
static final public void MethodDeclaration() throws ParseException {
- PHPFunctionDeclaration functionDeclaration;
- jj_consume_token(FUNCTION);
- functionDeclaration = MethodDeclarator();
+ 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();
}
}
+/**
+ * A MethodDeclarator.
+ * [&] IDENTIFIER(parameters ...).
+ * @return a function description for the outline
+ */
static final public PHPFunctionDeclaration MethodDeclarator() throws ParseException {
- Token identifier;
- StringBuffer methodDeclaration = new StringBuffer();
- String formalParameters;
- int pos = jj_input_stream.bufpos;
+ 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[17] = jj_gen;
+ jj_la1[21] = jj_gen;
;
}
identifier = jj_consume_token(IDENTIFIER);
- methodDeclaration.append(identifier);
formalParameters = FormalParameters();
- methodDeclaration.append(formalParameters);
- {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos);}
+ methodDeclaration.append(identifier);
+ {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters);}
throw new Error("Missing return statement in function");
}
- static final public String FormalParameters() throws ParseException {
+/**
+ * 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 = "Formal parameter expected after function identifier";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
errorLevel = ERROR;
- jj_consume_token(token.kind);
+ 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:
- expr = FormalParameter();
- buff.append(expr);
+ var = FormalParameter();
+ parameters.put(var.getVariable().getName(),var);
label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -744,16 +1048,16 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[18] = jj_gen;
+ jj_la1[22] = jj_gen;
break label_7;
}
jj_consume_token(COMMA);
- expr = FormalParameter();
- buff.append(",").append(expr);
+ var = FormalParameter();
+ parameters.put(var.getVariable().getName(),var);
}
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[23] = jj_gen;
;
}
try {
@@ -761,28 +1065,34 @@ StringBuffer buff = new StringBuffer("(");
} 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;}
}
- buff.append(")");
- {if (true) return buff.toString();}
+ {if (true) return parameters;}
throw new Error("Missing return statement in function");
}
- static final public String FormalParameter() throws ParseException {
- PHPVarDeclaration variableDeclaration;
- StringBuffer buff = new StringBuffer();
+/**
+ * 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);
- buff.append("&");
+ token = jj_consume_token(BIT_AND);
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[24] = jj_gen;
;
}
variableDeclaration = VariableDeclarator();
- buff.append(variableDeclaration.toString());
- {if (true) return buff.toString();}
+ if (token != null) {
+ variableDeclaration.getVariable().setReference(true);
+ }
+ {if (true) return variableDeclaration;}
throw new Error("Missing return statement in function");
}
@@ -790,42 +1100,42 @@ StringBuffer buff = new StringBuffer("(");
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STRING:
jj_consume_token(STRING);
- {if (true) return "string";}
+ {if (true) return "string";}
break;
case BOOL:
jj_consume_token(BOOL);
- {if (true) return "bool";}
+ {if (true) return "bool";}
break;
case BOOLEAN:
jj_consume_token(BOOLEAN);
- {if (true) return "boolean";}
+ {if (true) return "boolean";}
break;
case REAL:
jj_consume_token(REAL);
- {if (true) return "real";}
+ {if (true) return "real";}
break;
case DOUBLE:
jj_consume_token(DOUBLE);
- {if (true) return "double";}
+ {if (true) return "double";}
break;
case FLOAT:
jj_consume_token(FLOAT);
- {if (true) return "float";}
+ {if (true) return "float";}
break;
case INT:
jj_consume_token(INT);
- {if (true) return "int";}
+ {if (true) return "int";}
break;
case INTEGER:
jj_consume_token(INTEGER);
- {if (true) return "integer";}
+ {if (true) return "integer";}
break;
case OBJECT:
jj_consume_token(OBJECT);
- {if (true) return "object";}
+ {if (true) return "object";}
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[25] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -833,72 +1143,80 @@ StringBuffer buff = new StringBuffer("(");
}
static final public String Expression() throws ParseException {
- String expr;
- String assignOperator = null;
- String expr2 = null;
+ final String expr;
+ final String assignOperator;
+ final String expr2;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PRINT:
expr = PrintExpression();
- {if (true) return expr;}
+ {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 BIT_AND:
- case DOLLAR_ID:
- expr = 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 TILDEEQUAL:
- assignOperator = AssignmentOperator();
- try {
- expr2 = Expression();
- } catch (ParseException e) {
- errorMessage = "expression expected";
- errorLevel = ERROR;
- {if (true) throw e;}
+ case LIST:
+ expr = ListExpression();
+ {if (true) return expr;}
+ break;
+ default:
+ 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();
}
- break;
- default:
- jj_la1[22] = jj_gen;
- ;
}
- if (expr2 == null) {
- {if (true) return expr;}
- } else {
- {if (true) return expr + assignOperator + expr2;}
}
- break;
- default:
- jj_la1[23] = 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");
}
@@ -906,58 +1224,58 @@ StringBuffer buff = new StringBuffer("(");
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ASSIGN:
jj_consume_token(ASSIGN);
- {if (true) return "=";}
+ {if (true) return "=";}
break;
case STARASSIGN:
jj_consume_token(STARASSIGN);
- {if (true) return "*=";}
+ {if (true) return "*=";}
break;
case SLASHASSIGN:
jj_consume_token(SLASHASSIGN);
- {if (true) return "/=";}
+ {if (true) return "/=";}
break;
case REMASSIGN:
jj_consume_token(REMASSIGN);
- {if (true) return "%=";}
+ {if (true) return "%=";}
break;
case PLUSASSIGN:
jj_consume_token(PLUSASSIGN);
- {if (true) return "+=";}
+ {if (true) return "+=";}
break;
case MINUSASSIGN:
jj_consume_token(MINUSASSIGN);
- {if (true) return "-=";}
+ {if (true) return "-=";}
break;
case LSHIFTASSIGN:
jj_consume_token(LSHIFTASSIGN);
- {if (true) return "<<=";}
+ {if (true) return "<<=";}
break;
case RSIGNEDSHIFTASSIGN:
jj_consume_token(RSIGNEDSHIFTASSIGN);
- {if (true) return ">>=";}
+ {if (true) return ">>=";}
break;
case ANDASSIGN:
jj_consume_token(ANDASSIGN);
- {if (true) return "&=";}
+ {if (true) return "&=";}
break;
case XORASSIGN:
jj_consume_token(XORASSIGN);
- {if (true) return "|=";}
+ {if (true) return "|=";}
break;
case ORASSIGN:
jj_consume_token(ORASSIGN);
- {if (true) return "|=";}
+ {if (true) return "|=";}
break;
case DOTASSIGN:
jj_consume_token(DOTASSIGN);
- {if (true) return ".=";}
+ {if (true) return ".=";}
break;
case TILDEEQUAL:
jj_consume_token(TILDEEQUAL);
- {if (true) return "~=";}
+ {if (true) return "~=";}
break;
default:
- jj_la1[24] = jj_gen;
+ jj_la1[28] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -965,7 +1283,7 @@ StringBuffer buff = new StringBuffer("(");
}
static final public String ConditionalExpression() throws ParseException {
- String expr;
+ final String expr;
String expr2 = null;
String expr3 = null;
expr = ConditionalOrExpression();
@@ -977,7 +1295,7 @@ StringBuffer buff = new StringBuffer("(");
expr3 = ConditionalExpression();
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[29] = jj_gen;
;
}
if (expr3 == null) {
@@ -991,10 +1309,9 @@ StringBuffer buff = new StringBuffer("(");
static final public String ConditionalOrExpression() throws ParseException {
String expr;
Token operator;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = ConditionalAndExpression();
- buff.append(expr);
+ buff.append(expr);
label_8:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1003,7 +1320,7 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[26] = jj_gen;
+ jj_la1[30] = jj_gen;
break label_8;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1014,13 +1331,13 @@ StringBuffer buff = new StringBuffer("(");
operator = jj_consume_token(_ORL);
break;
default:
- jj_la1[27] = jj_gen;
+ jj_la1[31] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- expr2 = ConditionalAndExpression();
+ expr = ConditionalAndExpression();
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
{if (true) return buff.toString();}
throw new Error("Missing return statement in function");
@@ -1029,10 +1346,9 @@ StringBuffer buff = new StringBuffer("(");
static final public String ConditionalAndExpression() throws ParseException {
String expr;
Token operator;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = ConcatExpression();
- buff.append(expr);
+ buff.append(expr);
label_9:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1041,7 +1357,7 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[32] = jj_gen;
break label_9;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1052,24 +1368,23 @@ StringBuffer buff = new StringBuffer("(");
operator = jj_consume_token(_ANDL);
break;
default:
- jj_la1[29] = jj_gen;
+ jj_la1[33] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- expr2 = ConcatExpression();
+ expr = ConcatExpression();
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
- {if (true) return buff.toString();}
+ {if (true) return buff.toString();}
throw new Error("Missing return statement in function");
}
static final public String ConcatExpression() throws ParseException {
String expr;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = InclusiveOrExpression();
- buff.append(expr);
+ buff.append(expr);
label_10:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1077,24 +1392,22 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[34] = jj_gen;
break label_10;
}
jj_consume_token(DOT);
- expr2 = InclusiveOrExpression();
- buff.append(".");
- buff.append(expr2);
+ expr = InclusiveOrExpression();
+ buff.append(".").append(expr);
}
- {if (true) return buff.toString();}
+ {if (true) return buff.toString();}
throw new Error("Missing return statement in function");
}
static final public String InclusiveOrExpression() throws ParseException {
String expr;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = ExclusiveOrExpression();
- buff.append(expr);
+ buff.append(expr);
label_11:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1102,22 +1415,20 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[31] = jj_gen;
+ jj_la1[35] = jj_gen;
break label_11;
}
jj_consume_token(BIT_OR);
- expr2 = ExclusiveOrExpression();
- buff.append("|");
- buff.append(expr2);
+ expr = ExclusiveOrExpression();
+ buff.append("|").append(expr);
}
- {if (true) return buff.toString();}
+ {if (true) return buff.toString();}
throw new Error("Missing return statement in function");
}
static final public String ExclusiveOrExpression() throws ParseException {
String expr;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = AndExpression();
buff.append(expr);
label_12:
@@ -1127,13 +1438,13 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[36] = jj_gen;
break label_12;
}
jj_consume_token(XOR);
- expr2 = AndExpression();
+ expr = AndExpression();
buff.append("^");
- buff.append(expr2);
+ buff.append(expr);
}
{if (true) return buff.toString();}
throw new Error("Missing return statement in function");
@@ -1141,8 +1452,7 @@ StringBuffer buff = new StringBuffer("(");
static final public String AndExpression() throws ParseException {
String expr;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = EqualityExpression();
buff.append(expr);
label_13:
@@ -1152,23 +1462,21 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[37] = jj_gen;
break label_13;
}
jj_consume_token(BIT_AND);
- expr2 = EqualityExpression();
- buff.append("&");
- buff.append(expr2);
+ expr = EqualityExpression();
+ buff.append("&").append(expr);
}
- {if (true) return buff.toString();}
+ {if (true) return buff.toString();}
throw new Error("Missing return statement in function");
}
static final public String EqualityExpression() throws ParseException {
String expr;
Token operator;
- String expr2;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = RelationalExpression();
buff.append(expr);
label_14:
@@ -1182,7 +1490,7 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[38] = jj_gen;
break label_14;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1202,13 +1510,21 @@ StringBuffer buff = new StringBuffer("(");
operator = jj_consume_token(TRIPLEEQUAL);
break;
default:
- jj_la1[35] = jj_gen;
+ jj_la1[39] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- expr2 = 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(expr2);
+ buff.append(expr);
}
{if (true) return buff.toString();}
throw new Error("Missing return statement in function");
@@ -1217,8 +1533,7 @@ StringBuffer buff = new StringBuffer("(");
static final public String RelationalExpression() throws ParseException {
String expr;
Token operator;
- String expr2;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = ShiftExpression();
buff.append(expr);
label_15:
@@ -1231,7 +1546,7 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[40] = jj_gen;
break label_15;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1248,13 +1563,12 @@ StringBuffer buff = new StringBuffer("(");
operator = jj_consume_token(GE);
break;
default:
- jj_la1[37] = jj_gen;
+ jj_la1[41] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- expr2 = ShiftExpression();
- buff.append(operator.image);
- buff.append(expr2);
+ expr = ShiftExpression();
+ buff.append(operator.image).append(expr);
}
{if (true) return buff.toString();}
throw new Error("Missing return statement in function");
@@ -1263,8 +1577,7 @@ StringBuffer buff = new StringBuffer("(");
static final public String ShiftExpression() throws ParseException {
String expr;
Token operator;
- String expr2;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = AdditiveExpression();
buff.append(expr);
label_16:
@@ -1276,7 +1589,7 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[38] = jj_gen;
+ jj_la1[42] = jj_gen;
break label_16;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1290,13 +1603,13 @@ StringBuffer buff = new StringBuffer("(");
operator = jj_consume_token(RUNSIGNEDSHIFT);
break;
default:
- jj_la1[39] = jj_gen;
+ jj_la1[43] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- expr2 = AdditiveExpression();
+ expr = AdditiveExpression();
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
{if (true) return buff.toString();}
throw new Error("Missing return statement in function");
@@ -1305,8 +1618,7 @@ StringBuffer buff = new StringBuffer("(");
static final public String AdditiveExpression() throws ParseException {
String expr;
Token operator;
- String expr2;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
expr = MultiplicativeExpression();
buff.append(expr);
label_17:
@@ -1317,7 +1629,7 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[44] = jj_gen;
break label_17;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1328,23 +1640,31 @@ StringBuffer buff = new StringBuffer("(");
operator = jj_consume_token(MINUS);
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[45] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- expr2 = MultiplicativeExpression();
+ expr = MultiplicativeExpression();
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
{if (true) return buff.toString();}
throw new Error("Missing return statement in function");
}
static final public String MultiplicativeExpression() throws ParseException {
- String expr, expr2;
+ String expr;
Token operator;
final StringBuffer buff = new StringBuffer();
- expr = UnaryExpression();
+ 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) {
@@ -1355,7 +1675,7 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[46] = jj_gen;
break label_18;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1369,13 +1689,13 @@ StringBuffer buff = new StringBuffer("(");
operator = jj_consume_token(REM);
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[47] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- expr2 = UnaryExpression();
- buff.append(operator.image);
- buff.append(expr2);
+ expr = UnaryExpression();
+ buff.append(operator.image);
+ buff.append(expr);
}
{if (true) return buff.toString();}
throw new Error("Missing return statement in function");
@@ -1385,8 +1705,8 @@ StringBuffer buff = new StringBuffer("(");
* An unary expression starting with @, & or nothing
*/
static final public String UnaryExpression() throws ParseException {
- String expr;
- Token token;
+ final String expr;
+ final Token token;
final StringBuffer buff = new StringBuffer();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BIT_AND:
@@ -1398,10 +1718,10 @@ StringBuffer buff = new StringBuffer("(");
{if (true) return token.image + expr;}
break;
case ARRAY:
- case FALSE:
case NEW:
case NULL:
case TRUE:
+ case FALSE:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
@@ -1422,7 +1742,7 @@ StringBuffer buff = new StringBuffer("(");
;
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[48] = jj_gen;
break label_19;
}
jj_consume_token(AT);
@@ -1432,7 +1752,7 @@ StringBuffer buff = new StringBuffer("(");
{if (true) return buff.append(expr).toString();}
break;
default:
- jj_la1[45] = jj_gen;
+ jj_la1[49] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1440,8 +1760,8 @@ StringBuffer buff = new StringBuffer("(");
}
static final public String UnaryExpressionNoPrefix() throws ParseException {
- String expr;
- Token token;
+ final String expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
case MINUS:
@@ -1453,7 +1773,7 @@ StringBuffer buff = new StringBuffer("(");
token = jj_consume_token(MINUS);
break;
default:
- jj_la1[46] = jj_gen;
+ jj_la1[50] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1461,18 +1781,15 @@ StringBuffer buff = new StringBuffer("(");
{if (true) return token.image + expr;}
break;
case INCR:
- expr = PreIncrementExpression();
- {if (true) return expr;}
- break;
case DECR:
- expr = 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:
@@ -1485,42 +1802,46 @@ StringBuffer buff = new StringBuffer("(");
{if (true) return expr;}
break;
default:
- jj_la1[47] = 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 String PreIncrementExpression() throws ParseException {
-String expr;
- jj_consume_token(INCR);
- expr = PrimaryExpression();
- {if (true) return "++"+expr;}
- throw new Error("Missing return statement in function");
- }
-
- static final public String PreDecrementExpression() throws ParseException {
-String expr;
- jj_consume_token(DECR);
+ 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 "--"+expr;}
+ {if (true) return token.image + expr;}
throw new Error("Missing return statement in function");
}
static final public String UnaryExpressionNotPlusMinus() throws ParseException {
- String expr;
+ final String expr;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BANG:
jj_consume_token(BANG);
expr = UnaryExpression();
- {if (true) return "!" + expr;}
+ {if (true) return "!" + expr;}
break;
default:
- jj_la1[48] = jj_gen;
- if (jj_2_3(2147483647)) {
+ jj_la1[53] = jj_gen;
+ if (jj_2_4(2147483647)) {
expr = CastExpression();
- {if (true) return expr;}
+ {if (true) return expr;}
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
@@ -1529,25 +1850,33 @@ String expr;
case DOLLAR:
case DOLLAR_ID:
expr = PostfixExpression();
- {if (true) return expr;}
+ {if (true) return expr;}
break;
- case FALSE:
case NULL:
case TRUE:
+ case FALSE:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
expr = Literal();
- {if (true) return expr;}
+ {if (true) return expr;}
break;
case LPAREN:
jj_consume_token(LPAREN);
expr = Expression();
- 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 "("+expr+")";}
break;
default:
- jj_la1[49] = jj_gen;
+ jj_la1[54] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1557,10 +1886,29 @@ String expr;
}
static final public String CastExpression() throws ParseException {
-String type;
-String expr;
+final String type, expr;
jj_consume_token(LPAREN);
- type = 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);
expr = UnaryExpression();
{if (true) return "(" + type + ")" + expr;}
@@ -1568,7 +1916,7 @@ String expr;
}
static final public String PostfixExpression() throws ParseException {
- String expr;
+ final String expr;
Token operator = null;
expr = PrimaryExpression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1582,13 +1930,13 @@ String expr;
operator = jj_consume_token(DECR);
break;
default:
- jj_la1[50] = jj_gen;
+ jj_la1[56] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[51] = jj_gen;
+ jj_la1[57] = jj_gen;
;
}
if (operator == null) {
@@ -1599,10 +1947,10 @@ String expr;
}
static final public String PrimaryExpression() throws ParseException {
- Token identifier;
+ final Token identifier;
String expr;
final StringBuffer buff = new StringBuffer();
- if (jj_2_4(2)) {
+ if (jj_2_5(2)) {
identifier = jj_consume_token(IDENTIFIER);
jj_consume_token(STATICCLASSACCESS);
expr = ClassIdentifier();
@@ -1616,7 +1964,7 @@ String expr;
;
break;
default:
- jj_la1[52] = jj_gen;
+ jj_la1[58] = jj_gen;
break label_20;
}
expr = PrimarySuffix();
@@ -1640,7 +1988,7 @@ String expr;
;
break;
default:
- jj_la1[53] = jj_gen;
+ jj_la1[59] = jj_gen;
break label_21;
}
expr = PrimarySuffix();
@@ -1653,7 +2001,7 @@ String expr;
{if (true) return "array" + expr;}
break;
default:
- jj_la1[54] = jj_gen;
+ jj_la1[60] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1662,7 +2010,7 @@ String expr;
}
static final public String ArrayDeclarator() throws ParseException {
- String expr;
+ final String expr;
jj_consume_token(ARRAY);
expr = ArrayInitializer();
{if (true) return "array" + expr;}
@@ -1670,46 +2018,69 @@ String expr;
}
static final public String PrimaryPrefix() throws ParseException {
- String expr;
- Token token = null;
+ final String expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
- {if (true) return token.image;}
+ {if (true) return token.image;}
break;
case NEW:
jj_consume_token(NEW);
expr = ClassIdentifier();
- {if (true) return "new " + expr;}
+ {if (true) return "new " + expr;}
break;
case DOLLAR:
case DOLLAR_ID:
expr = VariableDeclaratorId();
- {if (true) return expr;}
+ {if (true) return expr;}
break;
default:
- jj_la1[55] = 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 ClassIdentifier() throws ParseException {
+ static final public String classInstantiation() throws ParseException {
String expr;
- Token token;
+ 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 String ClassIdentifier() throws ParseException {
+ final String expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
- {if (true) return token.image;}
+ {if (true) return token.image;}
break;
case DOLLAR:
case DOLLAR_ID:
expr = VariableDeclaratorId();
- {if (true) return expr;}
+ {if (true) return expr;}
break;
default:
- jj_la1[56] = jj_gen;
+ jj_la1[63] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1717,19 +2088,19 @@ String expr;
}
static final public String PrimarySuffix() throws ParseException {
- String expr;
+ final String expr;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
expr = Arguments();
- {if (true) return expr;}
+ {if (true) return expr;}
break;
case CLASSACCESS:
case LBRACKET:
expr = VariableSuffix();
- {if (true) return expr;}
+ {if (true) return expr;}
break;
default:
- jj_la1[57] = jj_gen;
+ jj_la1[64] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1741,18 +2112,36 @@ String expr;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CLASSACCESS:
jj_consume_token(CLASSACCESS);
- expr = 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:
@@ -1767,10 +2156,49 @@ String expr;
case MINUS:
case BIT_AND:
case DOLLAR_ID:
- expr = 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[58] = jj_gen;
+ jj_la1[66] = jj_gen;
;
}
try {
@@ -1778,6 +2206,8 @@ String expr;
} 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) {
@@ -1786,7 +2216,7 @@ String expr;
{if (true) return "[" + expr + "]";}
break;
default:
- jj_la1[59] = jj_gen;
+ jj_la1[67] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1794,32 +2224,32 @@ String expr;
}
static final public String Literal() throws ParseException {
- String expr;
- Token token;
+ final String expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
token = jj_consume_token(INTEGER_LITERAL);
- {if (true) return token.image;}
+ {if (true) return token.image;}
break;
case FLOATING_POINT_LITERAL:
token = jj_consume_token(FLOATING_POINT_LITERAL);
- {if (true) return token.image;}
+ {if (true) return token.image;}
break;
case STRING_LITERAL:
token = jj_consume_token(STRING_LITERAL);
- {if (true) return token.image;}
+ {if (true) return token.image;}
break;
- case FALSE:
case TRUE:
+ case FALSE:
expr = BooleanLiteral();
- {if (true) return expr;}
+ {if (true) return expr;}
break;
case NULL:
- expr = NullLiteral();
- {if (true) return expr;}
+ jj_consume_token(NULL);
+ {if (true) return "null";}
break;
default:
- jj_la1[60] = jj_gen;
+ jj_la1[68] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1830,36 +2260,31 @@ String expr;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TRUE:
jj_consume_token(TRUE);
- {if (true) return "true";}
+ {if (true) return "true";}
break;
case FALSE:
jj_consume_token(FALSE);
- {if (true) return "false";}
+ {if (true) return "false";}
break;
default:
- jj_la1[61] = 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 String NullLiteral() throws ParseException {
- jj_consume_token(NULL);
- {if (true) return "null";}
- throw new Error("Missing return statement in function");
- }
-
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:
@@ -1877,14 +2302,16 @@ String expr = null;
expr = ArgumentList();
break;
default:
- jj_la1[62] = jj_gen;
+ jj_la1[70] = jj_gen;
;
}
try {
jj_consume_token(RPAREN);
} catch (ParseException e) {
- errorMessage = "')' expected to close the argument list";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
{if (true) throw e;}
}
if (expr == null) {
@@ -1896,7 +2323,7 @@ String expr = null;
static final public String ArgumentList() throws ParseException {
String expr;
-StringBuffer buff = new StringBuffer();
+final StringBuffer buff = new StringBuffer();
expr = Expression();
buff.append(expr);
label_22:
@@ -1906,48 +2333,43 @@ StringBuffer buff = new StringBuffer();
;
break;
default:
- jj_la1[63] = jj_gen;
+ jj_la1[71] = jj_gen;
break label_22;
}
jj_consume_token(COMMA);
try {
expr = Expression();
} catch (ParseException e) {
- errorMessage = "expression expected after a comma in argument list";
+ 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");
+ 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();
try {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case SEMICOLON:
- jj_consume_token(SEMICOLON);
- break;
- case 135:
- jj_consume_token(135);
- break;
- default:
- jj_la1[64] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
+ jj_consume_token(SEMICOLON);
} catch (ParseException e) {
- errorMessage = "';' expected";
- errorLevel = ERROR;
- {if (true) throw 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) {
@@ -1968,8 +2390,10 @@ StringBuffer buff = new StringBuffer();
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;
@@ -1991,9 +2415,6 @@ StringBuffer buff = new StringBuffer();
case FOREACH:
ForeachStatement();
break;
- case BREAK:
- BreakStatement();
- break;
case CONTINUE:
ContinueStatement();
break;
@@ -2013,7 +2434,7 @@ StringBuffer buff = new StringBuffer();
jj_consume_token(AT);
break;
default:
- jj_la1[65] = jj_gen;
+ jj_la1[72] = jj_gen;
;
}
IncludeStatement();
@@ -2025,202 +2446,299 @@ StringBuffer buff = new StringBuffer();
GlobalStatement();
break;
default:
- jj_la1[66] = jj_gen;
+ jj_la1[73] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
}
- static final public void IncludeStatement() throws ParseException {
- String expr;
- int pos = jj_input_stream.bufpos;
+/**
+ * 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);
- expr = Expression();
- if (currentSegment != null) {
- currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr));
+ 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();
}
- try {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case SEMICOLON:
- jj_consume_token(SEMICOLON);
- break;
- case 135:
- jj_consume_token(135);
- break;
- default:
- jj_la1[67] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- } catch (ParseException e) {
- errorMessage = "';' expected";
+ }
+
+/**
+ * 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 PHPECHOSTART:
+ ;
+ break;
+ default:
+ jj_la1[75] = jj_gen;
+ break label_23;
+ }
+ phpEchoBlock();
+ }
+ try {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PHPSTARTLONG:
+ jj_consume_token(PHPSTARTLONG);
+ break;
+ case PHPSTARTSHORT:
+ jj_consume_token(PHPSTARTSHORT);
+ break;
+ default:
+ 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 < 110; 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) {
@@ -5191,6 +6450,7 @@ StringBuffer buff = new StringBuffer();
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;