X-Git-Url: http://secure.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index 4440696..f151bde 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -8,7 +8,6 @@ import org.eclipse.ui.texteditor.MarkerUtilities;
import org.eclipse.jface.preference.IPreferenceStore;
import java.util.Hashtable;
-import java.util.Enumeration;
import java.util.ArrayList;
import java.io.StringReader;
import java.io.*;
@@ -18,7 +17,9 @@ import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
import net.sourceforge.phpdt.internal.compiler.ast.*;
import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
+import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
+import junit.framework.Assert;
/**
* A new php parser.
@@ -29,9 +30,6 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
*/
public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants {
- /** The file that is parsed. */
- private static IFile fileToParse;
-
/** The current segment. */
private static OutlineableWithChildren currentSegment;
@@ -39,8 +37,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
static PHPOutlineInfo outlineInfo;
- 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 */
@@ -49,6 +45,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
private static int errorStart = -1;
private static int errorEnd = -1;
private static PHPDocument phpDocument;
+
+ private static final char[] SYNTAX_ERROR_CHAR = {'s','y','n','t','a','x',' ','e','r','r','o','r'};
/**
* The point where html starts.
* It will be used by the token manager to create HTMLCode objects
@@ -62,8 +60,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
/** The cursor in expression stack. */
private static int nodePtr;
+ private static final boolean PARSER_DEBUG = false;
+
public final void setFileToParse(final IFile fileToParse) {
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
}
public PHPParser() {
@@ -71,7 +71,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
public PHPParser(final IFile fileToParse) {
this(new StringReader(""));
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
}
/**
@@ -87,12 +87,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* Add an php node on the stack.
* @param node the node that will be added to the stack
*/
- private static final void pushOnAstNodes(AstNode node) {
+ private static final void pushOnAstNodes(final AstNode node) {
try {
nodes[++nodePtr] = node;
} catch (IndexOutOfBoundsException e) {
- int oldStackLength = nodes.length;
- AstNode[] oldStack = nodes;
+ final int oldStackLength = nodes.length;
+ final AstNode[] oldStack = nodes;
nodes = new AstNode[oldStackLength + AstStackIncrement];
System.arraycopy(oldStack, 0, nodes, 0, oldStackLength);
nodePtr = oldStackLength;
@@ -114,7 +114,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
parse();
phpDocument.nodes = new AstNode[nodes.length];
System.arraycopy(nodes,0,phpDocument.nodes,0,nodes.length);
- phpDocument.toString();
+ if (PHPeclipsePlugin.DEBUG) {
+ PHPeclipsePlugin.log(1,phpDocument.toString());
+ }
} catch (ParseException e) {
processParseException(e);
}
@@ -127,6 +129,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* @param e the ParseException
*/
private static void processParseException(final ParseException e) {
+ if (PARSER_DEBUG) {
+ e.printStackTrace();
+ Assert.assertTrue(false);
+ }
if (errorMessage == null) {
PHPeclipsePlugin.log(e);
errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
@@ -135,10 +141,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
setMarker(e);
errorMessage = null;
+ // if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e);
}
/**
- * Create marker for the parse error
+ * Create marker for the parse error.
* @param e the ParseException
*/
private static void setMarker(final ParseException e) {
@@ -165,42 +172,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
}
- /**
- * Create markers according to the external parser output
- */
- 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;
- boolean flag = true;
- while ((brIndx = output.indexOf("
", indx)) != -1) {
- // newer php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 6;
- flag = false;
- }
- if (flag) {
- while ((brIndx = output.indexOf("
", indx)) != -1) {
- // older php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 4;
- }
- }
- }
-
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);
+ final StringBuffer lineNumberBuffer = new StringBuffer(10);
char ch;
current = output.substring(indx, brIndx);
if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) {
- int onLine = current.indexOf("on line ");
+ final int onLine = current.indexOf("on line ");
if (onLine != -1) {
lineNumberBuffer.delete(0, lineNumberBuffer.length());
for (int i = onLine; i < current.length(); i++) {
@@ -210,9 +192,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
}
- int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
+ final int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
- Hashtable attributes = new Hashtable();
+ final Hashtable attributes = new Hashtable();
current = current.replaceAll("\n", "");
current = current.replaceAll("", "");
@@ -231,7 +213,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
}
- public final void parse(final String s) throws CoreException {
+ public final void parse(final String s) {
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
@@ -272,13 +254,31 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
*/
public static final void createNewHTMLCode() {
final int currentPosition = SimpleCharStream.getPosition();
- if (currentPosition == htmlStart) {
+ if (currentPosition == htmlStart || currentPosition > SimpleCharStream.currentBuffer.length()) {
return;
}
final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray();
pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
}
+ /** Create a new task. */
+ public static final void createNewTask() {
+ final int currentPosition = SimpleCharStream.getPosition();
+ final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3,
+ SimpleCharStream.currentBuffer.indexOf("\n",
+ currentPosition)-1);
+ PHPeclipsePlugin.log(1,SimpleCharStream.currentBuffer.toString());
+ try {
+ setMarker(fileToParse,
+ todo,
+ SimpleCharStream.getBeginLine(),
+ TASK,
+ "Line "+SimpleCharStream.getBeginLine());
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
+ }
+
private static final void parse() throws ParseException {
phpFile();
}
@@ -305,6 +305,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INCLUDE_ONCE:
case REQUIRE_ONCE:
case GLOBAL:
+ case DEFINE:
case STATIC:
case CONTINUE:
case DO:
@@ -320,8 +321,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
@@ -341,7 +342,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
PhpBlock();
}
- jj_consume_token(0);
+ PHPParser.createNewHTMLCode();
} catch (TokenMgrError e) {
PHPeclipsePlugin.log(e);
errorStart = SimpleCharStream.getPosition();
@@ -359,9 +360,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
*/
static final public void PhpBlock() throws ParseException {
final int start = SimpleCharStream.getPosition();
+ final PHPEchoBlock phpEchoBlock;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPECHOSTART:
- phpEchoBlock();
+ phpEchoBlock = phpEchoBlock();
+ pushOnAstNodes(phpEchoBlock);
break;
case PHPSTARTSHORT:
case PHPSTARTLONG:
@@ -379,6 +382,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INCLUDE_ONCE:
case REQUIRE_ONCE:
case GLOBAL:
+ case DEFINE:
case STATIC:
case CONTINUE:
case DO:
@@ -394,8 +398,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
@@ -445,7 +449,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
}
break;
default:
@@ -458,7 +462,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
static final public PHPEchoBlock phpEchoBlock() throws ParseException {
final Expression expr;
final int pos = SimpleCharStream.getPosition();
- PHPEchoBlock echoBlock;
+ final PHPEchoBlock echoBlock;
jj_consume_token(PHPECHOSTART);
expr = Expression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -493,6 +497,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INCLUDE_ONCE:
case REQUIRE_ONCE:
case GLOBAL:
+ case DEFINE:
case STATIC:
case CONTINUE:
case DO:
@@ -508,8 +513,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
@@ -533,46 +538,50 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
static final public ClassDeclaration ClassDeclaration() throws ParseException {
final ClassDeclaration classDeclaration;
- final Token className;
- Token superclassName = null;
+ final Token className,superclassName;
final int pos;
+ char[] classNameImage = SYNTAX_ERROR_CHAR;
+ char[] superclassNameImage = null;
jj_consume_token(CLASS);
+ pos = SimpleCharStream.getPosition();
try {
- pos = SimpleCharStream.getPosition();
className = jj_consume_token(IDENTIFIER);
+ classNameImage = className.image.toCharArray();
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EXTENDS:
jj_consume_token(EXTENDS);
try {
superclassName = jj_consume_token(IDENTIFIER);
+ superclassNameImage = superclassName.image.toCharArray();
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
+ superclassNameImage = SYNTAX_ERROR_CHAR;
}
break;
default:
jj_la1[6] = jj_gen;
;
}
- if (superclassName == null) {
+ if (superclassNameImage == null) {
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
+ classNameImage,
pos,
0);
} else {
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
- superclassName.image.toCharArray(),
+ classNameImage,
+ superclassNameImage,
pos,
0);
}
@@ -586,15 +595,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
throw new Error("Missing return statement in function");
}
- static final public void ClassBody(ClassDeclaration classDeclaration) throws ParseException {
+ static final public void ClassBody(final ClassDeclaration classDeclaration) throws ParseException {
try {
jj_consume_token(LBRACE);
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
}
label_3:
while (true) {
@@ -612,27 +621,29 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
try {
jj_consume_token(RBRACE);
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', 'var', 'function' or '}' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
}
}
/**
* A class can contain only methods and fields.
*/
- static final public void ClassBodyDeclaration(ClassDeclaration classDeclaration) throws ParseException {
- MethodDeclaration method;
- FieldDeclaration field;
+ static final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException {
+ final MethodDeclaration method;
+ final FieldDeclaration field;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FUNCTION:
method = MethodDeclaration();
- method.setParent(classDeclaration);
+ method.analyzeCode();
+ classDeclaration.addMethod(method);
break;
case VAR:
field = FieldDeclaration();
+ classDeclaration.addField(field);
break;
default:
jj_la1[8] = jj_gen;
@@ -643,17 +654,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
/**
* A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ * it is only used by ClassBodyDeclaration()
*/
static final public FieldDeclaration FieldDeclaration() throws ParseException {
VariableDeclaration variableDeclaration;
- VariableDeclaration[] list;
+ final VariableDeclaration[] list;
final ArrayList arrayList = new ArrayList();
final int pos = SimpleCharStream.getPosition();
jj_consume_token(VAR);
- variableDeclaration = VariableDeclarator();
+ variableDeclaration = VariableDeclaratorNoSuffix();
arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name));
- currentSegment.add(variableDeclaration);
+ outlineInfo.addVariable(new String(variableDeclaration.name()));
label_4:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -665,10 +676,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
break label_4;
}
jj_consume_token(COMMA);
- variableDeclaration = VariableDeclarator();
+ variableDeclaration = VariableDeclaratorNoSuffix();
arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name));
- currentSegment.add(variableDeclaration);
+ outlineInfo.addVariable(new String(variableDeclaration.name()));
}
try {
jj_consume_token(SEMICOLON);
@@ -677,7 +687,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
}
list = new VariableDeclaration[arrayList.size()];
arrayList.toArray(list);
@@ -688,6 +698,49 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
throw new Error("Missing return statement in function");
}
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ * It will be used by fields and formal parameters
+ */
+ static final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException {
+ final Token varName;
+ Expression initializer = null;
+ final int pos = SimpleCharStream.getPosition();
+ varName = jj_consume_token(DOLLAR_ID);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ASSIGN:
+ jj_consume_token(ASSIGN);
+ try {
+ initializer = VariableInitializer();
+ } catch (ParseException e) {
+ errorMessage = "Literal expression expected in variable initializer";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
+ }
+ break;
+ default:
+ jj_la1[10] = jj_gen;
+ ;
+ }
+ if (initializer == null) {
+ {if (true) return new VariableDeclaration(currentSegment,
+ new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
+ pos,
+ SimpleCharStream.getPosition());}
+ }
+ {if (true) return new VariableDeclaration(currentSegment,
+ new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
+ initializer,
+ VariableDeclaration.EQUAL,
+ pos);}
+ throw new Error("Missing return statement in function");
+ }
+
+/**
+ * this will be used by static statement
+ */
static final public VariableDeclaration VariableDeclarator() throws ParseException {
final String varName;
Expression initializer = null;
@@ -703,23 +756,24 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
}
break;
default:
- jj_la1[10] = jj_gen;
+ jj_la1[11] = jj_gen;
;
}
if (initializer == null) {
{if (true) return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
+ new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
pos,
SimpleCharStream.getPosition());}
}
{if (true) return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- initializer,
- pos);}
+ new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
+ initializer,
+ VariableDeclaration.EQUAL,
+ pos);}
throw new Error("Missing return statement in function");
}
@@ -728,14 +782,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* @return the variable name (with suffix)
*/
static final public String VariableDeclaratorId() throws ParseException {
- String expr;
- Expression expression;
- final StringBuffer buff = new StringBuffer();
+ final String var;
+ Expression expression = null;
final int pos = SimpleCharStream.getPosition();
ConstantIdentifier ex;
try {
- expr = Variable();
- buff.append(expr);
+ var = Variable();
label_5:
while (true) {
if (jj_2_1(2)) {
@@ -743,13 +795,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
} else {
break label_5;
}
- ex = new ConstantIdentifier(expr.toCharArray(),
+ ex = new ConstantIdentifier(var.toCharArray(),
pos,
SimpleCharStream.getPosition());
expression = VariableSuffix(ex);
- buff.append(expression.toStringExpression());
}
- {if (true) return buff.toString();}
+ if (expression == null) {
+ {if (true) return var;}
+ }
+ {if (true) return expression.toStringExpression();}
} catch (ParseException e) {
errorMessage = "'$' expected for variable identifier";
errorLevel = ERROR;
@@ -760,6 +814,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
throw new Error("Missing return statement in function");
}
+/**
+ * Return a variablename without the $.
+ * @return a variable name
+ */
static final public String Variable() throws ParseException {
final StringBuffer buff;
Expression expression = null;
@@ -775,34 +833,38 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
jj_consume_token(RBRACE);
break;
default:
- jj_la1[11] = jj_gen;
+ jj_la1[12] = jj_gen;
;
}
- if (expression == null && !assigning) {
+ if (expression == null) {
{if (true) return token.image.substring(1);}
}
buff = new StringBuffer(token.image);
- buff.append('{');
+ buff.append("{");
buff.append(expression.toStringExpression());
- buff.append('}');
+ buff.append("}");
{if (true) return buff.toString();}
break;
case DOLLAR:
jj_consume_token(DOLLAR);
expr = VariableName();
- {if (true) return "$" + expr;}
+ {if (true) return expr;}
break;
default:
- jj_la1[12] = jj_gen;
+ jj_la1[13] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
+/**
+ * A Variable name (without the $)
+ * @return a variable name String
+ */
static final public String VariableName() throws ParseException {
final StringBuffer buff;
- String expr = null;
+ final String expr;
Expression expression = null;
final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -824,22 +886,22 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
jj_consume_token(RBRACE);
break;
default:
- jj_la1[13] = jj_gen;
+ jj_la1[14] = jj_gen;
;
}
if (expression == null) {
{if (true) return token.image;}
}
buff = new StringBuffer(token.image);
- buff.append('{');
+ buff.append("{");
buff.append(expression.toStringExpression());
- buff.append('}');
+ buff.append("}");
{if (true) return buff.toString();}
break;
case DOLLAR:
jj_consume_token(DOLLAR);
expr = VariableName();
- buff = new StringBuffer('$');
+ buff = new StringBuffer("$");
buff.append(expr);
{if (true) return buff.toString();}
break;
@@ -848,7 +910,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
{if (true) return token.image;}
break;
default:
- jj_la1[14] = jj_gen;
+ jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -879,7 +941,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[15] = jj_gen;
+ jj_la1[16] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -899,7 +961,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[16] = jj_gen;
+ jj_la1[17] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -918,7 +980,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
{if (true) return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
break;
default:
- jj_la1[17] = jj_gen;
+ jj_la1[18] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -926,16 +988,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
static final public ArrayVariableDeclaration ArrayVariable() throws ParseException {
-Expression expr,expr2;
+final Expression expr,expr2;
expr = Expression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAYASSIGN:
jj_consume_token(ARRAYASSIGN);
expr2 = Expression();
- {if (true) return new ArrayVariableDeclaration(expr,expr2);}
+ {if (true) return new ArrayVariableDeclaration(expr,expr2);}
break;
default:
- jj_la1[18] = jj_gen;
+ jj_la1[19] = jj_gen;
;
}
{if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
@@ -957,8 +1019,8 @@ Expression expr,expr2;
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
@@ -969,7 +1031,7 @@ Expression expr,expr2;
case LPAREN:
case DOLLAR_ID:
expr = ArrayVariable();
- list.add(expr);
+ list.add(expr);
label_6:
while (true) {
if (jj_2_2(2)) {
@@ -979,24 +1041,24 @@ Expression expr,expr2;
}
jj_consume_token(COMMA);
expr = ArrayVariable();
- list.add(expr);
+ list.add(expr);
}
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[20] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
jj_consume_token(COMMA);
- list.add(null);
+ list.add(null);
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[21] = jj_gen;
;
}
jj_consume_token(RPAREN);
- ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+ final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
list.toArray(vars);
{if (true) return vars;}
throw new Error("Missing return statement in function");
@@ -1009,6 +1071,7 @@ Expression expr,expr2;
static final public MethodDeclaration MethodDeclaration() throws ParseException {
final MethodDeclaration functionDeclaration;
final Block block;
+ final OutlineableWithChildren seg = currentSegment;
jj_consume_token(FUNCTION);
try {
functionDeclaration = MethodDeclarator();
@@ -1021,16 +1084,11 @@ Expression expr,expr2;
errorEnd = SimpleCharStream.getPosition() + 1;
{if (true) throw e;}
}
- if (currentSegment != null) {
- currentSegment.add(functionDeclaration);
- currentSegment = functionDeclaration;
- }
+ currentSegment = functionDeclaration;
block = Block();
- functionDeclaration.statements = block.statements;
- if (currentSegment != null) {
- currentSegment = (OutlineableWithChildren) currentSegment.getParent();
- }
- {if (true) return functionDeclaration;}
+ functionDeclaration.statements = block.statements;
+ currentSegment = seg;
+ {if (true) return functionDeclaration;}
throw new Error("Missing return statement in function");
}
@@ -1044,22 +1102,33 @@ Expression expr,expr2;
Token reference = null;
final Hashtable formalParameters;
final int pos = SimpleCharStream.getPosition();
+ char[] identifierChar = SYNTAX_ERROR_CHAR;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BIT_AND:
reference = jj_consume_token(BIT_AND);
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[22] = jj_gen;
;
}
- identifier = jj_consume_token(IDENTIFIER);
+ try {
+ identifier = jj_consume_token(IDENTIFIER);
+ identifierChar = identifier.image.toCharArray();
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
+ }
formalParameters = FormalParameters();
- {if (true) return new MethodDeclaration(currentSegment,
- identifier.image.toCharArray(),
- formalParameters,
- reference != null,
- pos,
- SimpleCharStream.getPosition());}
+ MethodDeclaration method = new MethodDeclaration(currentSegment,
+ identifierChar,
+ formalParameters,
+ reference != null,
+ pos,
+ SimpleCharStream.getPosition());
+ {if (true) return method;}
throw new Error("Missing return statement in function");
}
@@ -1077,14 +1146,13 @@ Expression expr,expr2;
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case DOLLAR:
case BIT_AND:
case DOLLAR_ID:
var = FormalParameter();
- parameters.put(new String(var.name),var);
+ parameters.put(new String(var.name()),var);
label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1092,16 +1160,16 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[22] = jj_gen;
+ jj_la1[23] = jj_gen;
break label_7;
}
jj_consume_token(COMMA);
var = FormalParameter();
- parameters.put(new String(var.name),var);
+ parameters.put(new String(var.name()),var);
}
break;
default:
- jj_la1[23] = jj_gen;
+ jj_la1[24] = jj_gen;
;
}
try {
@@ -1111,7 +1179,7 @@ Expression expr,expr2;
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ processParseException(e);
}
{if (true) return parameters;}
throw new Error("Missing return statement in function");
@@ -1129,10 +1197,10 @@ Expression expr,expr2;
token = jj_consume_token(BIT_AND);
break;
default:
- jj_la1[24] = jj_gen;
+ jj_la1[25] = jj_gen;
;
}
- variableDeclaration = VariableDeclarator();
+ variableDeclaration = VariableDeclaratorNoSuffix();
if (token != null) {
variableDeclaration.setReference(true);
}
@@ -1146,59 +1214,50 @@ Expression expr,expr2;
case STRING:
jj_consume_token(STRING);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.STRING,
- pos,pos-6);}
+ {if (true) return new ConstantIdentifier(Types.STRING,pos,pos-6);}
break;
case BOOL:
jj_consume_token(BOOL);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.BOOL,
- pos,pos-4);}
+ {if (true) return new ConstantIdentifier(Types.BOOL,pos,pos-4);}
break;
case BOOLEAN:
jj_consume_token(BOOLEAN);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.BOOLEAN,
- pos,pos-7);}
+ {if (true) return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);}
break;
case REAL:
jj_consume_token(REAL);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.REAL,
- pos,pos-4);}
+ {if (true) return new ConstantIdentifier(Types.REAL,pos,pos-4);}
break;
case DOUBLE:
jj_consume_token(DOUBLE);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.DOUBLE,
- pos,pos-5);}
+ {if (true) return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);}
break;
case FLOAT:
jj_consume_token(FLOAT);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.FLOAT,
- pos,pos-5);}
+ {if (true) return new ConstantIdentifier(Types.FLOAT,pos,pos-5);}
break;
case INT:
jj_consume_token(INT);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.INT,
- pos,pos-3);}
+ {if (true) return new ConstantIdentifier(Types.INT,pos,pos-3);}
break;
case INTEGER:
jj_consume_token(INTEGER);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.INTEGER,
- pos,pos-7);}
+ {if (true) return new ConstantIdentifier(Types.INTEGER,pos,pos-7);}
break;
case OBJECT:
jj_consume_token(OBJECT);
pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.OBJECT,
- pos,pos-6);}
+ {if (true) return new ConstantIdentifier(Types.OBJECT,pos,pos-6);}
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[26] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1207,141 +1266,190 @@ Expression expr,expr2;
static final public Expression Expression() throws ParseException {
final Expression expr;
+ Expression initializer = null;
+ final int pos = SimpleCharStream.getPosition();
+ int assignOperator = -1;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PRINT:
- expr = PrintExpression();
- {if (true) return expr;}
+ case ARRAY:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case AT:
+ case DOLLAR:
+ case BANG:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case IDENTIFIER:
+ case LPAREN:
+ 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 TILDEEQUAL:
+ case LSHIFTASSIGN:
+ case RSIGNEDSHIFTASSIGN:
+ assignOperator = AssignmentOperator();
+ try {
+ initializer = Expression();
+ } catch (ParseException e) {
+ if (errorMessage != null) {
+ {if (true) throw e;}
+ }
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+ errorLevel = ERROR;
+ errorEnd = SimpleCharStream.getPosition();
+ {if (true) throw e;}
+ }
+ break;
+ default:
+ jj_la1[27] = jj_gen;
+ ;
+ }
+ char[] varName = expr.toStringExpression().substring(1).toCharArray();
+ if (assignOperator == -1) {
+ {if (true) return new VariableDeclaration(currentSegment,
+ new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()),
+ pos,
+ SimpleCharStream.getPosition());}
+ {if (true) return expr;}
+ }
+ {if (true) return new VariableDeclaration(currentSegment,
+ new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()),
+ initializer,
+ assignOperator,
+ pos);}
+ {if (true) return expr;}
break;
case LIST:
- expr = ListExpression();
+ case PRINT:
+ expr = ExpressionWBang();
{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 AT:
- case DOLLAR:
- case BANG:
- case INCR:
- case DECR:
- case PLUS:
- case MINUS:
- case BIT_AND:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case DOLLAR_ID:
- expr = ConditionalExpression();
- {if (true) return expr;}
- break;
- default:
- jj_la1[27] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- }
+ jj_la1[28] = 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 VarAssignation varAssignation() throws ParseException {
- String varName;
- final Expression expression;
- final int assignOperator;
+ static final public Expression ExpressionWBang() throws ParseException {
+ final Expression expr;
final int pos = SimpleCharStream.getPosition();
- varName = VariableDeclaratorId();
- assignOperator = AssignmentOperator();
- try {
- expression = Expression();
- } catch (ParseException e) {
- if (errorMessage != null) {
- {if (true) throw e;}
- }
- errorMessage = "expression expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BANG:
+ jj_consume_token(BANG);
+ expr = ExpressionWBang();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+ break;
+ case LIST:
+ case PRINT:
+ expr = ExpressionNoBang();
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[29] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ throw new Error("Missing return statement in function");
+ }
+
+ static final public Expression ExpressionNoBang() throws ParseException {
+ Expression expr;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PRINT:
+ expr = PrintExpression();
+ {if (true) return expr;}
+ break;
+ case LIST:
+ expr = ListExpression();
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[30] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
- {if (true) return new VarAssignation(varName.toCharArray(),
- expression,
- assignOperator,
- pos,
- SimpleCharStream.getPosition());}
throw new Error("Missing return statement in function");
}
+/**
+ * Any assignement operator.
+ * @return the assignement operator id
+ */
static final public int AssignmentOperator() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ASSIGN:
jj_consume_token(ASSIGN);
- {if (true) return VarAssignation.EQUAL;}
+ {if (true) return VariableDeclaration.EQUAL;}
break;
case STARASSIGN:
jj_consume_token(STARASSIGN);
- {if (true) return VarAssignation.STAR_EQUAL;}
+ {if (true) return VariableDeclaration.STAR_EQUAL;}
break;
case SLASHASSIGN:
jj_consume_token(SLASHASSIGN);
- {if (true) return VarAssignation.SLASH_EQUAL;}
+ {if (true) return VariableDeclaration.SLASH_EQUAL;}
break;
case REMASSIGN:
jj_consume_token(REMASSIGN);
- {if (true) return VarAssignation.REM_EQUAL;}
+ {if (true) return VariableDeclaration.REM_EQUAL;}
break;
case PLUSASSIGN:
jj_consume_token(PLUSASSIGN);
- {if (true) return VarAssignation.PLUS_EQUAL;}
+ {if (true) return VariableDeclaration.PLUS_EQUAL;}
break;
case MINUSASSIGN:
jj_consume_token(MINUSASSIGN);
- {if (true) return VarAssignation.MINUS_EQUAL;}
+ {if (true) return VariableDeclaration.MINUS_EQUAL;}
break;
case LSHIFTASSIGN:
jj_consume_token(LSHIFTASSIGN);
- {if (true) return VarAssignation.LSHIFT_EQUAL;}
+ {if (true) return VariableDeclaration.LSHIFT_EQUAL;}
break;
case RSIGNEDSHIFTASSIGN:
jj_consume_token(RSIGNEDSHIFTASSIGN);
- {if (true) return VarAssignation.RSIGNEDSHIFT_EQUAL;}
+ {if (true) return VariableDeclaration.RSIGNEDSHIFT_EQUAL;}
break;
case ANDASSIGN:
jj_consume_token(ANDASSIGN);
- {if (true) return VarAssignation.AND_EQUAL;}
+ {if (true) return VariableDeclaration.AND_EQUAL;}
break;
case XORASSIGN:
jj_consume_token(XORASSIGN);
- {if (true) return VarAssignation.XOR_EQUAL;}
+ {if (true) return VariableDeclaration.XOR_EQUAL;}
break;
case ORASSIGN:
jj_consume_token(ORASSIGN);
- {if (true) return VarAssignation.OR_EQUAL;}
+ {if (true) return VariableDeclaration.OR_EQUAL;}
break;
case DOTASSIGN:
jj_consume_token(DOTASSIGN);
- {if (true) return VarAssignation.DOT_EQUAL;}
+ {if (true) return VariableDeclaration.DOT_EQUAL;}
break;
case TILDEEQUAL:
jj_consume_token(TILDEEQUAL);
- {if (true) return VarAssignation.TILDE_EQUAL;}
+ {if (true) return VariableDeclaration.TILDE_EQUAL;}
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[31] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1361,7 +1469,7 @@ Expression expr,expr2;
expr3 = ConditionalExpression();
break;
default:
- jj_la1[29] = jj_gen;
+ jj_la1[32] = jj_gen;
;
}
if (expr3 == null) {
@@ -1383,7 +1491,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[33] = jj_gen;
break label_8;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1396,7 +1504,7 @@ Expression expr,expr2;
operator = OperatorIds.ORL;
break;
default:
- jj_la1[31] = jj_gen;
+ jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1419,7 +1527,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[35] = jj_gen;
break label_9;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1432,7 +1540,7 @@ Expression expr,expr2;
operator = OperatorIds.ANDL;
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[36] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1453,7 +1561,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[37] = jj_gen;
break label_10;
}
jj_consume_token(DOT);
@@ -1474,7 +1582,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[35] = jj_gen;
+ jj_la1[38] = jj_gen;
break label_11;
}
jj_consume_token(BIT_OR);
@@ -1495,7 +1603,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[39] = jj_gen;
break label_12;
}
jj_consume_token(XOR);
@@ -1516,7 +1624,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[37] = jj_gen;
+ jj_la1[40] = jj_gen;
break label_13;
}
jj_consume_token(BIT_AND);
@@ -1542,7 +1650,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[38] = jj_gen;
+ jj_la1[41] = jj_gen;
break label_14;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1567,7 +1675,7 @@ Expression expr,expr2;
operator = OperatorIds.EQUAL_EQUAL_EQUAL;
break;
default:
- jj_la1[39] = jj_gen;
+ jj_la1[42] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1603,7 +1711,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[43] = jj_gen;
break label_15;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1624,7 +1732,7 @@ Expression expr,expr2;
operator = OperatorIds.GREATER_EQUAL;
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[44] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1648,7 +1756,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[45] = jj_gen;
break label_16;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1665,7 +1773,7 @@ Expression expr,expr2;
operator = OperatorIds.UNSIGNED_RIGHT_SHIFT;
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[46] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1688,7 +1796,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[47] = jj_gen;
break label_17;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1701,7 +1809,7 @@ Expression expr,expr2;
operator = OperatorIds.MINUS;
break;
default:
- jj_la1[45] = jj_gen;
+ jj_la1[48] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1734,7 +1842,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[46] = jj_gen;
+ jj_la1[49] = jj_gen;
break label_18;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1751,7 +1859,7 @@ Expression expr,expr2;
operator = OperatorIds.REMAINDER;
break;
default:
- jj_la1[47] = jj_gen;
+ jj_la1[50] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1766,7 +1874,7 @@ Expression expr,expr2;
* An unary expression starting with @, & or nothing
*/
static final public Expression UnaryExpression() throws ParseException {
- Expression expr;
+ final Expression expr;
final int pos = SimpleCharStream.getPosition();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BIT_AND:
@@ -1782,8 +1890,8 @@ Expression expr,expr2;
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case INTEGER_LITERAL:
@@ -1792,35 +1900,43 @@ Expression expr,expr2;
case IDENTIFIER:
case LPAREN:
case DOLLAR_ID:
- expr = AtUnaryExpression();
- {if (true) return expr;}
+ expr = AtNotUnaryExpression();
+ {if (true) return expr;}
break;
default:
- jj_la1[48] = 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 Expression AtUnaryExpression() throws ParseException {
- Expression expr;
+/**
+ * An expression prefixed (or not) by one or more @ and !.
+ * @return the expression
+ */
+ static final public Expression AtNotUnaryExpression() throws ParseException {
+ final Expression expr;
final int pos = SimpleCharStream.getPosition();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AT:
jj_consume_token(AT);
- expr = AtUnaryExpression();
+ expr = AtNotUnaryExpression();
{if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
break;
+ case BANG:
+ jj_consume_token(BANG);
+ expr = AtNotUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+ break;
case ARRAY:
case NEW:
case NULL:
case TRUE:
case FALSE:
case DOLLAR:
- case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case INTEGER_LITERAL:
@@ -1833,7 +1949,7 @@ Expression expr,expr2;
{if (true) return expr;}
break;
default:
- jj_la1[49] = jj_gen;
+ jj_la1[52] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1841,8 +1957,8 @@ Expression expr,expr2;
}
static final public Expression UnaryExpressionNoPrefix() throws ParseException {
- Expression expr;
- int operator;
+ final Expression expr;
+ final int operator;
final int pos = SimpleCharStream.getPosition();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
@@ -1850,22 +1966,22 @@ Expression expr,expr2;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
jj_consume_token(PLUS);
- operator = OperatorIds.PLUS;
+ operator = OperatorIds.PLUS;
break;
case MINUS:
jj_consume_token(MINUS);
- operator = OperatorIds.MINUS;
+ operator = OperatorIds.MINUS;
break;
default:
- jj_la1[50] = jj_gen;
+ jj_la1[53] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
expr = UnaryExpression();
{if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
break;
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
expr = PreIncDecExpression();
{if (true) return expr;}
break;
@@ -1875,7 +1991,6 @@ Expression expr,expr2;
case TRUE:
case FALSE:
case DOLLAR:
- case BANG:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
@@ -1886,7 +2001,7 @@ Expression expr,expr2;
{if (true) return expr;}
break;
default:
- jj_la1[51] = jj_gen;
+ jj_la1[54] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1898,16 +2013,16 @@ final Expression expr;
final int operator;
final int pos = SimpleCharStream.getPosition();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INCR:
- jj_consume_token(INCR);
- operator = OperatorIds.PLUS_PLUS;
+ case PLUS_PLUS:
+ jj_consume_token(PLUS_PLUS);
+ operator = OperatorIds.PLUS_PLUS;
break;
- case DECR:
- jj_consume_token(DECR);
- operator = OperatorIds.MINUS_MINUS;
+ case MINUS_MINUS:
+ jj_consume_token(MINUS_MINUS);
+ operator = OperatorIds.MINUS_MINUS;
break;
default:
- jj_la1[52] = jj_gen;
+ jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1917,57 +2032,48 @@ final int operator;
}
static final public Expression UnaryExpressionNotPlusMinus() throws ParseException {
- Expression expr;
+ final Expression expr;
final int pos = SimpleCharStream.getPosition();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BANG:
- jj_consume_token(BANG);
- expr = UnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
- break;
- default:
- jj_la1[53] = jj_gen;
- if (jj_2_4(2147483647)) {
- expr = CastExpression();
+ if (jj_2_3(2147483647)) {
+ expr = CastExpression();
{if (true) return expr;}
- } else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ARRAY:
- case NEW:
- case DOLLAR:
- case IDENTIFIER:
- case DOLLAR_ID:
- expr = PostfixExpression();
+ } else {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case NEW:
+ case DOLLAR:
+ case IDENTIFIER:
+ case DOLLAR_ID:
+ expr = PostfixExpression();
{if (true) return expr;}
- break;
- case NULL:
- case TRUE:
- case FALSE:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- expr = Literal();
+ break;
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ expr = Literal();
{if (true) return expr;}
- break;
- case LPAREN:
- jj_consume_token(LPAREN);
- expr = Expression();
- try {
- jj_consume_token(RPAREN);
- } catch (ParseException e) {
+ break;
+ case LPAREN:
+ jj_consume_token(LPAREN);
+ expr = Expression();
+ try {
+ jj_consume_token(RPAREN);
+ } catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
{if (true) throw e;}
- }
- {if (true) return expr;}
- break;
- default:
- jj_la1[54] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
}
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[56] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
}
throw new Error("Missing return statement in function");
@@ -1992,10 +2098,10 @@ final int pos = SimpleCharStream.getPosition();
break;
case ARRAY:
jj_consume_token(ARRAY);
- type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());
+ type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());
break;
default:
- jj_la1[55] = jj_gen;
+ jj_la1[57] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2006,30 +2112,30 @@ final int pos = SimpleCharStream.getPosition();
}
static final public Expression PostfixExpression() throws ParseException {
- Expression expr;
+ final Expression expr;
int operator = -1;
final int pos = SimpleCharStream.getPosition();
expr = PrimaryExpression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INCR:
- jj_consume_token(INCR);
- operator = OperatorIds.PLUS_PLUS;
+ case PLUS_PLUS:
+ jj_consume_token(PLUS_PLUS);
+ operator = OperatorIds.PLUS_PLUS;
break;
- case DECR:
- jj_consume_token(DECR);
- operator = OperatorIds.MINUS_MINUS;
+ case MINUS_MINUS:
+ jj_consume_token(MINUS_MINUS);
+ operator = OperatorIds.MINUS_MINUS;
break;
default:
- jj_la1[56] = jj_gen;
+ jj_la1[58] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[57] = jj_gen;
+ jj_la1[59] = jj_gen;
;
}
if (operator == -1) {
@@ -2040,78 +2146,68 @@ final int pos = SimpleCharStream.getPosition();
}
static final public Expression PrimaryExpression() throws ParseException {
- final Token identifier;
Expression expr;
+ int assignOperator = -1;
+ final Token identifier;
+ final String var;
final int pos = SimpleCharStream.getPosition();
- if (jj_2_5(2)) {
- identifier = jj_consume_token(IDENTIFIER);
- jj_consume_token(STATICCLASSACCESS);
- expr = ClassIdentifier();
- expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
- expr,
- ClassAccess.STATIC);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DOLLAR:
+ case IDENTIFIER:
+ case DOLLAR_ID:
+ expr = PrimaryPrefix();
label_19:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CLASSACCESS:
- case LPAREN:
+ case STATICCLASSACCESS:
case LBRACKET:
;
break;
default:
- jj_la1[58] = jj_gen;
+ jj_la1[60] = jj_gen;
break label_19;
}
expr = PrimarySuffix(expr);
}
- {if (true) return expr;}
- } else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case NEW:
- case DOLLAR:
- case IDENTIFIER:
- case DOLLAR_ID:
- expr = PrimaryPrefix();
- label_20:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case CLASSACCESS:
- case LPAREN:
- case LBRACKET:
- ;
- break;
- default:
- jj_la1[59] = jj_gen;
- break label_20;
- }
- expr = PrimarySuffix(expr);
- }
- {if (true) return expr;}
+ case LPAREN:
+ expr = Arguments(expr);
break;
- case ARRAY:
- expr = ArrayDeclarator();
+ default:
+ jj_la1[61] = jj_gen;
+ ;
+ }
{if (true) return expr;}
+ break;
+ case NEW:
+ jj_consume_token(NEW);
+ expr = ClassIdentifier();
+ expr = new PrefixedUnaryExpression(expr,
+ OperatorIds.NEW,
+ pos);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ expr = Arguments(expr);
break;
default:
- jj_la1[60] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ jj_la1[62] = jj_gen;
+ ;
}
+ {if (true) return expr;}
+ break;
+ case ARRAY:
+ expr = ArrayDeclarator();
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[63] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
throw new Error("Missing return statement in function");
}
- static final public ArrayInitializer ArrayDeclarator() throws ParseException {
- final ArrayVariableDeclaration[] vars;
- final int pos = SimpleCharStream.getPosition();
- jj_consume_token(ARRAY);
- vars = ArrayInitializer();
- {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
- throw new Error("Missing return statement in function");
- }
-
static final public Expression PrimaryPrefix() throws ParseException {
final Expression expr;
final Token token;
@@ -2124,28 +2220,60 @@ final int pos = SimpleCharStream.getPosition();
pos,
SimpleCharStream.getPosition());}
break;
- case NEW:
- jj_consume_token(NEW);
- expr = ClassIdentifier();
- {if (true) return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);}
- break;
case DOLLAR:
case DOLLAR_ID:
var = VariableDeclaratorId();
- {if (true) return new ConstantIdentifier(var.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ {if (true) return new Variable(var.toCharArray(),
+ pos,
+ SimpleCharStream.getPosition());}
break;
default:
- jj_la1[61] = 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 AbstractSuffixExpression PrimarySuffix(final Expression prefix) throws ParseException {
+ final AbstractSuffixExpression suffix;
+ final Expression expr;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case CLASSACCESS:
+ case LBRACKET:
+ suffix = VariableSuffix(prefix);
+ {if (true) return suffix;}
+ break;
+ case STATICCLASSACCESS:
+ jj_consume_token(STATICCLASSACCESS);
+ expr = ClassIdentifier();
+ suffix = new ClassAccess(prefix,
+ expr,
+ ClassAccess.STATIC);
+ {if (true) return suffix;}
+ break;
+ default:
+ jj_la1[65] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ throw new Error("Missing return statement in function");
+ }
+
+/**
+ * An array declarator.
+ * array(vars)
+ * @return an array
+ */
+ static final public ArrayInitializer ArrayDeclarator() throws ParseException {
+ final ArrayVariableDeclaration[] vars;
+ final int pos = SimpleCharStream.getPosition();
+ jj_consume_token(ARRAY);
+ vars = ArrayInitializer();
+ {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
+ throw new Error("Missing return statement in function");
+ }
+
static final public PrefixedUnaryExpression classInstantiation() throws ParseException {
Expression expr;
final StringBuffer buff;
@@ -2166,7 +2294,7 @@ final int pos = SimpleCharStream.getPosition();
SimpleCharStream.getPosition());
break;
default:
- jj_la1[62] = jj_gen;
+ jj_la1[66] = jj_gen;
;
}
{if (true) return new PrefixedUnaryExpression(expr,
@@ -2179,6 +2307,7 @@ final int pos = SimpleCharStream.getPosition();
final String expr;
final Token token;
final int pos = SimpleCharStream.getPosition();
+ final ConstantIdentifier type;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
@@ -2186,6 +2315,18 @@ final int pos = SimpleCharStream.getPosition();
pos,
SimpleCharStream.getPosition());}
break;
+ case STRING:
+ case OBJECT:
+ case BOOL:
+ case BOOLEAN:
+ case REAL:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case INTEGER:
+ type = Type();
+ {if (true) return type;}
+ break;
case DOLLAR:
case DOLLAR_ID:
expr = VariableDeclaratorId();
@@ -2194,34 +2335,14 @@ final int pos = SimpleCharStream.getPosition();
SimpleCharStream.getPosition());}
break;
default:
- jj_la1[63] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- }
-
- static final public AbstractSuffixExpression PrimarySuffix(Expression prefix) throws ParseException {
- final AbstractSuffixExpression expr;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LPAREN:
- expr = Arguments(prefix);
- {if (true) return expr;}
- break;
- case CLASSACCESS:
- case LBRACKET:
- expr = VariableSuffix(prefix);
- {if (true) return expr;}
- break;
- default:
- jj_la1[64] = 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 AbstractSuffixExpression VariableSuffix(Expression prefix) throws ParseException {
+ static final public AbstractSuffixExpression VariableSuffix(final Expression prefix) throws ParseException {
String expr = null;
final int pos = SimpleCharStream.getPosition();
Expression expression = null;
@@ -2263,8 +2384,8 @@ final int pos = SimpleCharStream.getPosition();
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
@@ -2285,8 +2406,8 @@ final int pos = SimpleCharStream.getPosition();
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
@@ -2310,13 +2431,13 @@ final int pos = SimpleCharStream.getPosition();
expression = Type();
break;
default:
- jj_la1[65] = jj_gen;
+ jj_la1[68] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[66] = jj_gen;
+ jj_la1[69] = jj_gen;
;
}
try {
@@ -2331,7 +2452,7 @@ final int pos = SimpleCharStream.getPosition();
{if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
break;
default:
- jj_la1[67] = jj_gen;
+ jj_la1[70] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2373,14 +2494,14 @@ final int pos = SimpleCharStream.getPosition();
{if (true) return new NullLiteral(pos-4,pos);}
break;
default:
- jj_la1[68] = jj_gen;
+ jj_la1[71] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
- static final public FunctionCall Arguments(Expression func) throws ParseException {
+ static final public FunctionCall Arguments(final Expression func) throws ParseException {
Expression[] args = null;
jj_consume_token(LPAREN);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2394,8 +2515,8 @@ Expression[] args = null;
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
@@ -2408,7 +2529,7 @@ Expression[] args = null;
args = ArgumentList();
break;
default:
- jj_la1[69] = jj_gen;
+ jj_la1[72] = jj_gen;
;
}
try {
@@ -2434,15 +2555,15 @@ Expression arg;
final ArrayList list = new ArrayList();
arg = Expression();
list.add(arg);
- label_21:
+ label_20:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[70] = jj_gen;
- break label_21;
+ jj_la1[73] = jj_gen;
+ break label_20;
}
jj_consume_token(COMMA);
try {
@@ -2456,7 +2577,7 @@ final ArrayList list = new ArrayList();
{if (true) throw e;}
}
}
- Expression[] arguments = new Expression[list.size()];
+ final Expression[] arguments = new Expression[list.size()];
list.toArray(arguments);
{if (true) return arguments;}
throw new Error("Missing return statement in function");
@@ -2464,55 +2585,27 @@ final ArrayList list = new ArrayList();
/**
* A Statement without break.
+ * @return a statement
*/
static final public Statement StatementNoBreak() throws ParseException {
final Statement statement;
Token token = null;
- if (jj_2_6(2)) {
- statement = Expression();
- try {
- jj_consume_token(SEMICOLON);
- } catch (ParseException e) {
- if (e.currentToken.next.kind != 4) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
- }
- }
- {if (true) return statement;}
- } else if (jj_2_7(2)) {
- statement = LabeledStatement();
- {if (true) return statement;}
+ if (jj_2_4(2)) {
+ statement = expressionStatement();
+ {if (true) return statement;}
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ statement = LabeledStatement();
+ {if (true) return statement;}
+ break;
case LBRACE:
statement = Block();
- {if (true) return statement;}
+ {if (true) return statement;}
break;
case SEMICOLON:
statement = EmptyStatement();
- {if (true) return statement;}
- break;
- case ARRAY:
- case NEW:
- case DOLLAR:
- case INCR:
- case DECR:
- case IDENTIFIER:
- case DOLLAR_ID:
- statement = StatementExpression();
- try {
- jj_consume_token(SEMICOLON);
- } catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
- }
- {if (true) return statement;}
+ {if (true) return statement;}
break;
case SWITCH:
statement = SwitchStatement();
@@ -2560,7 +2653,7 @@ final ArrayList list = new ArrayList();
token = jj_consume_token(AT);
break;
default:
- jj_la1[71] = jj_gen;
+ jj_la1[74] = jj_gen;
;
}
statement = IncludeStatement();
@@ -2577,8 +2670,12 @@ final ArrayList list = new ArrayList();
statement = GlobalStatement();
{if (true) return statement;}
break;
+ case DEFINE:
+ statement = defineStatement();
+ currentSegment.add((Outlineable)statement);{if (true) return statement;}
+ break;
default:
- jj_la1[72] = jj_gen;
+ jj_la1[75] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2587,6 +2684,86 @@ final ArrayList list = new ArrayList();
}
/**
+ * A statement expression.
+ * expression ;
+ * @return an expression
+ */
+ static final public Statement expressionStatement() throws ParseException {
+ final Statement statement;
+ statement = Expression();
+ try {
+ jj_consume_token(SEMICOLON);
+ } catch (ParseException e) {
+ if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ {if (true) throw e;}
+ }
+ }
+ {if (true) return statement;}
+ throw new Error("Missing return statement in function");
+ }
+
+ static final public Define defineStatement() throws ParseException {
+ final int start = SimpleCharStream.getPosition();
+ Expression defineName,defineValue;
+ jj_consume_token(DEFINE);
+ try {
+ jj_consume_token(LPAREN);
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
+ }
+ try {
+ defineName = Expression();
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ {if (true) throw e;}
+ }
+ try {
+ jj_consume_token(COMMA);
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
+ }
+ try {
+ defineValue = Expression();
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ {if (true) throw e;}
+ }
+ try {
+ jj_consume_token(RPAREN);
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
+ }
+ {if (true) return new Define(currentSegment,
+ defineName,
+ defineValue,
+ start,
+ SimpleCharStream.getPosition());}
+ throw new Error("Missing return statement in function");
+ }
+
+/**
* A Normal statement.
*/
static final public Statement Statement() throws ParseException {
@@ -2602,6 +2779,7 @@ final ArrayList list = new ArrayList();
case INCLUDE_ONCE:
case REQUIRE_ONCE:
case GLOBAL:
+ case DEFINE:
case STATIC:
case CONTINUE:
case DO:
@@ -2617,8 +2795,8 @@ final ArrayList list = new ArrayList();
case AT:
case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
@@ -2638,7 +2816,7 @@ final ArrayList list = new ArrayList();
{if (true) return statement;}
break;
default:
- jj_la1[73] = jj_gen;
+ jj_la1[76] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2650,18 +2828,18 @@ final ArrayList list = new ArrayList();
*/
static final public HTMLBlock htmlBlock() throws ParseException {
final int startIndex = nodePtr;
- AstNode[] blockNodes;
- int nbNodes;
+ final AstNode[] blockNodes;
+ final int nbNodes;
jj_consume_token(PHPEND);
- label_22:
+ label_21:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPECHOSTART:
;
break;
default:
- jj_la1[74] = jj_gen;
- break label_22;
+ jj_la1[77] = jj_gen;
+ break label_21;
}
phpEchoBlock();
}
@@ -2674,21 +2852,22 @@ final ArrayList list = new ArrayList();
jj_consume_token(PHPSTARTSHORT);
break;
default:
- jj_la1[75] = jj_gen;
+ jj_la1[78] = 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 < 123; i++) {
+ for (int i = 0; i < 127; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1< jj_gen) {
@@ -6852,9 +7053,6 @@ final int startBlock, endBlock;
case 2: jj_3_3(); break;
case 3: jj_3_4(); break;
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;