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 e41b9c8..831f354 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -30,6 +30,10 @@ import net.sourceforge.phpdt.internal.corext.Assert;
*/
public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants {
+//todo : fix the variables names bug
+//todo : handle tilde operator
+
+
/** The current segment. */
private static OutlineableWithChildren currentSegment;
@@ -46,7 +50,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
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'};
+ private static final String SYNTAX_ERROR_CHAR = "syntax error";
/**
* The point where html starts.
* It will be used by the token manager to create HTMLCode objects
@@ -60,7 +64,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
/** The cursor in expression stack. */
private static int nodePtr;
- private static final boolean PARSER_DEBUG = true;
+ public static final boolean PARSER_DEBUG = true;
public final void setFileToParse(final IFile fileToParse) {
PHPParser.fileToParse = fileToParse;
@@ -163,6 +167,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
return outlineInfo;
}
+ /**
+ * This function will throw the exception if we are in debug mode
+ * and process it if we are in production mode.
+ * this should be fast since the PARSER_DEBUG is static final so the difference will be at compile time
+ * @param e the exception
+ * @throws ParseException the thrown exception
+ */
private static void processParseExceptionDebug(final ParseException e) throws ParseException {
if (PARSER_DEBUG) {
throw e;
@@ -178,8 +189,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
if (errorMessage == null) {
PHPeclipsePlugin.log(e);
errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
- errorStart = SimpleCharStream.getPosition();
- errorEnd = errorStart + 1;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
}
setMarker(e);
errorMessage = null;
@@ -195,17 +206,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
if (errorStart == -1) {
setMarker(fileToParse,
errorMessage,
- SimpleCharStream.tokenBegin,
- SimpleCharStream.tokenBegin + e.currentToken.image.length(),
+ e.currentToken.sourceStart,
+ e.currentToken.sourceEnd,
errorLevel,
- "Line " + e.currentToken.beginLine);
+ "Line " + e.currentToken.beginLine+", "+e.currentToken.sourceStart+":"+e.currentToken.sourceEnd);
} else {
setMarker(fileToParse,
errorMessage,
errorStart,
errorEnd,
errorLevel,
- "Line " + e.currentToken.beginLine);
+ "Line " + e.currentToken.beginLine+", "+errorStart+":"+errorEnd);
errorStart = -1;
errorEnd = -1;
}
@@ -295,29 +306,32 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* Put a new html block in the stack.
*/
public static final void createNewHTMLCode() {
- final int currentPosition = SimpleCharStream.getPosition();
- if (currentPosition == htmlStart || currentPosition > SimpleCharStream.currentBuffer.length()) {
+ final int currentPosition = token.sourceStart;
+ if (currentPosition == htmlStart ||
+ currentPosition < htmlStart ||
+ currentPosition > SimpleCharStream.currentBuffer.length()) {
return;
}
- final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray();
+ final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,
+ currentPosition).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,
+ public static final void createNewTask(final int todoStart) {
+ final String todo = SimpleCharStream.currentBuffer.substring(todoStart,
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);
+ todoStart)-1);
+ if (!PARSER_DEBUG) {
+ try {
+ setMarker(fileToParse,
+ todo,
+ SimpleCharStream.getBeginLine(),
+ TASK,
+ "Line "+SimpleCharStream.getBeginLine());
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
}
}
@@ -325,87 +339,84 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
phpFile();
}
+ static final public void todo() throws ParseException {
+ Token todoToken;
+ todoToken = jj_consume_token(23);
+ createNewTask(todoToken.sourceStart);
+ }
+
static final public void phpTest() throws ParseException {
- trace_call("phpTest");
- try {
- Php();
- jj_consume_token(0);
- } finally {
- trace_return("phpTest");
- }
+ Php();
+ jj_consume_token(0);
}
static final public void phpFile() throws ParseException {
- trace_call("phpFile");
try {
- try {
- label_1:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PHPSTARTSHORT:
- case PHPSTARTLONG:
- case PHPECHOSTART:
- case PHPEND:
- case CLASS:
- case FUNCTION:
- case IF:
- case ARRAY:
- case BREAK:
- case LIST:
- case PRINT:
- case ECHO:
- case INCLUDE:
- case REQUIRE:
- case INCLUDE_ONCE:
- case REQUIRE_ONCE:
- case GLOBAL:
- case DEFINE:
- 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 AT:
- case DOLLAR:
- case BANG:
- case PLUS_PLUS:
- case MINUS_MINUS:
- case PLUS:
- case MINUS:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case LBRACE:
- case SEMICOLON:
- case DOLLAR_ID:
- ;
- break;
- default:
- jj_la1[0] = jj_gen;
- break label_1;
- }
- PhpBlock();
+ label_1:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PHPSTARTSHORT:
+ case PHPSTARTLONG:
+ case PHPECHOSTART:
+ case PHPEND:
+ case CLASS:
+ case FUNCTION:
+ case IF:
+ case ARRAY:
+ case BREAK:
+ case LIST:
+ case PRINT:
+ case ECHO:
+ case INCLUDE:
+ case REQUIRE:
+ case INCLUDE_ONCE:
+ case REQUIRE_ONCE:
+ case GLOBAL:
+ case DEFINE:
+ 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 AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ case LBRACE:
+ case SEMICOLON:
+ ;
+ break;
+ default:
+ jj_la1[0] = jj_gen;
+ break label_1;
}
+ PhpBlock();
+ }
PHPParser.createNewHTMLCode();
- } catch (TokenMgrError e) {
+ } catch (TokenMgrError e) {
PHPeclipsePlugin.log(e);
- errorStart = SimpleCharStream.getPosition();
- errorEnd = errorStart + 1;
+ errorStart = SimpleCharStream.beginOffset;
+ errorEnd = SimpleCharStream.endOffset;
errorMessage = e.getMessage();
errorLevel = ERROR;
{if (true) throw generateParseException();}
- }
- } finally {
- trace_return("phpFile");
}
}
@@ -415,18 +426,136 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* or somephpcode ?>
*/
static final public void PhpBlock() throws ParseException {
- trace_call("PhpBlock");
- try {
- final int start = SimpleCharStream.getPosition();
final PHPEchoBlock phpEchoBlock;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PHPECHOSTART:
- phpEchoBlock = phpEchoBlock();
+ final Token token,phpEnd;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PHPECHOSTART:
+ phpEchoBlock = phpEchoBlock();
pushOnAstNodes(phpEchoBlock);
- break;
+ 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 DEFINE:
+ 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 AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ case LBRACE:
+ case SEMICOLON:
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPSTARTSHORT:
case PHPSTARTLONG:
- case PHPEND:
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PHPSTARTLONG:
+ jj_consume_token(PHPSTARTLONG);
+ break;
+ case PHPSTARTSHORT:
+ token = jj_consume_token(PHPSTARTSHORT);
+ try {
+ setMarker(fileToParse,
+ "You should use '' expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
+ }
+ break;
+ default:
+ jj_la1[3] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ }
+
+ static final public PHPEchoBlock phpEchoBlock() throws ParseException {
+ final Expression expr;
+ final PHPEchoBlock echoBlock;
+ final Token token, token2;
+ token = jj_consume_token(PHPECHOSTART);
+ PHPParser.createNewHTMLCode();
+ expr = Expression();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case SEMICOLON:
+ jj_consume_token(SEMICOLON);
+ break;
+ default:
+ jj_la1[4] = jj_gen;
+ ;
+ }
+ token2 = jj_consume_token(PHPEND);
+ htmlStart = token2.sourceEnd;
+
+ echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd);
+ pushOnAstNodes(echoBlock);
+ {if (true) return echoBlock;}
+ throw new Error("Missing return statement in function");
+ }
+
+ static final public void Php() throws ParseException {
+ label_2:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CLASS:
case FUNCTION:
case IF:
@@ -454,285 +583,157 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case WHILE:
case FOREACH:
case AT:
- case DOLLAR:
case BANG:
+ case TILDE:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
case MINUS:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
case LBRACE:
case SEMICOLON:
- 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- processParseExceptionDebug(e);
- }
- break;
- default:
- jj_la1[3] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- } finally {
- trace_return("PhpBlock");
- }
- }
-
- static final public PHPEchoBlock phpEchoBlock() throws ParseException {
- trace_call("phpEchoBlock");
- try {
- final Expression expr;
- final int pos = SimpleCharStream.getPosition();
- final PHPEchoBlock echoBlock;
- jj_consume_token(PHPECHOSTART);
- expr = Expression();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case SEMICOLON:
- jj_consume_token(SEMICOLON);
+ ;
break;
default:
- jj_la1[4] = jj_gen;
- ;
+ jj_la1[5] = jj_gen;
+ break label_2;
}
- jj_consume_token(PHPEND);
- echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
- pushOnAstNodes(echoBlock);
- {if (true) return echoBlock;}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("phpEchoBlock");
- }
- }
-
- static final public void Php() throws ParseException {
- trace_call("Php");
- try {
- label_2:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- 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 DEFINE:
- 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 AT:
- case DOLLAR:
- case BANG:
- case PLUS_PLUS:
- case MINUS_MINUS:
- case PLUS:
- case MINUS:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case LBRACE:
- case SEMICOLON:
- case DOLLAR_ID:
- ;
- break;
- default:
- jj_la1[5] = jj_gen;
- break label_2;
- }
- BlockStatement();
- }
- } finally {
- trace_return("Php");
+ BlockStatement();
}
}
static final public ClassDeclaration ClassDeclaration() throws ParseException {
- trace_call("ClassDeclaration");
- try {
final ClassDeclaration classDeclaration;
- final Token className,superclassName;
- final int pos;
- char[] classNameImage = SYNTAX_ERROR_CHAR;
- char[] superclassNameImage = null;
- jj_consume_token(CLASS);
- pos = SimpleCharStream.getPosition();
- try {
- className = jj_consume_token(IDENTIFIER);
- classNameImage = className.image.toCharArray();
- } catch (ParseException e) {
+ Token className = null;
+ final Token superclassName, token, extendsToken;
+ String classNameImage = SYNTAX_ERROR_CHAR;
+ String superclassNameImage = null;
+ final int classEnd;
+ token = jj_consume_token(CLASS);
+ try {
+ className = jj_consume_token(IDENTIFIER);
+ classNameImage = className.image;
+ } 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;
+ errorStart = token.sourceEnd+1;
+ errorEnd = token.sourceEnd+1;
processParseExceptionDebug(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) {
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case EXTENDS:
+ extendsToken = jj_consume_token(EXTENDS);
+ try {
+ superclassName = jj_consume_token(IDENTIFIER);
+ superclassNameImage = superclassName.image;
+ } 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;
+ errorStart = extendsToken.sourceEnd+1;
+ errorEnd = extendsToken.sourceEnd+1;
processParseExceptionDebug(e);
superclassNameImage = SYNTAX_ERROR_CHAR;
- }
- break;
- default:
- jj_la1[6] = jj_gen;
- ;
}
+ break;
+ default:
+ jj_la1[6] = jj_gen;
+ ;
+ }
+ int start, end;
+ if (className == null) {
+ start = token.sourceStart;
+ end = token.sourceEnd;
+ } else {
+ start = className.sourceStart;
+ end = className.sourceEnd;
+ }
if (superclassNameImage == null) {
+
classDeclaration = new ClassDeclaration(currentSegment,
classNameImage,
- pos,
- 0);
+ start,
+ end);
} else {
classDeclaration = new ClassDeclaration(currentSegment,
classNameImage,
superclassNameImage,
- pos,
- 0);
+ start,
+ end);
}
currentSegment.add(classDeclaration);
currentSegment = classDeclaration;
- ClassBody(classDeclaration);
+ classEnd = ClassBody(classDeclaration);
currentSegment = (OutlineableWithChildren) currentSegment.getParent();
- classDeclaration.setSourceEnd(SimpleCharStream.getPosition());
+ classDeclaration.sourceEnd = classEnd;
pushOnAstNodes(classDeclaration);
{if (true) return classDeclaration;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ClassDeclaration");
- }
}
- static final public void ClassBody(final ClassDeclaration classDeclaration) throws ParseException {
- trace_call("ClassBody");
+ static final public int ClassBody(final ClassDeclaration classDeclaration) throws ParseException {
+Token token;
try {
- try {
- jj_consume_token(LBRACE);
- } catch (ParseException e) {
+ jj_consume_token(LBRACE);
+ } 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;
processParseExceptionDebug(e);
+ }
+ label_3:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case FUNCTION:
+ case VAR:
+ ;
+ break;
+ default:
+ jj_la1[7] = jj_gen;
+ break label_3;
}
- label_3:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case FUNCTION:
- case VAR:
- ;
- break;
- default:
- jj_la1[7] = jj_gen;
- break label_3;
- }
- ClassBodyDeclaration(classDeclaration);
- }
- try {
- jj_consume_token(RBRACE);
- } catch (ParseException e) {
+ ClassBodyDeclaration(classDeclaration);
+ }
+ try {
+ token = jj_consume_token(RBRACE);
+ {if (true) return token.sourceEnd;}
+ } catch (ParseException e) {
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;
processParseExceptionDebug(e);
- }
- } finally {
- trace_return("ClassBody");
+ {if (true) return PHPParser.token.sourceEnd;}
}
+ throw new Error("Missing return statement in function");
}
/**
* A class can contain only methods and fields.
*/
static final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException {
- trace_call("ClassBodyDeclaration");
- try {
final MethodDeclaration method;
final FieldDeclaration field;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case FUNCTION:
- method = MethodDeclaration();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case FUNCTION:
+ method = MethodDeclaration();
method.analyzeCode();
classDeclaration.addMethod(method);
- break;
- case VAR:
- field = FieldDeclaration();
+ break;
+ case VAR:
+ field = FieldDeclaration();
classDeclaration.addField(field);
- break;
- default:
- jj_la1[8] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- } finally {
- trace_return("ClassBodyDeclaration");
+ break;
+ default:
+ jj_la1[8] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
}
@@ -741,50 +742,55 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* it is only used by ClassBodyDeclaration()
*/
static final public FieldDeclaration FieldDeclaration() throws ParseException {
- trace_call("FieldDeclaration");
- try {
VariableDeclaration variableDeclaration;
final VariableDeclaration[] list;
final ArrayList arrayList = new ArrayList();
- final int pos = SimpleCharStream.getPosition();
- jj_consume_token(VAR);
- variableDeclaration = VariableDeclaratorNoSuffix();
- arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name()));
- label_4:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case COMMA:
- ;
- break;
- default:
- jj_la1[9] = jj_gen;
- break label_4;
- }
- jj_consume_token(COMMA);
- variableDeclaration = VariableDeclaratorNoSuffix();
- arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name()));
+ final Token token;
+ Token token2 = null;
+ int pos;
+ token = jj_consume_token(VAR);
+ variableDeclaration = VariableDeclaratorNoSuffix();
+ arrayList.add(variableDeclaration);
+ outlineInfo.addVariable(variableDeclaration.name());
+ pos = variableDeclaration.sourceEnd;
+ label_4:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case COMMA:
+ ;
+ break;
+ default:
+ jj_la1[9] = jj_gen;
+ break label_4;
}
- try {
- jj_consume_token(SEMICOLON);
- } catch (ParseException e) {
+ jj_consume_token(COMMA);
+ variableDeclaration = VariableDeclaratorNoSuffix();
+ arrayList.add(variableDeclaration);
+ outlineInfo.addVariable(variableDeclaration.name());
+ pos = variableDeclaration.sourceEnd;
+ }
+ try {
+ token2 = jj_consume_token(SEMICOLON);
+ } catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = pos+1;
+ errorEnd = pos+1;
processParseExceptionDebug(e);
- }
+ }
list = new VariableDeclaration[arrayList.size()];
arrayList.toArray(list);
+ int end;
+ if (token2 == null) {
+ end = list[list.length-1].sourceEnd;
+ } else {
+ end = token2.sourceEnd;
+ }
{if (true) return new FieldDeclaration(list,
- pos,
- SimpleCharStream.getPosition(),
+ token.sourceStart,
+ end,
currentSegment);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("FieldDeclaration");
- }
}
/**
@@ -792,88 +798,95 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* It will be used by fields and formal parameters
*/
static final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException {
- trace_call("VariableDeclaratorNoSuffix");
- try {
- final Token varName;
- Expression initializer = null;
- varName = jj_consume_token(DOLLAR_ID);
- final int pos = SimpleCharStream.getPosition()-varName.image.length();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ASSIGN:
- jj_consume_token(ASSIGN);
- try {
- initializer = VariableInitializer();
- } catch (ParseException e) {
+ final Token token, lbrace,rbrace;
+ Expression expr, initializer = null;
+ Token assignToken;
+ Variable variable;
+ jj_consume_token(DOLLAR);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ variable = new Variable(token.image,token.sourceStart,token.sourceEnd);
+ break;
+ case LBRACE:
+ lbrace = jj_consume_token(LBRACE);
+ expr = Expression();
+ rbrace = jj_consume_token(RBRACE);
+ variable = new Variable(expr,lbrace.sourceStart,rbrace.sourceEnd);
+ break;
+ default:
+ jj_la1[10] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ASSIGN:
+ assignToken = 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;
+ errorStart = assignToken.sourceEnd +1;
+ errorEnd = assignToken.sourceEnd +1;
processParseExceptionDebug(e);
- }
- break;
- default:
- jj_la1[10] = jj_gen;
- ;
}
+ break;
+ default:
+ jj_la1[11] = jj_gen;
+ ;
+ }
if (initializer == null) {
{if (true) return new VariableDeclaration(currentSegment,
- new Variable(varName.image.substring(1),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
- pos,
- SimpleCharStream.getPosition());}
+ variable,
+ variable.sourceStart,
+ variable.sourceEnd);}
}
{if (true) return new VariableDeclaration(currentSegment,
- new Variable(varName.image.substring(1),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
+ variable,
initializer,
VariableDeclaration.EQUAL,
- pos);}
+ variable.sourceStart);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("VariableDeclaratorNoSuffix");
- }
}
/**
* this will be used by static statement
*/
static final public VariableDeclaration VariableDeclarator() throws ParseException {
- trace_call("VariableDeclarator");
- try {
final AbstractVariable variable;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
- variable = VariableDeclaratorId();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ASSIGN:
- jj_consume_token(ASSIGN);
- try {
- initializer = VariableInitializer();
- } catch (ParseException e) {
+ final Token token;
+ variable = VariableDeclaratorId();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ASSIGN:
+ token = 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;
+ errorStart = token.sourceEnd+1;
+ errorEnd = token.sourceEnd+1;
processParseExceptionDebug(e);
- }
- break;
- default:
- jj_la1[11] = jj_gen;
- ;
}
+ break;
+ default:
+ jj_la1[12] = jj_gen;
+ ;
+ }
if (initializer == null) {
{if (true) return new VariableDeclaration(currentSegment,
variable,
- pos,
- SimpleCharStream.getPosition());}
+ variable.sourceStart,
+ variable.sourceEnd);}
}
{if (true) return new VariableDeclaration(currentSegment,
variable,
initializer,
VariableDeclaration.EQUAL,
- pos);}
+ variable.sourceStart);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("VariableDeclarator");
- }
}
/**
@@ -881,338 +894,213 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* @return the variable name (with suffix)
*/
static final public AbstractVariable VariableDeclaratorId() throws ParseException {
- trace_call("VariableDeclaratorId");
- try {
final Variable var;
AbstractVariable expression = null;
- final int pos = SimpleCharStream.getPosition();
- try {
- var = Variable();
- label_5:
- while (true) {
- if (jj_2_1(2)) {
- ;
- } else {
- break label_5;
- }
- expression = VariableSuffix(var);
+ try {
+ var = Variable();
+ label_5:
+ while (true) {
+ if (jj_2_1(2)) {
+ ;
+ } else {
+ break label_5;
}
+ expression = VariableSuffix(var);
+ }
if (expression == null) {
{if (true) return var;}
}
{if (true) return expression;}
- } catch (ParseException e) {
+ } catch (ParseException e) {
errorMessage = "'$' expected for variable identifier";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
{if (true) throw e;}
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("VariableDeclaratorId");
}
+ throw new Error("Missing return statement in function");
}
-/**
- * Return a variablename without the $.
- * @return a variable name
- */
static final public Variable Variable() throws ParseException {
- trace_call("Variable");
- try {
- final StringBuffer buff;
- Expression expression = null;
+ Variable variable = null;
final Token token;
- Variable expr;
- final int pos;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case DOLLAR_ID:
- token = jj_consume_token(DOLLAR_ID);
- pos = SimpleCharStream.getPosition()-token.image.length();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LBRACE:
- jj_consume_token(LBRACE);
- expression = Expression();
- jj_consume_token(RBRACE);
- break;
- default:
- jj_la1[12] = jj_gen;
- ;
- }
- if (expression == null) {
- {if (true) return new Variable(token.image.substring(1),pos,SimpleCharStream.getPosition());}
- }
- String s = expression.toStringExpression();
- buff = new StringBuffer(token.image.length()+s.length()+2);
- buff.append(token.image);
- buff.append("{");
- buff.append(s);
- buff.append("}");
- s = buff.toString();
- {if (true) return new Variable(s,pos,SimpleCharStream.getPosition());}
- break;
- case DOLLAR:
- jj_consume_token(DOLLAR);
- pos = SimpleCharStream.getPosition()-1;
- expr = VariableName();
- {if (true) return new Variable(expr,pos,SimpleCharStream.getPosition());}
- break;
- default:
- jj_la1[13] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
+ token = jj_consume_token(DOLLAR);
+ variable = Var(token);
+ {if (true) return new Variable(variable,token.sourceEnd,variable.sourceEnd);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("Variable");
- }
}
-/**
- * A Variable name (without the $)
- * @return a variable name String
- */
- static final public Variable VariableName() throws ParseException {
- trace_call("VariableName");
- try {
- final StringBuffer buff;
- String expr;
- final Variable var;
- Expression expression = null;
- final Token token;
- int pos;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LBRACE:
- jj_consume_token(LBRACE);
- pos = SimpleCharStream.getPosition()-1;
- expression = Expression();
- jj_consume_token(RBRACE);
- expr = expression.toStringExpression();
- buff = new StringBuffer(expr.length()+2);
- buff.append("{");
- buff.append(expr);
- buff.append("}");
- pos = SimpleCharStream.getPosition();
- expr = buff.toString();
- {if (true) return new Variable(expr,
- pos,
- SimpleCharStream.getPosition());}
- break;
- case IDENTIFIER:
- token = jj_consume_token(IDENTIFIER);
- pos = SimpleCharStream.getPosition() - token.image.length();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LBRACE:
- jj_consume_token(LBRACE);
- expression = Expression();
- jj_consume_token(RBRACE);
- break;
- default:
- jj_la1[14] = jj_gen;
- ;
- }
- if (expression == null) {
- {if (true) return new Variable(token.image,
- pos,
- SimpleCharStream.getPosition());}
- }
- expr = expression.toStringExpression();
- buff = new StringBuffer(token.image.length()+expr.length()+2);
- buff.append(token.image);
- buff.append("{");
- buff.append(expr);
- buff.append("}");
- expr = buff.toString();
- {if (true) return new Variable(expr,
- pos,
- SimpleCharStream.getPosition());}
- break;
- case DOLLAR:
- jj_consume_token(DOLLAR);
- pos = SimpleCharStream.getPosition() - 1;
- var = VariableName();
- {if (true) return new Variable(var,
- pos,
- SimpleCharStream.getPosition());}
- break;
- case DOLLAR_ID:
- token = jj_consume_token(DOLLAR_ID);
- pos = SimpleCharStream.getPosition();
- {if (true) return new Variable(token.image,
- pos-token.image.length(),
- pos);}
- break;
- default:
- jj_la1[15] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("VariableName");
+ static final public Variable Var(final Token dollar) throws ParseException {
+ Variable variable = null;
+ final Token token,token2;
+ ConstantIdentifier constant;
+ Expression expression;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DOLLAR:
+ token = jj_consume_token(DOLLAR);
+ variable = Var(token);
+ {if (true) return new Variable(variable,dollar.sourceEnd,variable.sourceEnd);}
+ break;
+ case LBRACE:
+ token = jj_consume_token(LBRACE);
+ expression = Expression();
+ token2 = jj_consume_token(RBRACE);
+ {if (true) return new Variable(expression,
+ dollar.sourceStart,
+ token2.sourceEnd);}
+ break;
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ {if (true) return new Variable(token.image,dollar.sourceStart,token.sourceEnd);}
+ break;
+ default:
+ jj_la1[13] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
static final public Expression VariableInitializer() throws ParseException {
- trace_call("VariableInitializer");
- try {
final Expression expr;
- final Token token;
- final int pos = SimpleCharStream.getPosition();
+ final Token token, token2;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ expr = Literal();
+ {if (true) return expr;}
+ break;
+ case MINUS:
+ token2 = jj_consume_token(MINUS);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case NULL:
- case TRUE:
- case FALSE:
case INTEGER_LITERAL:
+ token = jj_consume_token(INTEGER_LITERAL);
+ break;
case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- expr = Literal();
- {if (true) return expr;}
+ token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
- case MINUS:
- jj_consume_token(MINUS);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INTEGER_LITERAL:
- token = jj_consume_token(INTEGER_LITERAL);
- break;
- case FLOATING_POINT_LITERAL:
- token = jj_consume_token(FLOATING_POINT_LITERAL);
- break;
- default:
- jj_la1[16] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ default:
+ jj_la1[14] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.MINUS,
- pos);}
- break;
- case PLUS:
- jj_consume_token(PLUS);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INTEGER_LITERAL:
- token = jj_consume_token(INTEGER_LITERAL);
- break;
- case FLOATING_POINT_LITERAL:
- token = jj_consume_token(FLOATING_POINT_LITERAL);
- break;
- default:
- jj_la1[17] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
- OperatorIds.PLUS,
- pos);}
- break;
- case ARRAY:
- expr = ArrayDeclarator();
- {if (true) return expr;}
+ token2.sourceStart);}
+ break;
+ case PLUS:
+ token2 = jj_consume_token(PLUS);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case INTEGER_LITERAL:
+ token = jj_consume_token(INTEGER_LITERAL);
break;
- case IDENTIFIER:
- token = jj_consume_token(IDENTIFIER);
- {if (true) return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
+ case FLOATING_POINT_LITERAL:
+ token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[18] = jj_gen;
+ jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("VariableInitializer");
+ {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token),
+ OperatorIds.PLUS,
+ token2.sourceStart);}
+ break;
+ case ARRAY:
+ expr = ArrayDeclarator();
+ {if (true) return expr;}
+ break;
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ default:
+ jj_la1[16] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
static final public ArrayVariableDeclaration ArrayVariable() throws ParseException {
- trace_call("ArrayVariable");
- try {
final Expression expr,expr2;
- expr = Expression();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ARRAYASSIGN:
- jj_consume_token(ARRAYASSIGN);
- expr2 = Expression();
+ 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);}
- break;
- default:
- jj_la1[19] = jj_gen;
- ;
- }
+ break;
+ default:
+ jj_la1[17] = jj_gen;
+ ;
+ }
{if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ArrayVariable");
- }
}
static final public ArrayVariableDeclaration[] ArrayInitializer() throws ParseException {
- trace_call("ArrayInitializer");
- try {
ArrayVariableDeclaration expr;
final ArrayList list = new ArrayList();
- jj_consume_token(LPAREN);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ARRAY:
- case LIST:
- case PRINT:
- 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 INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case DOLLAR_ID:
- expr = ArrayVariable();
- list.add(expr);
- label_6:
- while (true) {
- if (jj_2_2(2)) {
- ;
- } else {
- break label_6;
- }
- jj_consume_token(COMMA);
- expr = ArrayVariable();
+ jj_consume_token(LPAREN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case LIST:
+ case PRINT:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ expr = ArrayVariable();
list.add(expr);
+ label_6:
+ while (true) {
+ if (jj_2_2(2)) {
+ ;
+ } else {
+ break label_6;
}
- break;
- default:
- jj_la1[20] = jj_gen;
- ;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case COMMA:
jj_consume_token(COMMA);
- list.add(null);
- break;
- default:
- jj_la1[21] = jj_gen;
- ;
+ expr = ArrayVariable();
+ list.add(expr);
}
- jj_consume_token(RPAREN);
+ break;
+ default:
+ jj_la1[18] = jj_gen;
+ ;
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case COMMA:
+ jj_consume_token(COMMA);
+ list.add(null);
+ break;
+ default:
+ jj_la1[19] = jj_gen;
+ ;
+ }
+ jj_consume_token(RPAREN);
final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
list.toArray(vars);
{if (true) return vars;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ArrayInitializer");
- }
}
/**
@@ -1220,32 +1108,28 @@ final Expression expr,expr2;
* function MetodDeclarator() Block()
*/
static final public MethodDeclaration MethodDeclaration() throws ParseException {
- trace_call("MethodDeclaration");
- try {
final MethodDeclaration functionDeclaration;
final Block block;
final OutlineableWithChildren seg = currentSegment;
- jj_consume_token(FUNCTION);
- try {
- functionDeclaration = MethodDeclarator();
- outlineInfo.addVariable(new String(functionDeclaration.name));
- } catch (ParseException e) {
+ final Token token;
+ token = jj_consume_token(FUNCTION);
+ try {
+ functionDeclaration = MethodDeclarator(token.sourceStart);
+ outlineInfo.addVariable(functionDeclaration.name);
+ } catch (ParseException e) {
if (errorMessage != null) {if (true) throw 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;
{if (true) throw e;}
- }
+ }
currentSegment = functionDeclaration;
- block = Block();
+ block = Block();
functionDeclaration.statements = block.statements;
currentSegment = seg;
{if (true) return functionDeclaration;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("MethodDeclaration");
- }
}
/**
@@ -1253,102 +1137,112 @@ final Expression expr,expr2;
* [&] IDENTIFIER(parameters ...).
* @return a function description for the outline
*/
- static final public MethodDeclaration MethodDeclarator() throws ParseException {
- trace_call("MethodDeclarator");
- try {
- final Token identifier;
+ static final public MethodDeclaration MethodDeclarator(final int start) throws ParseException {
+ Token identifier = null;
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[22] = jj_gen;
- ;
- }
- try {
- identifier = jj_consume_token(IDENTIFIER);
- identifierChar = identifier.image.toCharArray();
- } catch (ParseException e) {
+ final Hashtable formalParameters = new Hashtable();
+ String identifierChar = SYNTAX_ERROR_CHAR;
+ int end = start;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BIT_AND:
+ reference = jj_consume_token(BIT_AND);
+ end = reference.sourceEnd;
+ break;
+ default:
+ jj_la1[20] = jj_gen;
+ ;
+ }
+ try {
+ identifier = jj_consume_token(IDENTIFIER);
+ identifierChar = identifier.image;
+ end = identifier.sourceEnd;
+ } 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;
+ errorStart = e.currentToken.sourceEnd;
+ errorEnd = e.currentToken.next.sourceStart;
processParseExceptionDebug(e);
- }
- formalParameters = FormalParameters();
- MethodDeclaration method = new MethodDeclaration(currentSegment,
- identifierChar,
- formalParameters,
- reference != null,
- pos,
- SimpleCharStream.getPosition());
- {if (true) return method;}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("MethodDeclarator");
}
+ end = FormalParameters(formalParameters);
+ int nameStart, nameEnd;
+ if (identifier == null) {
+ if (reference == null) {
+ nameStart = start + 9;
+ nameEnd = start + 10;
+ } else {
+ nameStart = reference.sourceEnd + 1;
+ nameEnd = reference.sourceEnd + 2;
+ }
+ } else {
+ nameStart = identifier.sourceStart;
+ nameEnd = identifier.sourceEnd;
+ }
+ {if (true) return new MethodDeclaration(currentSegment,
+ identifierChar,
+ formalParameters,
+ reference != null,
+ nameStart,
+ nameEnd,
+ start,
+ end);}
+ throw new Error("Missing return statement in function");
}
/**
* FormalParameters follows method identifier.
* (FormalParameter())
*/
- static final public Hashtable FormalParameters() throws ParseException {
- trace_call("FormalParameters");
- try {
+ static final public int FormalParameters(final Hashtable parameters) throws ParseException {
VariableDeclaration var;
- final Hashtable parameters = new Hashtable();
- try {
- jj_consume_token(LPAREN);
- } catch (ParseException e) {
+ final Token token;
+ Token tok = PHPParser.token;
+ int end = tok.sourceEnd;
+ try {
+ tok = jj_consume_token(LPAREN);
+ end = tok.sourceEnd;
+ } catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = e.currentToken.next.sourceStart;
+ errorEnd = e.currentToken.next.sourceEnd;
processParseExceptionDebug(e);
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BIT_AND:
- case DOLLAR_ID:
- var = FormalParameter();
- parameters.put(new String(var.name()),var);
- label_7:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case COMMA:
- ;
- break;
- default:
- jj_la1[23] = jj_gen;
- break label_7;
- }
- jj_consume_token(COMMA);
- var = FormalParameter();
- parameters.put(new String(var.name()),var);
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BIT_AND:
+ case DOLLAR:
+ var = FormalParameter();
+ parameters.put(var.name(),var);end = var.sourceEnd;
+ label_7:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case COMMA:
+ ;
+ break;
+ default:
+ jj_la1[21] = jj_gen;
+ break label_7;
}
- break;
- default:
- jj_la1[24] = jj_gen;
- ;
+ jj_consume_token(COMMA);
+ var = FormalParameter();
+ parameters.put(var.name(),var);end = var.sourceEnd;
}
- try {
- jj_consume_token(RPAREN);
- } catch (ParseException e) {
+ break;
+ default:
+ jj_la1[22] = jj_gen;
+ ;
+ }
+ try {
+ token = jj_consume_token(RPAREN);
+ end = token.sourceEnd;
+ } catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = e.currentToken.next.sourceStart;
+ errorEnd = e.currentToken.next.sourceEnd;
processParseExceptionDebug(e);
- }
- {if (true) return parameters;}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("FormalParameters");
}
+ {if (true) return end;}
+ throw new Error("Missing return statement in function");
}
/**
@@ -1356,135 +1250,114 @@ final Expression expr,expr2;
* $varname[=value] (,$varname[=value])
*/
static final public VariableDeclaration FormalParameter() throws ParseException {
- trace_call("FormalParameter");
- try {
final VariableDeclaration variableDeclaration;
Token token = null;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BIT_AND:
- token = jj_consume_token(BIT_AND);
- break;
- default:
- jj_la1[25] = jj_gen;
- ;
- }
- variableDeclaration = VariableDeclaratorNoSuffix();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BIT_AND:
+ token = jj_consume_token(BIT_AND);
+ break;
+ default:
+ jj_la1[23] = jj_gen;
+ ;
+ }
+ variableDeclaration = VariableDeclaratorNoSuffix();
if (token != null) {
variableDeclaration.setReference(true);
}
{if (true) return variableDeclaration;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("FormalParameter");
- }
}
static final public ConstantIdentifier Type() throws ParseException {
- trace_call("Type");
- try {
- final int pos;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case STRING:
- jj_consume_token(STRING);
- pos = SimpleCharStream.getPosition();
- {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);}
- break;
- case BOOLEAN:
- jj_consume_token(BOOLEAN);
- pos = SimpleCharStream.getPosition();
- {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);}
- break;
- case DOUBLE:
- jj_consume_token(DOUBLE);
- pos = SimpleCharStream.getPosition();
- {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);}
- break;
- case INT:
- jj_consume_token(INT);
- pos = SimpleCharStream.getPosition();
- {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);}
- break;
- case OBJECT:
- jj_consume_token(OBJECT);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.OBJECT,pos,pos-6);}
- break;
- default:
- jj_la1[26] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("Type");
+ final Token token;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case STRING:
+ token = jj_consume_token(STRING);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case BOOL:
+ token = jj_consume_token(BOOL);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case BOOLEAN:
+ token = jj_consume_token(BOOLEAN);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case REAL:
+ token = jj_consume_token(REAL);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case DOUBLE:
+ token = jj_consume_token(DOUBLE);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case FLOAT:
+ token = jj_consume_token(FLOAT);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case INT:
+ token = jj_consume_token(INT);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case INTEGER:
+ token = jj_consume_token(INTEGER);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case OBJECT:
+ token = jj_consume_token(OBJECT);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ default:
+ jj_la1[24] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
static final public Expression Expression() throws ParseException {
- trace_call("Expression");
- try {
final Expression expr;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
int assignOperator = -1;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ expr = ConditionalExpression();
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 PLUS_PLUS:
- case MINUS_MINUS:
- case PLUS:
- case MINUS:
- 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) {
+ 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;}
}
@@ -1492,92 +1365,82 @@ final Expression expr,expr2;
errorLevel = ERROR;
errorEnd = SimpleCharStream.getPosition();
{if (true) throw e;}
- }
- break;
- default:
- jj_la1[27] = jj_gen;
- ;
}
+ break;
+ default:
+ jj_la1[25] = jj_gen;
+ ;
+ }
if (assignOperator != -1) {// todo : change this, very very bad :(
if (expr instanceof AbstractVariable) {
{if (true) return new VariableDeclaration(currentSegment,
(AbstractVariable) expr,
- pos,
- SimpleCharStream.getPosition());}
+ initializer,
+ expr.sourceStart,
+ initializer.sourceEnd);}
}
String varName = expr.toStringExpression().substring(1);
{if (true) return new VariableDeclaration(currentSegment,
- new Variable(varName,SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
- pos,
- SimpleCharStream.getPosition());}
+ new Variable(varName,
+ expr.sourceStart,
+ expr.sourceEnd),
+ expr.sourceStart,
+ initializer.sourceEnd);}
}
{if (true) return expr;}
- break;
- case LIST:
- case PRINT:
- expr = ExpressionWBang();
+ break;
+ case LIST:
+ case PRINT:
+ expr = ExpressionWBang();
{if (true) return expr;}
- break;
- default:
- jj_la1[28] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("Expression");
+ break;
+ default:
+ jj_la1[26] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
static final public Expression ExpressionWBang() throws ParseException {
- trace_call("ExpressionWBang");
- try {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
- 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();
+ final Token token;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BANG:
+ token = jj_consume_token(BANG);
+ expr = ExpressionWBang();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
+ 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");
- } finally {
- trace_return("ExpressionWBang");
+ break;
+ default:
+ jj_la1[27] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
static final public Expression ExpressionNoBang() throws ParseException {
- trace_call("ExpressionNoBang");
- try {
Expression expr;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LIST:
- expr = ListExpression();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LIST:
+ expr = ListExpression();
{if (true) return expr;}
- break;
- case PRINT:
- expr = PrintExpression();
+ break;
+ case PRINT:
+ expr = PrintExpression();
{if (true) return expr;}
- break;
- default:
- jj_la1[30] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("ExpressionNoBang");
+ break;
+ default:
+ jj_la1[28] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
/**
@@ -1585,563 +1448,540 @@ final Expression expr,expr2;
* @return the assignement operator id
*/
static final public int AssignmentOperator() throws ParseException {
- trace_call("AssignmentOperator");
- try {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ASSIGN:
- jj_consume_token(ASSIGN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ASSIGN:
+ jj_consume_token(ASSIGN);
{if (true) return VariableDeclaration.EQUAL;}
- break;
- case STARASSIGN:
- jj_consume_token(STARASSIGN);
+ break;
+ case STARASSIGN:
+ jj_consume_token(STARASSIGN);
{if (true) return VariableDeclaration.STAR_EQUAL;}
- break;
- case SLASHASSIGN:
- jj_consume_token(SLASHASSIGN);
+ break;
+ case SLASHASSIGN:
+ jj_consume_token(SLASHASSIGN);
{if (true) return VariableDeclaration.SLASH_EQUAL;}
- break;
- case REMASSIGN:
- jj_consume_token(REMASSIGN);
+ break;
+ case REMASSIGN:
+ jj_consume_token(REMASSIGN);
{if (true) return VariableDeclaration.REM_EQUAL;}
- break;
- case PLUSASSIGN:
- jj_consume_token(PLUSASSIGN);
+ break;
+ case PLUSASSIGN:
+ jj_consume_token(PLUSASSIGN);
{if (true) return VariableDeclaration.PLUS_EQUAL;}
- break;
- case MINUSASSIGN:
- jj_consume_token(MINUSASSIGN);
+ break;
+ case MINUSASSIGN:
+ jj_consume_token(MINUSASSIGN);
{if (true) return VariableDeclaration.MINUS_EQUAL;}
- break;
- case LSHIFTASSIGN:
- jj_consume_token(LSHIFTASSIGN);
+ break;
+ case LSHIFTASSIGN:
+ jj_consume_token(LSHIFTASSIGN);
{if (true) return VariableDeclaration.LSHIFT_EQUAL;}
- break;
- case RSIGNEDSHIFTASSIGN:
- jj_consume_token(RSIGNEDSHIFTASSIGN);
+ break;
+ case RSIGNEDSHIFTASSIGN:
+ jj_consume_token(RSIGNEDSHIFTASSIGN);
{if (true) return VariableDeclaration.RSIGNEDSHIFT_EQUAL;}
- break;
- case ANDASSIGN:
- jj_consume_token(ANDASSIGN);
+ break;
+ case ANDASSIGN:
+ jj_consume_token(ANDASSIGN);
{if (true) return VariableDeclaration.AND_EQUAL;}
- break;
- case XORASSIGN:
- jj_consume_token(XORASSIGN);
+ break;
+ case XORASSIGN:
+ jj_consume_token(XORASSIGN);
{if (true) return VariableDeclaration.XOR_EQUAL;}
- break;
- case ORASSIGN:
- jj_consume_token(ORASSIGN);
+ break;
+ case ORASSIGN:
+ jj_consume_token(ORASSIGN);
{if (true) return VariableDeclaration.OR_EQUAL;}
- break;
- case DOTASSIGN:
- jj_consume_token(DOTASSIGN);
+ break;
+ case DOTASSIGN:
+ jj_consume_token(DOTASSIGN);
{if (true) return VariableDeclaration.DOT_EQUAL;}
- break;
- case TILDEEQUAL:
- jj_consume_token(TILDEEQUAL);
+ break;
+ case TILDEEQUAL:
+ jj_consume_token(TILDEEQUAL);
{if (true) return VariableDeclaration.TILDE_EQUAL;}
- break;
- default:
- jj_la1[31] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("AssignmentOperator");
+ 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 ConditionalExpression() throws ParseException {
- trace_call("ConditionalExpression");
- try {
final Expression expr;
Expression expr2 = null;
Expression expr3 = null;
- expr = ConditionalOrExpression();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case HOOK:
- jj_consume_token(HOOK);
- expr2 = Expression();
- jj_consume_token(COLON);
- expr3 = ConditionalExpression();
- break;
- default:
- jj_la1[32] = jj_gen;
- ;
- }
+ expr = ConditionalOrExpression();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case HOOK:
+ jj_consume_token(HOOK);
+ expr2 = Expression();
+ jj_consume_token(COLON);
+ expr3 = ConditionalExpression();
+ break;
+ default:
+ jj_la1[30] = jj_gen;
+ ;
+ }
if (expr3 == null) {
{if (true) return expr;}
}
{if (true) return new ConditionalExpression(expr,expr2,expr3);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ConditionalExpression");
- }
}
static final public Expression ConditionalOrExpression() throws ParseException {
- trace_call("ConditionalOrExpression");
- try {
Expression expr,expr2;
int operator;
- expr = ConditionalAndExpression();
- label_8:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case OR_OR:
- case _ORL:
- ;
- break;
- default:
- jj_la1[33] = jj_gen;
- break label_8;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case OR_OR:
- jj_consume_token(OR_OR);
+ expr = ConditionalAndExpression();
+ label_8:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case OR_OR:
+ case _ORL:
+ ;
+ break;
+ default:
+ jj_la1[31] = jj_gen;
+ break label_8;
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case OR_OR:
+ jj_consume_token(OR_OR);
operator = OperatorIds.OR_OR;
- break;
- case _ORL:
- jj_consume_token(_ORL);
+ break;
+ case _ORL:
+ jj_consume_token(_ORL);
operator = OperatorIds.ORL;
- break;
- default:
- jj_la1[34] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr2 = ConditionalAndExpression();
- expr = new BinaryExpression(expr,expr2,operator);
+ break;
+ default:
+ jj_la1[32] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ expr2 = ConditionalAndExpression();
+ expr = new BinaryExpression(expr,expr2,operator);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ConditionalOrExpression");
- }
}
static final public Expression ConditionalAndExpression() throws ParseException {
- trace_call("ConditionalAndExpression");
- try {
Expression expr,expr2;
int operator;
- expr = ConcatExpression();
- label_9:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case AND_AND:
- case _ANDL:
- ;
- break;
- default:
- jj_la1[35] = jj_gen;
- break label_9;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case AND_AND:
- jj_consume_token(AND_AND);
+ expr = ConcatExpression();
+ label_9:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case AND_AND:
+ case _ANDL:
+ ;
+ break;
+ default:
+ jj_la1[33] = jj_gen;
+ break label_9;
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case AND_AND:
+ jj_consume_token(AND_AND);
operator = OperatorIds.AND_AND;
- break;
- case _ANDL:
- jj_consume_token(_ANDL);
+ break;
+ case _ANDL:
+ jj_consume_token(_ANDL);
operator = OperatorIds.ANDL;
- break;
- default:
- jj_la1[36] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr2 = ConcatExpression();
- expr = new BinaryExpression(expr,expr2,operator);
+ break;
+ default:
+ jj_la1[34] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ expr2 = ConcatExpression();
+ expr = new BinaryExpression(expr,expr2,operator);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ConditionalAndExpression");
- }
}
static final public Expression ConcatExpression() throws ParseException {
- trace_call("ConcatExpression");
- try {
Expression expr,expr2;
- expr = InclusiveOrExpression();
- label_10:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case DOT:
- ;
- break;
- default:
- jj_la1[37] = jj_gen;
- break label_10;
- }
- jj_consume_token(DOT);
- expr2 = InclusiveOrExpression();
- expr = new BinaryExpression(expr,expr2,OperatorIds.DOT);
+ expr = InclusiveOrExpression();
+ label_10:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DOT:
+ ;
+ break;
+ default:
+ jj_la1[35] = jj_gen;
+ break label_10;
}
+ jj_consume_token(DOT);
+ expr2 = InclusiveOrExpression();
+ expr = new BinaryExpression(expr,expr2,OperatorIds.DOT);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ConcatExpression");
- }
}
static final public Expression InclusiveOrExpression() throws ParseException {
- trace_call("InclusiveOrExpression");
- try {
Expression expr,expr2;
- expr = ExclusiveOrExpression();
- label_11:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BIT_OR:
- ;
- break;
- default:
- jj_la1[38] = jj_gen;
- break label_11;
- }
- jj_consume_token(BIT_OR);
- expr2 = ExclusiveOrExpression();
- expr = new BinaryExpression(expr,expr2,OperatorIds.OR);
+ expr = ExclusiveOrExpression();
+ label_11:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BIT_OR:
+ ;
+ break;
+ default:
+ jj_la1[36] = jj_gen;
+ break label_11;
}
+ jj_consume_token(BIT_OR);
+ expr2 = ExclusiveOrExpression();
+ expr = new BinaryExpression(expr,expr2,OperatorIds.OR);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("InclusiveOrExpression");
- }
}
static final public Expression ExclusiveOrExpression() throws ParseException {
- trace_call("ExclusiveOrExpression");
- try {
Expression expr,expr2;
- expr = AndExpression();
- label_12:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case XOR:
- ;
- break;
- default:
- jj_la1[39] = jj_gen;
- break label_12;
- }
- jj_consume_token(XOR);
- expr2 = AndExpression();
- expr = new BinaryExpression(expr,expr2,OperatorIds.XOR);
+ expr = AndExpression();
+ label_12:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case XOR:
+ ;
+ break;
+ default:
+ jj_la1[37] = jj_gen;
+ break label_12;
}
+ jj_consume_token(XOR);
+ expr2 = AndExpression();
+ expr = new BinaryExpression(expr,expr2,OperatorIds.XOR);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ExclusiveOrExpression");
- }
}
static final public Expression AndExpression() throws ParseException {
- trace_call("AndExpression");
- try {
Expression expr,expr2;
- expr = EqualityExpression();
- label_13:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BIT_AND:
- ;
- break;
- default:
- jj_la1[40] = jj_gen;
- break label_13;
- }
- jj_consume_token(BIT_AND);
- expr2 = EqualityExpression();
- expr = new BinaryExpression(expr,expr2,OperatorIds.AND);
+ expr = EqualityExpression();
+ label_13:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BIT_AND:
+ ;
+ break;
+ default:
+ jj_la1[38] = jj_gen;
+ break label_13;
}
+ jj_consume_token(BIT_AND);
+ expr2 = EqualityExpression();
+ expr = new BinaryExpression(expr,expr2,OperatorIds.AND);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("AndExpression");
- }
}
static final public Expression EqualityExpression() throws ParseException {
- trace_call("EqualityExpression");
- try {
Expression expr,expr2;
int operator;
- expr = RelationalExpression();
- label_14:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case EQUAL_EQUAL:
- case NOT_EQUAL:
- case DIF:
- case BANGDOUBLEEQUAL:
- case TRIPLEEQUAL:
- ;
- break;
- default:
- jj_la1[41] = jj_gen;
- break label_14;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case EQUAL_EQUAL:
- jj_consume_token(EQUAL_EQUAL);
- operator = OperatorIds.EQUAL_EQUAL;
- break;
- case DIF:
- jj_consume_token(DIF);
- operator = OperatorIds.DIF;
- break;
- case NOT_EQUAL:
- jj_consume_token(NOT_EQUAL);
- operator = OperatorIds.DIF;
- break;
- case BANGDOUBLEEQUAL:
- jj_consume_token(BANGDOUBLEEQUAL);
- operator = OperatorIds.BANG_EQUAL_EQUAL;
- break;
- case TRIPLEEQUAL:
- jj_consume_token(TRIPLEEQUAL);
- operator = OperatorIds.EQUAL_EQUAL_EQUAL;
- break;
- default:
- jj_la1[42] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- try {
- expr2 = RelationalExpression();
- } catch (ParseException e) {
+ Token token;
+ expr = RelationalExpression();
+ label_14:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case EQUAL_EQUAL:
+ case NOT_EQUAL:
+ case DIF:
+ case BANGDOUBLEEQUAL:
+ case TRIPLEEQUAL:
+ ;
+ break;
+ default:
+ jj_la1[39] = jj_gen;
+ break label_14;
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case EQUAL_EQUAL:
+ token = jj_consume_token(EQUAL_EQUAL);
+ operator = OperatorIds.EQUAL_EQUAL;
+ break;
+ case DIF:
+ token = jj_consume_token(DIF);
+ operator = OperatorIds.DIF;
+ break;
+ case NOT_EQUAL:
+ token = jj_consume_token(NOT_EQUAL);
+ operator = OperatorIds.DIF;
+ break;
+ case BANGDOUBLEEQUAL:
+ token = jj_consume_token(BANGDOUBLEEQUAL);
+ operator = OperatorIds.BANG_EQUAL_EQUAL;
+ break;
+ case TRIPLEEQUAL:
+ token = jj_consume_token(TRIPLEEQUAL);
+ operator = OperatorIds.EQUAL_EQUAL_EQUAL;
+ break;
+ default:
+ jj_la1[40] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ try {
+ expr2 = RelationalExpression();
+ } catch (ParseException e) {
if (errorMessage != null) {
{if (true) throw 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;}
- }
- expr = new BinaryExpression(expr,expr2,operator);
+ errorStart = token.sourceEnd +1;
+ errorEnd = token.sourceEnd +1;
+ expr2 = new ConstantIdentifier(SYNTAX_ERROR_CHAR,token.sourceEnd +1,token.sourceEnd +1);
+ processParseExceptionDebug(e);
}
+ expr = new BinaryExpression(expr,expr2,operator);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("EqualityExpression");
- }
}
static final public Expression RelationalExpression() throws ParseException {
- trace_call("RelationalExpression");
- try {
Expression expr,expr2;
int operator;
- expr = ShiftExpression();
- label_15:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case GT:
- case LT:
- case LE:
- case GE:
- ;
- break;
- default:
- jj_la1[43] = jj_gen;
- break label_15;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LT:
- jj_consume_token(LT);
+ expr = ShiftExpression();
+ label_15:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case GT:
+ case LT:
+ case LE:
+ case GE:
+ ;
+ break;
+ default:
+ jj_la1[41] = jj_gen;
+ break label_15;
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LT:
+ jj_consume_token(LT);
operator = OperatorIds.LESS;
- break;
- case GT:
- jj_consume_token(GT);
+ break;
+ case GT:
+ jj_consume_token(GT);
operator = OperatorIds.GREATER;
- break;
- case LE:
- jj_consume_token(LE);
+ break;
+ case LE:
+ jj_consume_token(LE);
operator = OperatorIds.LESS_EQUAL;
- break;
- case GE:
- jj_consume_token(GE);
+ break;
+ case GE:
+ jj_consume_token(GE);
operator = OperatorIds.GREATER_EQUAL;
- break;
- default:
- jj_la1[44] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr2 = ShiftExpression();
- expr = new BinaryExpression(expr,expr2,operator);
+ break;
+ default:
+ jj_la1[42] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ expr2 = ShiftExpression();
+ expr = new BinaryExpression(expr,expr2,operator);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("RelationalExpression");
- }
}
static final public Expression ShiftExpression() throws ParseException {
- trace_call("ShiftExpression");
- try {
Expression expr,expr2;
int operator;
- expr = AdditiveExpression();
- label_16:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LSHIFT:
- case RSIGNEDSHIFT:
- case RUNSIGNEDSHIFT:
- ;
- break;
- default:
- jj_la1[45] = jj_gen;
- break label_16;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LSHIFT:
- jj_consume_token(LSHIFT);
+ expr = AdditiveExpression();
+ label_16:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LSHIFT:
+ case RSIGNEDSHIFT:
+ case RUNSIGNEDSHIFT:
+ ;
+ break;
+ default:
+ jj_la1[43] = jj_gen;
+ break label_16;
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LSHIFT:
+ jj_consume_token(LSHIFT);
operator = OperatorIds.LEFT_SHIFT;
- break;
- case RSIGNEDSHIFT:
- jj_consume_token(RSIGNEDSHIFT);
+ break;
+ case RSIGNEDSHIFT:
+ jj_consume_token(RSIGNEDSHIFT);
operator = OperatorIds.RIGHT_SHIFT;
- break;
- case RUNSIGNEDSHIFT:
- jj_consume_token(RUNSIGNEDSHIFT);
+ break;
+ case RUNSIGNEDSHIFT:
+ jj_consume_token(RUNSIGNEDSHIFT);
operator = OperatorIds.UNSIGNED_RIGHT_SHIFT;
- break;
- default:
- jj_la1[46] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr2 = AdditiveExpression();
- expr = new BinaryExpression(expr,expr2,operator);
+ break;
+ default:
+ jj_la1[44] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ expr2 = AdditiveExpression();
+ expr = new BinaryExpression(expr,expr2,operator);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ShiftExpression");
- }
}
static final public Expression AdditiveExpression() throws ParseException {
- trace_call("AdditiveExpression");
- try {
Expression expr,expr2;
int operator;
- expr = MultiplicativeExpression();
- label_17:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS:
- case MINUS:
- ;
- break;
- default:
- jj_la1[47] = jj_gen;
- break label_17;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS:
- jj_consume_token(PLUS);
+ expr = MultiplicativeExpression();
+ label_17:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PLUS:
+ case MINUS:
+ ;
+ break;
+ default:
+ jj_la1[45] = jj_gen;
+ break label_17;
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PLUS:
+ jj_consume_token(PLUS);
operator = OperatorIds.PLUS;
- break;
- case MINUS:
- jj_consume_token(MINUS);
+ break;
+ case MINUS:
+ jj_consume_token(MINUS);
operator = OperatorIds.MINUS;
- break;
- default:
- jj_la1[48] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr2 = MultiplicativeExpression();
- expr = new BinaryExpression(expr,expr2,operator);
+ break;
+ default:
+ jj_la1[46] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ expr2 = MultiplicativeExpression();
+ expr = new BinaryExpression(expr,expr2,operator);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("AdditiveExpression");
- }
}
static final public Expression MultiplicativeExpression() throws ParseException {
- trace_call("MultiplicativeExpression");
- try {
Expression expr,expr2;
int operator;
- try {
- expr = UnaryExpression();
- } catch (ParseException e) {
+ try {
+ expr = UnaryExpression();
+ } catch (ParseException e) {
if (errorMessage != null) {if (true) throw e;}
errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = PHPParser.token.sourceStart;
+ errorEnd = PHPParser.token.sourceEnd;
{if (true) throw e;}
+ }
+ label_18:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case STAR:
+ case SLASH:
+ case REMAINDER:
+ ;
+ break;
+ default:
+ jj_la1[47] = jj_gen;
+ break label_18;
}
- label_18:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case STAR:
- case SLASH:
- case REMAINDER:
- ;
- break;
- default:
- jj_la1[49] = jj_gen;
- break label_18;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case STAR:
- jj_consume_token(STAR);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case STAR:
+ jj_consume_token(STAR);
operator = OperatorIds.MULTIPLY;
- break;
- case SLASH:
- jj_consume_token(SLASH);
+ break;
+ case SLASH:
+ jj_consume_token(SLASH);
operator = OperatorIds.DIVIDE;
- break;
- case REMAINDER:
- jj_consume_token(REMAINDER);
+ break;
+ case REMAINDER:
+ jj_consume_token(REMAINDER);
operator = OperatorIds.REMAINDER;
- break;
- default:
- jj_la1[50] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr2 = UnaryExpression();
- expr = new BinaryExpression(expr,expr2,operator);
+ break;
+ default:
+ jj_la1[48] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ expr2 = UnaryExpression();
+ expr = new BinaryExpression(expr,expr2,operator);
+ }
{if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("MultiplicativeExpression");
- }
}
/**
* An unary expression starting with @, & or nothing
*/
static final public Expression UnaryExpression() throws ParseException {
- trace_call("UnaryExpression");
- try {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
- /* expr = UnaryExpressionNoPrefix() //why did I had that ?
- {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
- | */
- expr = AtNotUnaryExpression();
- {if (true) return expr;}
+ /* expr = UnaryExpressionNoPrefix() //why did I had that ?
+ {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
+ | */
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return expr;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("UnaryExpression");
+ }
+
+ static final public Expression AtNotTildeUnaryExpression() throws ParseException {
+ final Expression expr;
+ final Token token;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case AT:
+ token = jj_consume_token(AT);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
+ break;
+ case TILDE:
+ token = jj_consume_token(TILDE);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.TWIDDLE,token.sourceStart);}
+ break;
+ case BANG:
+ token = jj_consume_token(BANG);
+ expr = AtNotUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
+ break;
+ case ARRAY:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ expr = UnaryExpressionNoPrefix();
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[49] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
/**
@@ -2149,340 +1989,344 @@ final Expression expr,expr2;
* @return the expression
*/
static final public Expression AtNotUnaryExpression() throws ParseException {
- trace_call("AtNotUnaryExpression");
- try {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case AT:
- jj_consume_token(AT);
- 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 PLUS_PLUS:
- case MINUS_MINUS:
- case PLUS:
- case MINUS:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case DOLLAR_ID:
- expr = UnaryExpressionNoPrefix();
+ final Token token;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case AT:
+ token = jj_consume_token(AT);
+ expr = AtNotUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
+ break;
+ case BANG:
+ token = jj_consume_token(BANG);
+ expr = AtNotUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
+ break;
+ case ARRAY:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ expr = UnaryExpressionNoPrefix();
{if (true) return expr;}
- break;
- default:
- jj_la1[51] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("AtNotUnaryExpression");
+ break;
+ default:
+ jj_la1[50] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
static final public Expression UnaryExpressionNoPrefix() throws ParseException {
- trace_call("UnaryExpressionNoPrefix");
- try {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS:
- jj_consume_token(PLUS);
- expr = AtNotUnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.PLUS,pos);}
- break;
- case MINUS:
- jj_consume_token(MINUS);
- expr = AtNotUnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.MINUS,pos);}
- break;
- case PLUS_PLUS:
- case MINUS_MINUS:
- expr = PreIncDecExpression();
+ final Token token;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PLUS:
+ token = jj_consume_token(PLUS);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,
+ OperatorIds.PLUS,
+ token.sourceStart);}
+ break;
+ case MINUS:
+ token = jj_consume_token(MINUS);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,
+ OperatorIds.MINUS,
+ token.sourceStart);}
+ break;
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ expr = PreIncDecExpression();
{if (true) return expr;}
- break;
- case ARRAY:
- case NEW:
- case NULL:
- case TRUE:
- case FALSE:
- case DOLLAR:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case DOLLAR_ID:
- expr = UnaryExpressionNotPlusMinus();
+ break;
+ case ARRAY:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ expr = UnaryExpressionNotPlusMinus();
{if (true) return expr;}
- break;
- default:
- jj_la1[52] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("UnaryExpressionNoPrefix");
+ break;
+ default:
+ jj_la1[51] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
static final public Expression PreIncDecExpression() throws ParseException {
- trace_call("PreIncDecExpression");
- try {
final Expression expr;
final int operator;
- final int pos = SimpleCharStream.getPosition();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS_PLUS:
- jj_consume_token(PLUS_PLUS);
- operator = OperatorIds.PLUS_PLUS;
- break;
- case MINUS_MINUS:
- jj_consume_token(MINUS_MINUS);
- operator = OperatorIds.MINUS_MINUS;
- break;
- default:
- jj_la1[53] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr = PrimaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
+final Token token;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PLUS_PLUS:
+ token = jj_consume_token(PLUS_PLUS);
+ operator = OperatorIds.PLUS_PLUS;
+ break;
+ case MINUS_MINUS:
+ token = jj_consume_token(MINUS_MINUS);
+ operator = OperatorIds.MINUS_MINUS;
+ break;
+ default:
+ jj_la1[52] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ expr = PrimaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,operator,token.sourceStart);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("PreIncDecExpression");
- }
}
static final public Expression UnaryExpressionNotPlusMinus() throws ParseException {
- trace_call("UnaryExpressionNotPlusMinus");
- try {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
- if (jj_2_3(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 BIT_AND:
+ case DOLLAR:
+ case IDENTIFIER:
+ 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();
+ errorStart = expr.sourceEnd +1;
+ errorEnd = expr.sourceEnd +1;
+ processParseExceptionDebug(e);
}
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[53] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("UnaryExpressionNotPlusMinus");
}
+ throw new Error("Missing return statement in function");
}
static final public CastExpression CastExpression() throws ParseException {
- trace_call("CastExpression");
- try {
final ConstantIdentifier type;
final Expression expr;
-final int pos = SimpleCharStream.getPosition();
- jj_consume_token(LPAREN);
+final Token token,token1;
+ token1 = jj_consume_token(LPAREN);
+ 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:
+ token = jj_consume_token(ARRAY);
+ type = new ConstantIdentifier(token);
+ break;
+ default:
+ jj_la1[54] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ jj_consume_token(RPAREN);
+ expr = UnaryExpression();
+ {if (true) return new CastExpression(type,expr,token1.sourceStart,expr.sourceEnd);}
+ throw new Error("Missing return statement in function");
+ }
+
+ static final public Expression PostfixExpression() throws ParseException {
+ final Expression expr;
+ int operator = -1;
+ Token token = null;
+ expr = PrimaryExpression();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PLUS_PLUS:
+ case MINUS_MINUS:
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();
+ case PLUS_PLUS:
+ token = jj_consume_token(PLUS_PLUS);
+ operator = OperatorIds.PLUS_PLUS;
break;
- case ARRAY:
- jj_consume_token(ARRAY);
- type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());
+ case MINUS_MINUS:
+ token = jj_consume_token(MINUS_MINUS);
+ operator = OperatorIds.MINUS_MINUS;
break;
default:
jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- jj_consume_token(RPAREN);
- expr = UnaryExpression();
- {if (true) return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("CastExpression");
+ break;
+ default:
+ jj_la1[56] = jj_gen;
+ ;
+ }
+ if (operator == -1) {
+ {if (true) return expr;}
}
+ {if (true) return new PostfixedUnaryExpression(expr,operator,token.sourceEnd);}
+ throw new Error("Missing return statement in function");
}
- static final public Expression PostfixExpression() throws ParseException {
- trace_call("PostfixExpression");
- try {
- final Expression expr;
- int operator = -1;
- final int pos = SimpleCharStream.getPosition();
- expr = PrimaryExpression();
+ static final public Expression PrimaryExpression() throws ParseException {
+ Expression expr;
+ Token token = null;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case NEW:
+ case BIT_AND:
+ case DOLLAR:
+ case IDENTIFIER:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS_PLUS:
- case MINUS_MINUS:
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS_PLUS:
- jj_consume_token(PLUS_PLUS);
- operator = OperatorIds.PLUS_PLUS;
- break;
- case MINUS_MINUS:
- jj_consume_token(MINUS_MINUS);
- operator = OperatorIds.MINUS_MINUS;
- break;
- default:
- jj_la1[56] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
+ case BIT_AND:
+ token = jj_consume_token(BIT_AND);
break;
default:
jj_la1[57] = jj_gen;
;
}
- if (operator == -1) {
- {if (true) return expr;}
+ expr = refPrimaryExpression(token);
+ {if (true) return expr;}
+ break;
+ case ARRAY:
+ expr = ArrayDeclarator();
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[58] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
- {if (true) return new PostfixedUnaryExpression(expr,operator,pos);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("PostfixExpression");
- }
}
- static final public Expression PrimaryExpression() throws ParseException {
- trace_call("PrimaryExpression");
- try {
- Expression expr = null;
- Expression expr2;
- int assignOperator = -1;
+ static final public Expression refPrimaryExpression(final Token reference) throws ParseException {
+ Expression expr;
+ Expression expr2 = null;
final Token identifier;
- final String var;
- final int pos;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IDENTIFIER:
- token = jj_consume_token(IDENTIFIER);
- pos = SimpleCharStream.getPosition();
- expr = new ConstantIdentifier(token.image.toCharArray(),
- pos-token.image.length(),
- pos);
- label_19:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case STATICCLASSACCESS:
- ;
- break;
- default:
- jj_la1[58] = jj_gen;
- break label_19;
- }
- jj_consume_token(STATICCLASSACCESS);
- expr2 = ClassIdentifier();
- expr = new ClassAccess(expr,
- expr2,
- ClassAccess.STATIC);
- }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ identifier = jj_consume_token(IDENTIFIER);
+ expr = new ConstantIdentifier(identifier);
+ label_19:
+ while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LPAREN:
- expr = Arguments(expr);
- break;
- default:
- jj_la1[59] = jj_gen;
+ case STATICCLASSACCESS:
;
- }
- {if (true) return expr;}
- break;
- case DOLLAR:
- case DOLLAR_ID:
- expr = VariableDeclaratorId();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LPAREN:
- expr = Arguments(expr);
break;
default:
- jj_la1[60] = jj_gen;
- ;
+ jj_la1[59] = jj_gen;
+ break label_19;
}
- {if (true) return expr;}
+ jj_consume_token(STATICCLASSACCESS);
+ expr2 = ClassIdentifier();
+ expr = new ClassAccess(expr,
+ expr2,
+ ClassAccess.STATIC);
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ expr2 = Arguments(expr);
break;
- case NEW:
- jj_consume_token(NEW);
- pos = SimpleCharStream.getPosition();
- expr = ClassIdentifier();
- expr = new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos-3);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LPAREN:
- expr = Arguments(expr);
- break;
- default:
- jj_la1[61] = jj_gen;
- ;
- }
- {if (true) return expr;}
+ default:
+ jj_la1[60] = jj_gen;
+ ;
+ }
+ if (expr2 == null) {
+ if (reference != null) {
+ ParseException e = generateParseException();
+ errorMessage = "you cannot use a constant by reference";
+ errorLevel = ERROR;
+ errorStart = reference.sourceStart;
+ errorEnd = reference.sourceEnd;
+ processParseExceptionDebug(e);
+ }
+ {if (true) return expr;}
+ }
+ {if (true) return expr2;}
+ break;
+ case DOLLAR:
+ expr = VariableDeclaratorId();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ expr = Arguments(expr);
break;
- case ARRAY:
- expr = ArrayDeclarator();
+ default:
+ jj_la1[61] = jj_gen;
+ ;
+ }
{if (true) return expr;}
+ break;
+ case NEW:
+ token = jj_consume_token(NEW);
+ expr = ClassIdentifier();
+ int start;
+ if (reference == null) {
+ start = token.sourceStart;
+ } else {
+ start = reference.sourceStart;
+ }
+ expr = new ClassInstantiation(expr,
+ reference != null,
+ start);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ expr = Arguments(expr);
break;
default:
jj_la1[62] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ ;
}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("PrimaryExpression");
+ {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");
}
/**
@@ -2491,122 +2335,126 @@ final int pos = SimpleCharStream.getPosition();
* @return an array
*/
static final public ArrayInitializer ArrayDeclarator() throws ParseException {
- trace_call("ArrayDeclarator");
- try {
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");
- } finally {
- trace_return("ArrayDeclarator");
- }
- }
-
- static final public PrefixedUnaryExpression classInstantiation() throws ParseException {
- trace_call("classInstantiation");
- try {
- Expression expr;
- final StringBuffer buff;
- final int pos = SimpleCharStream.getPosition();
- jj_consume_token(NEW);
- expr = ClassIdentifier();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ARRAY:
- case NEW:
- case DOLLAR:
- case IDENTIFIER:
- case DOLLAR_ID:
- buff = new StringBuffer(expr.toStringExpression());
- expr = PrimaryExpression();
- buff.append(expr.toStringExpression());
- expr = new ConstantIdentifier(buff.toString().toCharArray(),
- pos,
- SimpleCharStream.getPosition());
- break;
- default:
- jj_la1[63] = jj_gen;
- ;
- }
- {if (true) return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);}
+ final Token token;
+ token = jj_consume_token(ARRAY);
+ vars = ArrayInitializer();
+ {if (true) return new ArrayInitializer(vars,
+ token.sourceStart,
+ PHPParser.token.sourceEnd);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("classInstantiation");
- }
}
static final public Expression ClassIdentifier() throws ParseException {
- trace_call("ClassIdentifier");
- try {
final Expression expr;
final Token token;
- final ConstantIdentifier type;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IDENTIFIER:
- token = jj_consume_token(IDENTIFIER);
- final int pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(token.image.toCharArray(),
- pos-token.image.length(),
- pos);}
- break;
- case STRING:
- case OBJECT:
- case BOOL:
- case BOOLEAN:
- case REAL:
- case DOUBLE:
- case FLOAT:
- case INT:
- case INTEGER:
- expr = Type();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ {if (true) return new ConstantIdentifier(token);}
+ break;
+ case STRING:
+ case OBJECT:
+ case BOOL:
+ case BOOLEAN:
+ case REAL:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case INTEGER:
+ expr = Type();
{if (true) return expr;}
- break;
- case DOLLAR:
- case DOLLAR_ID:
- expr = VariableDeclaratorId();
+ break;
+ case DOLLAR:
+ expr = VariableDeclaratorId();
{if (true) return expr;}
- break;
- default:
- jj_la1[64] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("ClassIdentifier");
+ break;
+ default:
+ jj_la1[64] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
/**
* Used by Variabledeclaratorid and primarysuffix
*/
static final public AbstractVariable VariableSuffix(final AbstractVariable prefix) throws ParseException {
- trace_call("VariableSuffix");
- try {
- Variable expr = null;
- final int pos = SimpleCharStream.getPosition();
Expression expression = null;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case CLASSACCESS:
- jj_consume_token(CLASSACCESS);
- try {
- expr = VariableName();
- } catch (ParseException e) {
+ final Token classAccessToken,lbrace,rbrace;
+ Token token;
+ int pos;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case CLASSACCESS:
+ classAccessToken = jj_consume_token(CLASSACCESS);
+ try {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LBRACE:
+ lbrace = jj_consume_token(LBRACE);
+ expression = Expression();
+ rbrace = jj_consume_token(RBRACE);
+ expression = new Variable(expression,
+ lbrace.sourceStart,
+ rbrace.sourceEnd);
+ break;
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ expression = new ConstantIdentifier(token.image,token.sourceStart,token.sourceEnd);
+ break;
+ case DOLLAR:
+ expression = Variable();
+ break;
+ default:
+ jj_la1[65] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ } catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
- }
+ errorStart = classAccessToken.sourceEnd +1;
+ errorEnd = classAccessToken.sourceEnd +1;
+ processParseExceptionDebug(e);
+ }
{if (true) return new ClassAccess(prefix,
- expr,
+ expression,
ClassAccess.NORMAL);}
- break;
- case LBRACKET:
- jj_consume_token(LBRACKET);
+ break;
+ case LBRACKET:
+ token = jj_consume_token(LBRACKET);
+ pos = token.sourceEnd+1;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case LIST:
+ case PRINT:
+ 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 AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case LIST:
@@ -2615,146 +2463,60 @@ final int pos = SimpleCharStream.getPosition();
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 AT:
- case DOLLAR:
case BANG:
+ case TILDE:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
case MINUS:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ARRAY:
- case LIST:
- case PRINT:
- 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 INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case DOLLAR_ID:
- expression = Expression();
- break;
- case STRING:
- case OBJECT:
- case BOOL:
- case BOOLEAN:
- case REAL:
- case DOUBLE:
- case FLOAT:
- case INT:
- case INTEGER:
- expression = Type();
- break;
- default:
- jj_la1[65] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
+ expression = Expression();
+ pos = expression.sourceEnd+1;
+ break;
+ case STRING:
+ case OBJECT:
+ case BOOL:
+ case BOOLEAN:
+ case REAL:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case INTEGER:
+ expression = Type();
+ pos = expression.sourceEnd+1;
break;
default:
jj_la1[66] = jj_gen;
- ;
- }
- try {
- jj_consume_token(RBRACKET);
- } catch (ParseException e) {
- errorMessage = "']' expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ jj_consume_token(-1);
+ throw new ParseException();
}
- {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
break;
default:
jj_la1[67] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ ;
}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("VariableSuffix");
- }
- }
-
- static final public Literal Literal() throws ParseException {
- trace_call("Literal");
- try {
- final Token token;
- final int pos;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INTEGER_LITERAL:
- token = jj_consume_token(INTEGER_LITERAL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
- break;
- case FLOATING_POINT_LITERAL:
- token = jj_consume_token(FLOATING_POINT_LITERAL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
- break;
- case STRING_LITERAL:
- token = jj_consume_token(STRING_LITERAL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new StringLiteral(token.image.toCharArray(),pos-token.image.length());}
- break;
- case TRUE:
- jj_consume_token(TRUE);
- pos = SimpleCharStream.getPosition();
- {if (true) return new TrueLiteral(pos-4,pos);}
- break;
- case FALSE:
- jj_consume_token(FALSE);
- pos = SimpleCharStream.getPosition();
- {if (true) return new FalseLiteral(pos-4,pos);}
- break;
- case NULL:
- jj_consume_token(NULL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new NullLiteral(pos-4,pos);}
- break;
- default:
- jj_la1[68] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ try {
+ token = jj_consume_token(RBRACKET);
+ pos = token.sourceEnd;
+ } catch (ParseException e) {
+ errorMessage = "']' expected";
+ errorLevel = ERROR;
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("Literal");
- }
- }
-
- static final public FunctionCall Arguments(final Expression func) throws ParseException {
- trace_call("Arguments");
- try {
-Expression[] args = null;
- jj_consume_token(LPAREN);
+ {if (true) return new ArrayDeclarator(prefix,expression,pos);}
+ break;
+ case LBRACE:
+ token = jj_consume_token(LBRACE);
+ pos = token.sourceEnd+1;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case LIST:
@@ -2763,39 +2525,175 @@ Expression[] args = null;
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 AT:
- case DOLLAR:
case BANG:
+ case TILDE:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
case MINUS:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
- args = ArgumentList();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case LIST:
+ case PRINT:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ expression = Expression();
+ pos = expression.sourceEnd+1;
+ break;
+ case STRING:
+ case OBJECT:
+ case BOOL:
+ case BOOLEAN:
+ case REAL:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case INTEGER:
+ expression = Type();
+ pos = expression.sourceEnd+1;
+ break;
+ default:
+ jj_la1[68] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
break;
default:
jj_la1[69] = jj_gen;
;
}
try {
- jj_consume_token(RPAREN);
+ token = jj_consume_token(RBRACE);
+ pos = token.sourceEnd;
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
+ errorMessage = "']' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
}
- {if (true) return new FunctionCall(func,args,SimpleCharStream.getPosition());}
+ {if (true) return new ArrayDeclarator(prefix,expression,pos);}
+ break;
+ default:
+ jj_la1[70] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
throw new Error("Missing return statement in function");
- } finally {
- trace_return("Arguments");
+ }
+
+ static final public Literal Literal() throws ParseException {
+ final Token token;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case INTEGER_LITERAL:
+ token = jj_consume_token(INTEGER_LITERAL);
+ {if (true) return new NumberLiteral(token);}
+ break;
+ case FLOATING_POINT_LITERAL:
+ token = jj_consume_token(FLOATING_POINT_LITERAL);
+ {if (true) return new NumberLiteral(token);}
+ break;
+ case STRING_LITERAL:
+ token = jj_consume_token(STRING_LITERAL);
+ {if (true) return new StringLiteral(token);}
+ break;
+ case TRUE:
+ token = jj_consume_token(TRUE);
+ {if (true) return new TrueLiteral(token);}
+ break;
+ case FALSE:
+ token = jj_consume_token(FALSE);
+ {if (true) return new FalseLiteral(token);}
+ break;
+ case NULL:
+ token = jj_consume_token(NULL);
+ {if (true) return new NullLiteral(token);}
+ break;
+ default:
+ 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(final Expression func) throws ParseException {
+Expression[] args = null;
+final Token token;
+ jj_consume_token(LPAREN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case LIST:
+ case PRINT:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ args = ArgumentList();
+ break;
+ default:
+ jj_la1[72] = jj_gen;
+ ;
+ }
+ try {
+ token = jj_consume_token(RPAREN);
+ {if (true) return new FunctionCall(func,args,token.sourceEnd);}
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
+ errorLevel = ERROR;
+ errorStart = args[args.length-1].sourceEnd+1;
+ errorEnd = args[args.length-1].sourceEnd+1;
+ processParseExceptionDebug(e);
+ }
+ {if (true) return new FunctionCall(func,args,args[args.length-1].sourceEnd);}
+ throw new Error("Missing return statement in function");
}
/**
@@ -2804,41 +2702,40 @@ Expression[] args = null;
* @return an array of arguments
*/
static final public Expression[] ArgumentList() throws ParseException {
- trace_call("ArgumentList");
- try {
Expression arg;
final ArrayList list = new ArrayList();
- arg = Expression();
- list.add(arg);
- label_20:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case COMMA:
- ;
- break;
- default:
- jj_la1[70] = jj_gen;
- break label_20;
- }
- jj_consume_token(COMMA);
- try {
- arg = Expression();
+int pos;
+Token token;
+ arg = Expression();
+ list.add(arg);pos = arg.sourceEnd;
+ label_20:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case COMMA:
+ ;
+ break;
+ default:
+ jj_la1[73] = jj_gen;
+ break label_20;
+ }
+ token = jj_consume_token(COMMA);
+ pos = token.sourceEnd;
+ try {
+ arg = Expression();
list.add(arg);
- } catch (ParseException e) {
+ pos = arg.sourceEnd;
+ } catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
- }
+ errorStart = pos+1;
+ errorEnd = pos+1;
+ processParseException(e);
}
+ }
final Expression[] arguments = new Expression[list.size()];
list.toArray(arguments);
{if (true) return arguments;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("ArgumentList");
- }
}
/**
@@ -2846,104 +2743,100 @@ final ArrayList list = new ArrayList();
* @return a statement
*/
static final public Statement StatementNoBreak() throws ParseException {
- trace_call("StatementNoBreak");
- try {
final Statement statement;
Token token = null;
- if (jj_2_4(2)) {
- statement = expressionStatement();
+ if (jj_2_4(2)) {
+ statement = expressionStatement();
{if (true) return statement;}
- } else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IDENTIFIER:
- statement = LabeledStatement();
+ } else {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ statement = LabeledStatement();
{if (true) return statement;}
- break;
- case LBRACE:
- statement = Block();
+ break;
+ case LBRACE:
+ statement = Block();
{if (true) return statement;}
- break;
- case SEMICOLON:
- statement = EmptyStatement();
+ break;
+ case SEMICOLON:
+ statement = EmptyStatement();
{if (true) return statement;}
- break;
- case SWITCH:
- statement = SwitchStatement();
+ break;
+ case SWITCH:
+ statement = SwitchStatement();
{if (true) return statement;}
- break;
- case IF:
- statement = IfStatement();
+ break;
+ case IF:
+ statement = IfStatement();
{if (true) return statement;}
- break;
- case WHILE:
- statement = WhileStatement();
+ break;
+ case WHILE:
+ statement = WhileStatement();
{if (true) return statement;}
- break;
- case DO:
- statement = DoStatement();
+ break;
+ case DO:
+ statement = DoStatement();
{if (true) return statement;}
- break;
- case FOR:
- statement = ForStatement();
+ break;
+ case FOR:
+ statement = ForStatement();
{if (true) return statement;}
- break;
- case FOREACH:
- statement = ForeachStatement();
+ break;
+ case FOREACH:
+ statement = ForeachStatement();
{if (true) return statement;}
- break;
- case CONTINUE:
- statement = ContinueStatement();
+ break;
+ case CONTINUE:
+ statement = ContinueStatement();
{if (true) return statement;}
- break;
- case RETURN:
- statement = ReturnStatement();
+ break;
+ case RETURN:
+ statement = ReturnStatement();
{if (true) return statement;}
- break;
- case ECHO:
- statement = EchoStatement();
+ break;
+ case ECHO:
+ statement = EchoStatement();
{if (true) return statement;}
- break;
- case INCLUDE:
- case REQUIRE:
- case INCLUDE_ONCE:
- case REQUIRE_ONCE:
+ break;
+ case INCLUDE:
+ case REQUIRE:
+ case INCLUDE_ONCE:
+ case REQUIRE_ONCE:
+ case AT:
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AT:
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case AT:
- token = jj_consume_token(AT);
- break;
- default:
- jj_la1[71] = jj_gen;
- ;
- }
- statement = IncludeStatement();
+ token = jj_consume_token(AT);
+ break;
+ default:
+ jj_la1[74] = jj_gen;
+ ;
+ }
+ statement = IncludeStatement();
if (token != null) {
((InclusionStatement)statement).silent = true;
+ statement.sourceStart = token.sourceStart;
}
{if (true) return statement;}
- break;
- case STATIC:
- statement = StaticStatement();
+ break;
+ case STATIC:
+ statement = StaticStatement();
{if (true) return statement;}
- break;
- case GLOBAL:
- statement = GlobalStatement();
+ break;
+ case GLOBAL:
+ statement = GlobalStatement();
{if (true) return statement;}
- break;
- case DEFINE:
- statement = defineStatement();
+ break;
+ case DEFINE:
+ statement = defineStatement();
currentSegment.add((Outlineable)statement);{if (true) return statement;}
- break;
- default:
- jj_la1[72] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
+ break;
+ default:
+ jj_la1[75] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("StatementNoBreak");
}
+ throw new Error("Missing return statement in function");
}
/**
@@ -2952,375 +2845,368 @@ final ArrayList list = new ArrayList();
* @return an expression
*/
static final public Statement expressionStatement() throws ParseException {
- trace_call("expressionStatement");
- try {
final Statement statement;
- statement = Expression();
- try {
- jj_consume_token(SEMICOLON);
- } catch (ParseException e) {
+ final Token token;
+ statement = Expression();
+ try {
+ token = jj_consume_token(SEMICOLON);
+ statement.sourceEnd = token.sourceEnd;
+ } 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;}
+ errorStart = statement.sourceEnd+1;
+ errorEnd = statement.sourceEnd+1;
+ processParseExceptionDebug(e);
+ }
}
- }
{if (true) return statement;}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("expressionStatement");
- }
}
static final public Define defineStatement() throws ParseException {
- trace_call("defineStatement");
- try {
- final int start = SimpleCharStream.getPosition();
Expression defineName,defineValue;
- jj_consume_token(DEFINE);
- try {
- jj_consume_token(LPAREN);
- } catch (ParseException e) {
+ final Token defineToken;
+ Token token;
+ int pos;
+ defineToken = jj_consume_token(DEFINE);
+ pos = defineToken.sourceEnd+1;
+ try {
+ token = jj_consume_token(LPAREN);
+ pos = token.sourceEnd+1;
+ } 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;
+ errorStart = pos;
+ errorEnd = pos;
processParseExceptionDebug(e);
- }
- try {
- defineName = Expression();
- } catch (ParseException e) {
+ }
+ try {
+ defineName = Expression();
+ pos = defineName.sourceEnd+1;
+ } 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) {
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ defineName = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
+ }
+ try {
+ token = jj_consume_token(COMMA);
+ pos = defineName.sourceEnd+1;
+ } 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;
+ errorStart = pos;
+ errorEnd = pos;
processParseExceptionDebug(e);
- }
- try {
- defineValue = Expression();
- } catch (ParseException e) {
+ }
+ try {
+ defineValue = Expression();
+ pos = defineValue.sourceEnd+1;
+ } 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) {
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ defineValue = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
+ }
+ try {
+ token = jj_consume_token(RPAREN);
+ pos = token.sourceEnd+1;
+ } 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;
+ errorStart = pos;
+ errorEnd = pos;
processParseExceptionDebug(e);
- }
+ }
{if (true) return new Define(currentSegment,
defineName,
defineValue,
- start,
- SimpleCharStream.getPosition());}
+ defineToken.sourceStart,
+ pos);}
throw new Error("Missing return statement in function");
- } finally {
- trace_return("defineStatement");
- }
}
/**
* A Normal statement.
*/
static final public Statement Statement() throws ParseException {
- trace_call("Statement");
- try {
final Statement statement;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IF:
- case ARRAY:
- case LIST:
- case PRINT:
- case ECHO:
- case INCLUDE:
- case REQUIRE:
- case INCLUDE_ONCE:
- case REQUIRE_ONCE:
- case GLOBAL:
- case DEFINE:
- 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 AT:
- case DOLLAR:
- case BANG:
- case PLUS_PLUS:
- case MINUS_MINUS:
- case PLUS:
- case MINUS:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case LBRACE:
- case SEMICOLON:
- case DOLLAR_ID:
- statement = StatementNoBreak();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IF:
+ case ARRAY:
+ case LIST:
+ case PRINT:
+ case ECHO:
+ case INCLUDE:
+ case REQUIRE:
+ case INCLUDE_ONCE:
+ case REQUIRE_ONCE:
+ case GLOBAL:
+ case DEFINE:
+ 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 AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ case LBRACE:
+ case SEMICOLON:
+ statement = StatementNoBreak();
{if (true) return statement;}
- break;
- case BREAK:
- statement = BreakStatement();
+ break;
+ case BREAK:
+ statement = BreakStatement();
{if (true) return statement;}
- break;
- default:
- jj_la1[73] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- } finally {
- trace_return("Statement");
+ break;
+ default:
+ jj_la1[76] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ throw new Error("Missing return statement in function");
}
/**
* An html block inside a php syntax.
*/
static final public HTMLBlock htmlBlock() throws ParseException {
- trace_call("htmlBlock");
- try {
final int startIndex = nodePtr;
final AstNode[] blockNodes;
final int nbNodes;
- jj_consume_token(PHPEND);
- label_21:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PHPECHOSTART:
- ;
- break;
- default:
- jj_la1[74] = jj_gen;
- break label_21;
- }
- phpEchoBlock();
+ final Token phpEnd;
+ phpEnd = jj_consume_token(PHPEND);
+ htmlStart = phpEnd.sourceEnd;
+ label_21:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PHPECHOSTART:
+ ;
+ break;
+ default:
+ jj_la1[77] = jj_gen;
+ break label_21;
}
- 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[75] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- } catch (ParseException e) {
+ 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[78] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ PHPParser.createNewHTMLCode();
+ } catch (ParseException e) {
errorMessage = "unexpected end of file , '= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 124; 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<" + where);
- }
- }
-
- static final private void trace_scan(Token t1, int t2) {
- if (trace_enabled) {
- for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
- System.out.print("Visited token: <" + tokenImage[t1.kind]);
- if (t1.kind != 0 && !tokenImage[t1.kind].equals("\"" + t1.image + "\"")) {
- System.out.print(": \"" + t1.image + "\"");
- }
- System.out.println(">; Expected token: <" + tokenImage[t2] + ">");
- }
}
static final private void jj_rescan_token() {