X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index f151bde..c4cc3b5 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -19,7 +19,7 @@ import net.sourceforge.phpdt.internal.compiler.ast.*;
import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
-import junit.framework.Assert;
+import net.sourceforge.phpdt.internal.corext.Assert;
/**
* A new php parser.
@@ -30,6 +30,10 @@ import junit.framework.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 = false;
+ public static final boolean PARSER_DEBUG = false;
public final void setFileToParse(final IFile fileToParse) {
PHPParser.fileToParse = fileToParse;
@@ -74,6 +78,49 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
PHPParser.fileToParse = fileToParse;
}
+ public final void phpParserTester(final String strEval) throws ParseException {
+ final StringReader stream = new StringReader(strEval);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ token_source = new PHPParserTokenManager(jj_input_stream);
+ }
+ ReInit(new StringReader(strEval));
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ token_source.SwitchTo(PHPParserTokenManager.PHPPARSING);
+ phpTest();
+ }
+
+ public final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException {
+ final Reader stream = new FileReader(fileName);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ token_source = new PHPParserTokenManager(jj_input_stream);
+ }
+ ReInit(stream);
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ phpFile();
+ }
+
+ public final void htmlParserTester(final String strEval) throws ParseException {
+ final StringReader stream = new StringReader(strEval);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ token_source = new PHPParserTokenManager(jj_input_stream);
+ }
+ ReInit(stream);
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ phpFile();
+ }
+
/**
* Reinitialize the parser.
*/
@@ -107,6 +154,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ token_source = new PHPParserTokenManager(jj_input_stream);
}
ReInit(stream);
init();
@@ -124,20 +172,29 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
/**
+ * 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;
+ }
+ processParseException(e);
+ }
+ /**
* This method will process the parse exception.
* If the error message is null, the parse exception wasn't catched and a trace is written in the log
* @param e the ParseException
*/
private static void processParseException(final ParseException e) {
- if (PARSER_DEBUG) {
- e.printStackTrace();
- Assert.assertTrue(false);
- }
if (errorMessage == null) {
PHPeclipsePlugin.log(e);
errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
- errorStart = SimpleCharStream.getPosition();
- errorEnd = errorStart + 1;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
}
setMarker(e);
errorMessage = null;
@@ -153,17 +210,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;
}
@@ -217,6 +274,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ token_source = new PHPParserTokenManager(jj_input_stream);
}
ReInit(stream);
init();
@@ -252,38 +310,51 @@ 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()) {
+ public final void createNewHTMLCode() {
+ final int currentPosition = token.sourceStart;
+ if (currentPosition == htmlStart ||
+ currentPosition < htmlStart ||
+ currentPosition > jj_input_stream.getCurrentBuffer().length()) {
return;
}
- final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray();
- pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
+ final String html = jj_input_stream.getCurrentBuffer().substring(htmlStart, currentPosition);
+ pushOnAstNodes(new HTMLCode(html, htmlStart,currentPosition));
}
/** Create a new task. */
- public static final void createNewTask() {
- final int currentPosition = SimpleCharStream.getPosition();
- final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3,
- SimpleCharStream.currentBuffer.indexOf("\n",
- currentPosition)-1);
- PHPeclipsePlugin.log(1,SimpleCharStream.currentBuffer.toString());
- try {
- setMarker(fileToParse,
- todo,
- SimpleCharStream.getBeginLine(),
- TASK,
- "Line "+SimpleCharStream.getBeginLine());
- } catch (CoreException e) {
- PHPeclipsePlugin.log(e);
+ public final void createNewTask(final int todoStart) {
+ final String todo = jj_input_stream.getCurrentBuffer().substring(todoStart,
+ jj_input_stream.getCurrentBuffer().indexOf("\n",
+ todoStart)-1);
+ if (!PARSER_DEBUG) {
+ try {
+ setMarker(fileToParse,
+ todo,
+ jj_input_stream.getBeginLine(),
+ TASK,
+ "Line "+jj_input_stream.getBeginLine());
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
}
}
- private static final void parse() throws ParseException {
+ private final void parse() throws ParseException {
phpFile();
}
- static final public void phpFile() throws ParseException {
+ final public void todo() throws ParseException {
+ Token todoToken;
+ todoToken = jj_consume_token(23);
+ createNewTask(todoToken.sourceStart);
+ }
+
+ final public void phpTest() throws ParseException {
+ Php();
+ jj_consume_token(0);
+ }
+
+ final public void phpFile() throws ParseException {
try {
label_1:
while (true) {
@@ -319,8 +390,8 @@ 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:
@@ -329,11 +400,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
case LBRACE:
case SEMICOLON:
- case DOLLAR_ID:
;
break;
default:
@@ -342,11 +414,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
PhpBlock();
}
- PHPParser.createNewHTMLCode();
+ createNewHTMLCode();
} catch (TokenMgrError e) {
PHPeclipsePlugin.log(e);
- errorStart = SimpleCharStream.getPosition();
- errorEnd = errorStart + 1;
+ errorStart = jj_input_stream.getBeginOffset();
+ errorEnd = jj_input_stream.getEndOffset();
errorMessage = e.getMessage();
errorLevel = ERROR;
{if (true) throw generateParseException();}
@@ -358,9 +430,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* or
* or somephpcode ?>
*/
- static final public void PhpBlock() throws ParseException {
- final int start = SimpleCharStream.getPosition();
+ final public void PhpBlock() throws ParseException {
final PHPEchoBlock phpEchoBlock;
+ final Token token,phpEnd;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPECHOSTART:
phpEchoBlock = phpEchoBlock();
@@ -396,8 +468,8 @@ 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:
@@ -406,11 +478,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ 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:
@@ -419,12 +492,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
jj_consume_token(PHPSTARTLONG);
break;
case PHPSTARTSHORT:
- jj_consume_token(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;
- processParseException(e);
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
+ processParseExceptionDebug(e);
}
break;
default:
@@ -459,11 +534,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
}
- static final public PHPEchoBlock phpEchoBlock() throws ParseException {
+ final public PHPEchoBlock phpEchoBlock() throws ParseException {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
final PHPEchoBlock echoBlock;
- jj_consume_token(PHPECHOSTART);
+ final Token token, token2;
+ token = jj_consume_token(PHPECHOSTART);
+ createNewHTMLCode();
expr = Expression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SEMICOLON:
@@ -473,14 +549,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
jj_la1[4] = jj_gen;
;
}
- jj_consume_token(PHPEND);
- echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
+ 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 {
+ final public void Php() throws ParseException {
label_2:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -511,8 +589,8 @@ 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:
@@ -521,11 +599,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
case LBRACE:
case SEMICOLON:
- case DOLLAR_ID:
;
break;
default:
@@ -536,36 +615,36 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
}
- static final public ClassDeclaration ClassDeclaration() throws ParseException {
+ final public ClassDeclaration ClassDeclaration() throws ParseException {
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();
+ 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.toCharArray();
+ 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;
- processParseException(e);
+ errorStart = token.sourceEnd+1;
+ errorEnd = token.sourceEnd+1;
+ processParseExceptionDebug(e);
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EXTENDS:
- jj_consume_token(EXTENDS);
+ extendsToken = jj_consume_token(EXTENDS);
try {
superclassName = jj_consume_token(IDENTIFIER);
- superclassNameImage = superclassName.image.toCharArray();
+ 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;
- processParseException(e);
+ errorStart = extendsToken.sourceEnd+1;
+ errorEnd = extendsToken.sourceEnd+1;
+ processParseExceptionDebug(e);
superclassNameImage = SYNTAX_ERROR_CHAR;
}
break;
@@ -573,37 +652,47 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
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.sourceEnd = SimpleCharStream.getPosition();
+ classDeclaration.sourceEnd = classEnd;
pushOnAstNodes(classDeclaration);
{if (true) return classDeclaration;}
throw new Error("Missing return statement in function");
}
- static final public void ClassBody(final ClassDeclaration classDeclaration) throws ParseException {
+ final public int ClassBody(final ClassDeclaration classDeclaration) throws ParseException {
+Token token;
try {
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;
- processParseException(e);
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
+ processParseExceptionDebug(e);
}
label_3:
while (true) {
@@ -619,20 +708,23 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
ClassBodyDeclaration(classDeclaration);
}
try {
- jj_consume_token(RBRACE);
+ 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;
- processParseException(e);
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
+ processParseExceptionDebug(e);
+ {if (true) return this.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 {
+ final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException {
final MethodDeclaration method;
final FieldDeclaration field;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -656,15 +748,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
* it is only used by ClassBodyDeclaration()
*/
- static final public FieldDeclaration FieldDeclaration() throws ParseException {
+ final public FieldDeclaration FieldDeclaration() throws ParseException {
VariableDeclaration variableDeclaration;
final VariableDeclaration[] list;
final ArrayList arrayList = new ArrayList();
- final int pos = SimpleCharStream.getPosition();
- jj_consume_token(VAR);
+ final Token token;
+ Token token2 = null;
+ int pos;
+ token = jj_consume_token(VAR);
variableDeclaration = VariableDeclaratorNoSuffix();
- arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name()));
+ arrayList.add(variableDeclaration);
+ pos = variableDeclaration.sourceEnd;
label_4:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -677,23 +771,30 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
jj_consume_token(COMMA);
variableDeclaration = VariableDeclaratorNoSuffix();
- arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name()));
+ arrayList.add(variableDeclaration);
+ outlineInfo.addVariable(variableDeclaration.name());
+ pos = variableDeclaration.sourceEnd;
}
try {
- jj_consume_token(SEMICOLON);
+ 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;
- processParseException(e);
+ 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");
}
@@ -702,78 +803,95 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* a strict variable declarator : there cannot be a suffix here.
* It will be used by fields and formal parameters
*/
- static final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException {
- final Token varName;
- Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
- varName = jj_consume_token(DOLLAR_ID);
+ final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException {
+ 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:
- jj_consume_token(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;
- processParseException(e);
+ errorStart = assignToken.sourceEnd +1;
+ errorEnd = assignToken.sourceEnd +1;
+ processParseExceptionDebug(e);
}
break;
default:
- jj_la1[10] = jj_gen;
+ jj_la1[11] = jj_gen;
;
}
if (initializer == null) {
{if (true) return new VariableDeclaration(currentSegment,
- new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
- pos,
- SimpleCharStream.getPosition());}
+ variable,
+ variable.sourceStart,
+ variable.sourceEnd);}
}
{if (true) return new VariableDeclaration(currentSegment,
- new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
+ variable,
initializer,
VariableDeclaration.EQUAL,
- pos);}
+ variable.sourceStart);}
throw new Error("Missing return statement in function");
}
/**
* this will be used by static statement
*/
- static final public VariableDeclaration VariableDeclarator() throws ParseException {
- final String varName;
+ final public VariableDeclaration VariableDeclarator() throws ParseException {
+ final AbstractVariable variable;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
- varName = VariableDeclaratorId();
+ final Token token;
+ variable = VariableDeclaratorId();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ASSIGN:
- jj_consume_token(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;
- processParseException(e);
+ errorStart = token.sourceEnd+1;
+ errorEnd = token.sourceEnd+1;
+ processParseExceptionDebug(e);
}
break;
default:
- jj_la1[11] = jj_gen;
+ jj_la1[12] = jj_gen;
;
}
if (initializer == null) {
{if (true) return new VariableDeclaration(currentSegment,
- new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
- pos,
- SimpleCharStream.getPosition());}
+ variable,
+ variable.sourceStart,
+ variable.sourceEnd);}
}
{if (true) return new VariableDeclaration(currentSegment,
- new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
+ variable,
initializer,
VariableDeclaration.EQUAL,
- pos);}
+ variable.sourceStart);}
throw new Error("Missing return statement in function");
}
@@ -781,11 +899,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* A Variable name.
* @return the variable name (with suffix)
*/
- static final public String VariableDeclaratorId() throws ParseException {
- final String var;
- Expression expression = null;
- final int pos = SimpleCharStream.getPosition();
- ConstantIdentifier ex;
+ final public AbstractVariable VariableDeclaratorId() throws ParseException {
+ AbstractVariable var;
try {
var = Variable();
label_5:
@@ -795,132 +910,63 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
} else {
break label_5;
}
- ex = new ConstantIdentifier(var.toCharArray(),
- pos,
- SimpleCharStream.getPosition());
- expression = VariableSuffix(ex);
+ var = VariableSuffix(var);
}
- if (expression == null) {
- {if (true) return var;}
- }
- {if (true) return expression.toStringExpression();}
+ {if (true) return var;}
} catch (ParseException e) {
errorMessage = "'$' expected for variable identifier";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
{if (true) throw e;}
}
throw new Error("Missing return statement in function");
}
-/**
- * Return a variablename without the $.
- * @return a variable name
- */
- static final public String Variable() throws ParseException {
- final StringBuffer buff;
- Expression expression = null;
+ final public Variable Variable() throws ParseException {
+ Variable variable = null;
final Token token;
- final String expr;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case DOLLAR_ID:
- token = jj_consume_token(DOLLAR_ID);
- 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 token.image.substring(1);}
- }
- buff = new StringBuffer(token.image);
- buff.append("{");
- buff.append(expression.toStringExpression());
- buff.append("}");
- {if (true) return buff.toString();}
- break;
- case DOLLAR:
- jj_consume_token(DOLLAR);
- expr = VariableName();
- {if (true) return expr;}
- break;
- default:
- jj_la1[13] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
+ token = jj_consume_token(DOLLAR);
+ variable = Var();
+ {if (true) return variable;}
throw new Error("Missing return statement in function");
}
-/**
- * A Variable name (without the $)
- * @return a variable name String
- */
- static final public String VariableName() throws ParseException {
- final StringBuffer buff;
- final String expr;
- Expression expression = null;
- final Token token;
+ final public Variable Var() 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();
+ {if (true) return new Variable(variable,variable.sourceStart,variable.sourceEnd);}
+ break;
case LBRACE:
- jj_consume_token(LBRACE);
+ token = jj_consume_token(LBRACE);
expression = Expression();
- jj_consume_token(RBRACE);
- buff = new StringBuffer("{");
- buff.append(expression.toStringExpression());
- buff.append("}");
- {if (true) return buff.toString();}
+ token2 = jj_consume_token(RBRACE);
+ {if (true) return new Variable(expression,
+ token.sourceStart,
+ token2.sourceEnd);}
break;
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
- 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 token.image;}
- }
- buff = new StringBuffer(token.image);
- buff.append("{");
- buff.append(expression.toStringExpression());
- buff.append("}");
- {if (true) return buff.toString();}
- break;
- case DOLLAR:
- jj_consume_token(DOLLAR);
- expr = VariableName();
- buff = new StringBuffer("$");
- buff.append(expr);
- {if (true) return buff.toString();}
- break;
- case DOLLAR_ID:
- token = jj_consume_token(DOLLAR_ID);
- {if (true) return token.image;}
+ outlineInfo.addVariable('$' + token.image);
+ {if (true) return new Variable(token.image,token.sourceStart,token.sourceEnd);}
break;
default:
- jj_la1[15] = jj_gen;
+ 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 {
+ final public Expression VariableInitializer() throws ParseException {
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:
@@ -928,11 +974,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
expr = Literal();
{if (true) return expr;}
break;
case MINUS:
- jj_consume_token(MINUS);
+ token2 = jj_consume_token(MINUS);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
token = jj_consume_token(INTEGER_LITERAL);
@@ -941,18 +988,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[16] = jj_gen;
+ jj_la1[14] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.MINUS,
- pos);}
+ token2.sourceStart);}
break;
case PLUS:
- jj_consume_token(PLUS);
+ token2 = jj_consume_token(PLUS);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
token = jj_consume_token(INTEGER_LITERAL);
@@ -961,15 +1006,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[17] = jj_gen;
+ jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.PLUS,
- pos);}
+ token2.sourceStart);}
break;
case ARRAY:
expr = ArrayDeclarator();
@@ -977,17 +1020,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
break;
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
- {if (true) return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
+ {if (true) return new ConstantIdentifier(token);}
break;
default:
- jj_la1[18] = jj_gen;
+ 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 {
+ final public ArrayVariableDeclaration ArrayVariable() throws ParseException {
final Expression expr,expr2;
expr = Expression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -997,14 +1040,14 @@ final Expression expr,expr2;
{if (true) return new ArrayVariableDeclaration(expr,expr2);}
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[17] = jj_gen;
;
}
- {if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
+ {if (true) return new ArrayVariableDeclaration(expr,jj_input_stream.getPosition());}
throw new Error("Missing return statement in function");
}
- static final public ArrayVariableDeclaration[] ArrayInitializer() throws ParseException {
+ final public ArrayVariableDeclaration[] ArrayInitializer() throws ParseException {
ArrayVariableDeclaration expr;
final ArrayList list = new ArrayList();
jj_consume_token(LPAREN);
@@ -1017,8 +1060,8 @@ final Expression expr,expr2;
case TRUE:
case FALSE:
case AT:
- case DOLLAR:
case BANG:
+ case TILDE:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
@@ -1027,9 +1070,10 @@ final Expression expr,expr2;
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expr = ArrayVariable();
list.add(expr);
label_6:
@@ -1045,7 +1089,7 @@ final Expression expr,expr2;
}
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[18] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1054,7 +1098,7 @@ final Expression expr,expr2;
list.add(null);
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[19] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -1068,20 +1112,21 @@ final Expression expr,expr2;
* A Method Declaration.
* function MetodDeclarator() Block()
*/
- static final public MethodDeclaration MethodDeclaration() throws ParseException {
+ final public MethodDeclaration MethodDeclaration() throws ParseException {
final MethodDeclaration functionDeclaration;
final Block block;
final OutlineableWithChildren seg = currentSegment;
- jj_consume_token(FUNCTION);
+ final Token token;
+ token = jj_consume_token(FUNCTION);
try {
- functionDeclaration = MethodDeclarator();
- outlineInfo.addVariable(new String(functionDeclaration.name));
+ 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;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
{if (true) throw e;}
}
currentSegment = functionDeclaration;
@@ -1097,38 +1142,54 @@ final Expression expr,expr2;
* [&] IDENTIFIER(parameters ...).
* @return a function description for the outline
*/
- static final public MethodDeclaration MethodDeclarator() throws ParseException {
- final Token identifier;
+ 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;
+ final ArrayList formalParameters = new ArrayList();
+ 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[22] = jj_gen;
+ jj_la1[20] = jj_gen;
;
}
try {
identifier = jj_consume_token(IDENTIFIER);
- identifierChar = identifier.image.toCharArray();
+ 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;
- processParseException(e);
- }
- formalParameters = FormalParameters();
- MethodDeclaration method = new MethodDeclaration(currentSegment,
- identifierChar,
- formalParameters,
- reference != null,
- pos,
- SimpleCharStream.getPosition());
- {if (true) return method;}
+ errorStart = e.currentToken.sourceEnd;
+ errorEnd = e.currentToken.next.sourceStart;
+ processParseExceptionDebug(e);
+ }
+ 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");
}
@@ -1136,23 +1197,26 @@ final Expression expr,expr2;
* FormalParameters follows method identifier.
* (FormalParameter())
*/
- static final public Hashtable FormalParameters() throws ParseException {
+ final public int FormalParameters(final ArrayList parameters) throws ParseException {
VariableDeclaration var;
- final Hashtable parameters = new Hashtable();
+ final Token token;
+ Token tok = this.token;
+ int end = tok.sourceEnd;
try {
- jj_consume_token(LPAREN);
+ 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;
- processParseException(e);
+ 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:
+ case DOLLAR:
var = FormalParameter();
- parameters.put(new String(var.name()),var);
+ parameters.add(var);end = var.sourceEnd;
label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1160,28 +1224,29 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[23] = jj_gen;
+ jj_la1[21] = jj_gen;
break label_7;
}
jj_consume_token(COMMA);
var = FormalParameter();
- parameters.put(new String(var.name()),var);
+ parameters.add(var);end = var.sourceEnd;
}
break;
default:
- jj_la1[24] = jj_gen;
+ jj_la1[22] = jj_gen;
;
}
try {
- jj_consume_token(RPAREN);
+ 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;
- processParseException(e);
+ errorStart = e.currentToken.next.sourceStart;
+ errorEnd = e.currentToken.next.sourceEnd;
+ processParseExceptionDebug(e);
}
- {if (true) return parameters;}
+ {if (true) return end;}
throw new Error("Missing return statement in function");
}
@@ -1189,7 +1254,7 @@ final Expression expr,expr2;
* A formal parameter.
* $varname[=value] (,$varname[=value])
*/
- static final public VariableDeclaration FormalParameter() throws ParseException {
+ final public VariableDeclaration FormalParameter() throws ParseException {
final VariableDeclaration variableDeclaration;
Token token = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1197,10 +1262,11 @@ final Expression expr,expr2;
token = jj_consume_token(BIT_AND);
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[23] = jj_gen;
;
}
variableDeclaration = VariableDeclaratorNoSuffix();
+ outlineInfo.addVariable('$'+variableDeclaration.name());
if (token != null) {
variableDeclaration.setReference(true);
}
@@ -1208,66 +1274,56 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public ConstantIdentifier Type() throws ParseException {
- final int pos;
+ final public ConstantIdentifier Type() throws ParseException {
+ final Token token;
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);}
+ token = jj_consume_token(STRING);
+ {if (true) return new ConstantIdentifier(token);}
break;
case BOOL:
- jj_consume_token(BOOL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.BOOL,pos,pos-4);}
+ token = jj_consume_token(BOOL);
+ {if (true) return new ConstantIdentifier(token);}
break;
case BOOLEAN:
- jj_consume_token(BOOLEAN);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);}
+ token = jj_consume_token(BOOLEAN);
+ {if (true) return new ConstantIdentifier(token);}
break;
case REAL:
- jj_consume_token(REAL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.REAL,pos,pos-4);}
+ token = jj_consume_token(REAL);
+ {if (true) return new ConstantIdentifier(token);}
break;
case DOUBLE:
- jj_consume_token(DOUBLE);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);}
+ token = jj_consume_token(DOUBLE);
+ {if (true) return new ConstantIdentifier(token);}
break;
case FLOAT:
- jj_consume_token(FLOAT);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.FLOAT,pos,pos-5);}
+ token = jj_consume_token(FLOAT);
+ {if (true) return new ConstantIdentifier(token);}
break;
case INT:
- jj_consume_token(INT);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.INT,pos,pos-3);}
+ token = jj_consume_token(INT);
+ {if (true) return new ConstantIdentifier(token);}
break;
case INTEGER:
- jj_consume_token(INTEGER);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.INTEGER,pos,pos-7);}
+ token = jj_consume_token(INTEGER);
+ {if (true) return new ConstantIdentifier(token);}
break;
case OBJECT:
- jj_consume_token(OBJECT);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.OBJECT,pos,pos-6);}
+ token = jj_consume_token(OBJECT);
+ {if (true) return new ConstantIdentifier(token);}
break;
default:
- jj_la1[26] = jj_gen;
+ 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 {
+ final public Expression Expression() throws ParseException {
final Expression expr;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
int assignOperator = -1;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
@@ -1276,8 +1332,8 @@ final Expression expr,expr2;
case TRUE:
case FALSE:
case AT:
- case DOLLAR:
case BANG:
+ case TILDE:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
@@ -1286,9 +1342,10 @@ final Expression expr,expr2;
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expr = ConditionalExpression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ASSIGN:
@@ -1313,28 +1370,31 @@ final Expression expr,expr2;
}
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
errorLevel = ERROR;
- errorEnd = SimpleCharStream.getPosition();
+ errorEnd = jj_input_stream.getPosition();
{if (true) throw e;}
}
break;
default:
- jj_la1[27] = jj_gen;
+ jj_la1[25] = jj_gen;
;
}
- char[] varName = expr.toStringExpression().substring(1).toCharArray();
- if (assignOperator == -1) {
+ if (assignOperator != -1) {// todo : change this, very very bad :(
+ if (expr instanceof AbstractVariable) {
+ {if (true) return new VariableDeclaration(currentSegment,
+ (AbstractVariable) expr,
+ 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());}
- {if (true) return expr;}
+ new Variable(varName,
+ expr.sourceStart,
+ expr.sourceEnd),
+ expr.sourceStart,
+ initializer.sourceEnd);}
}
- {if (true) return new VariableDeclaration(currentSegment,
- new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()),
- initializer,
- assignOperator,
- pos);}
- {if (true) return expr;}
+ {if (true) return expr;}
break;
case LIST:
case PRINT:
@@ -1342,21 +1402,21 @@ final Expression expr,expr2;
{if (true) return expr;}
break;
default:
- jj_la1[28] = jj_gen;
+ 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 {
+ final public Expression ExpressionWBang() throws ParseException {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BANG:
- jj_consume_token(BANG);
+ token = jj_consume_token(BANG);
expr = ExpressionWBang();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
break;
case LIST:
case PRINT:
@@ -1364,26 +1424,26 @@ final Expression expr,expr2;
{if (true) return expr;}
break;
default:
- jj_la1[29] = jj_gen;
+ 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 {
+ final public Expression ExpressionNoBang() throws ParseException {
Expression expr;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PRINT:
- expr = PrintExpression();
- {if (true) return expr;}
- break;
case LIST:
expr = ListExpression();
{if (true) return expr;}
break;
+ case PRINT:
+ expr = PrintExpression();
+ {if (true) return expr;}
+ break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[28] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1394,7 +1454,7 @@ final Expression expr,expr2;
* Any assignement operator.
* @return the assignement operator id
*/
- static final public int AssignmentOperator() throws ParseException {
+ final public int AssignmentOperator() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ASSIGN:
jj_consume_token(ASSIGN);
@@ -1449,14 +1509,14 @@ final Expression expr,expr2;
{if (true) return VariableDeclaration.TILDE_EQUAL;}
break;
default:
- jj_la1[31] = jj_gen;
+ 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 {
+ final public Expression ConditionalExpression() throws ParseException {
final Expression expr;
Expression expr2 = null;
Expression expr3 = null;
@@ -1469,7 +1529,7 @@ final Expression expr,expr2;
expr3 = ConditionalExpression();
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[30] = jj_gen;
;
}
if (expr3 == null) {
@@ -1479,7 +1539,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression ConditionalOrExpression() throws ParseException {
+ final public Expression ConditionalOrExpression() throws ParseException {
Expression expr,expr2;
int operator;
expr = ConditionalAndExpression();
@@ -1491,7 +1551,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[31] = jj_gen;
break label_8;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1504,7 +1564,7 @@ final Expression expr,expr2;
operator = OperatorIds.ORL;
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[32] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1515,7 +1575,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression ConditionalAndExpression() throws ParseException {
+ final public Expression ConditionalAndExpression() throws ParseException {
Expression expr,expr2;
int operator;
expr = ConcatExpression();
@@ -1527,7 +1587,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[35] = jj_gen;
+ jj_la1[33] = jj_gen;
break label_9;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1540,7 +1600,7 @@ final Expression expr,expr2;
operator = OperatorIds.ANDL;
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1551,7 +1611,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression ConcatExpression() throws ParseException {
+ final public Expression ConcatExpression() throws ParseException {
Expression expr,expr2;
expr = InclusiveOrExpression();
label_10:
@@ -1561,7 +1621,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[37] = jj_gen;
+ jj_la1[35] = jj_gen;
break label_10;
}
jj_consume_token(DOT);
@@ -1572,7 +1632,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression InclusiveOrExpression() throws ParseException {
+ final public Expression InclusiveOrExpression() throws ParseException {
Expression expr,expr2;
expr = ExclusiveOrExpression();
label_11:
@@ -1582,7 +1642,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[38] = jj_gen;
+ jj_la1[36] = jj_gen;
break label_11;
}
jj_consume_token(BIT_OR);
@@ -1593,7 +1653,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression ExclusiveOrExpression() throws ParseException {
+ final public Expression ExclusiveOrExpression() throws ParseException {
Expression expr,expr2;
expr = AndExpression();
label_12:
@@ -1603,7 +1663,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[39] = jj_gen;
+ jj_la1[37] = jj_gen;
break label_12;
}
jj_consume_token(XOR);
@@ -1614,7 +1674,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression AndExpression() throws ParseException {
+ final public Expression AndExpression() throws ParseException {
Expression expr,expr2;
expr = EqualityExpression();
label_13:
@@ -1624,7 +1684,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[38] = jj_gen;
break label_13;
}
jj_consume_token(BIT_AND);
@@ -1635,9 +1695,10 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression EqualityExpression() throws ParseException {
+ final public Expression EqualityExpression() throws ParseException {
Expression expr,expr2;
int operator;
+ Token token;
expr = RelationalExpression();
label_14:
while (true) {
@@ -1650,32 +1711,32 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[39] = 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;
+ token = jj_consume_token(EQUAL_EQUAL);
+ operator = OperatorIds.EQUAL_EQUAL;
break;
case DIF:
- jj_consume_token(DIF);
- operator = OperatorIds.DIF;
+ token = jj_consume_token(DIF);
+ operator = OperatorIds.DIF;
break;
case NOT_EQUAL:
- jj_consume_token(NOT_EQUAL);
- operator = OperatorIds.DIF;
+ token = jj_consume_token(NOT_EQUAL);
+ operator = OperatorIds.DIF;
break;
case BANGDOUBLEEQUAL:
- jj_consume_token(BANGDOUBLEEQUAL);
- operator = OperatorIds.BANG_EQUAL_EQUAL;
+ token = jj_consume_token(BANGDOUBLEEQUAL);
+ operator = OperatorIds.BANG_EQUAL_EQUAL;
break;
case TRIPLEEQUAL:
- jj_consume_token(TRIPLEEQUAL);
- operator = OperatorIds.EQUAL_EQUAL_EQUAL;
+ token = jj_consume_token(TRIPLEEQUAL);
+ operator = OperatorIds.EQUAL_EQUAL_EQUAL;
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[40] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1687,9 +1748,10 @@ final Expression expr,expr2;
}
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;}
+ 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);
}
@@ -1697,7 +1759,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression RelationalExpression() throws ParseException {
+ final public Expression RelationalExpression() throws ParseException {
Expression expr,expr2;
int operator;
expr = ShiftExpression();
@@ -1711,7 +1773,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[41] = jj_gen;
break label_15;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1732,7 +1794,7 @@ final Expression expr,expr2;
operator = OperatorIds.GREATER_EQUAL;
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[42] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1743,7 +1805,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression ShiftExpression() throws ParseException {
+ final public Expression ShiftExpression() throws ParseException {
Expression expr,expr2;
int operator;
expr = AdditiveExpression();
@@ -1756,7 +1818,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[45] = jj_gen;
+ jj_la1[43] = jj_gen;
break label_16;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1773,7 +1835,7 @@ final Expression expr,expr2;
operator = OperatorIds.UNSIGNED_RIGHT_SHIFT;
break;
default:
- jj_la1[46] = jj_gen;
+ jj_la1[44] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1784,7 +1846,7 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression AdditiveExpression() throws ParseException {
+ final public Expression AdditiveExpression() throws ParseException {
Expression expr,expr2;
int operator;
expr = MultiplicativeExpression();
@@ -1796,20 +1858,20 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[47] = jj_gen;
+ 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;
+ operator = OperatorIds.PLUS;
break;
case MINUS:
jj_consume_token(MINUS);
- operator = OperatorIds.MINUS;
+ operator = OperatorIds.MINUS;
break;
default:
- jj_la1[48] = jj_gen;
+ jj_la1[46] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1820,17 +1882,17 @@ final Expression expr,expr2;
throw new Error("Missing return statement in function");
}
- static final public Expression MultiplicativeExpression() throws ParseException {
+ final public Expression MultiplicativeExpression() throws ParseException {
Expression expr,expr2;
int operator;
try {
expr = UnaryExpression();
} catch (ParseException e) {
if (errorMessage != null) {if (true) throw e;}
- errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
+ errorMessage = "unexpected token '"+e.currentToken.next.image+'\'';
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = this.token.sourceStart;
+ errorEnd = this.token.sourceEnd;
{if (true) throw e;}
}
label_18:
@@ -1842,7 +1904,7 @@ final Expression expr,expr2;
;
break;
default:
- jj_la1[49] = jj_gen;
+ jj_la1[47] = jj_gen;
break label_18;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1859,7 +1921,7 @@ final Expression expr,expr2;
operator = OperatorIds.REMAINDER;
break;
default:
- jj_la1[50] = jj_gen;
+ jj_la1[48] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1873,38 +1935,57 @@ final Expression expr,expr2;
/**
* An unary expression starting with @, & or nothing
*/
- static final public Expression UnaryExpression() throws ParseException {
+ final public Expression UnaryExpression() throws ParseException {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ /* 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");
+ }
+
+ final public Expression AtNotTildeUnaryExpression() throws ParseException {
+ final Expression expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BIT_AND:
- jj_consume_token(BIT_AND);
- expr = UnaryExpressionNoPrefix();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
+ 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 AT:
- case DOLLAR:
- case BANG:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
case MINUS:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
- expr = AtNotUnaryExpression();
- {if (true) return expr;}
+ expr = UnaryExpressionNoPrefix();
+ {if (true) return expr;}
break;
default:
- jj_la1[51] = jj_gen;
+ jj_la1[49] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1915,70 +1996,65 @@ final Expression expr,expr2;
* An expression prefixed (or not) by one or more @ and !.
* @return the expression
*/
- static final public Expression AtNotUnaryExpression() throws ParseException {
+ final public Expression AtNotUnaryExpression() throws ParseException {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AT:
- jj_consume_token(AT);
+ token = jj_consume_token(AT);
expr = AtNotUnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
break;
case BANG:
- jj_consume_token(BANG);
+ token = jj_consume_token(BANG);
expr = AtNotUnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
break;
case ARRAY:
case NEW:
case NULL:
case TRUE:
case FALSE:
- case DOLLAR:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
case MINUS:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expr = UnaryExpressionNoPrefix();
{if (true) return expr;}
break;
default:
- jj_la1[52] = jj_gen;
+ 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 {
+ final public Expression UnaryExpressionNoPrefix() throws ParseException {
final Expression expr;
- final int operator;
- final int pos = SimpleCharStream.getPosition();
+ 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:
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS:
- jj_consume_token(PLUS);
- operator = OperatorIds.PLUS;
- break;
- case MINUS:
- jj_consume_token(MINUS);
- operator = OperatorIds.MINUS;
- break;
- default:
- jj_la1[53] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr = UnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
+ token = jj_consume_token(MINUS);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,
+ OperatorIds.MINUS,
+ token.sourceStart);}
break;
case PLUS_PLUS:
case MINUS_MINUS:
@@ -1990,50 +2066,50 @@ final Expression expr,expr2;
case NULL:
case TRUE:
case FALSE:
- case DOLLAR:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expr = UnaryExpressionNotPlusMinus();
{if (true) return expr;}
break;
default:
- jj_la1[54] = jj_gen;
+ jj_la1[51] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
- static final public Expression PreIncDecExpression() throws ParseException {
+ final public Expression PreIncDecExpression() throws ParseException {
final Expression expr;
final int operator;
- final int pos = SimpleCharStream.getPosition();
+final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS_PLUS:
- jj_consume_token(PLUS_PLUS);
- operator = OperatorIds.PLUS_PLUS;
+ token = jj_consume_token(PLUS_PLUS);
+ operator = OperatorIds.PLUS_PLUS;
break;
case MINUS_MINUS:
- jj_consume_token(MINUS_MINUS);
- operator = OperatorIds.MINUS_MINUS;
+ token = jj_consume_token(MINUS_MINUS);
+ operator = OperatorIds.MINUS_MINUS;
break;
default:
- jj_la1[55] = jj_gen;
+ jj_la1[52] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
expr = PrimaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
+ {if (true) return new PrefixedUnaryExpression(expr,operator,token.sourceStart);}
throw new Error("Missing return statement in function");
}
- static final public Expression UnaryExpressionNotPlusMinus() throws ParseException {
+ final public Expression UnaryExpressionNotPlusMinus() throws ParseException {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
if (jj_2_3(2147483647)) {
expr = CastExpression();
{if (true) return expr;}
@@ -2041,9 +2117,9 @@ final int operator;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case NEW:
+ case BIT_AND:
case DOLLAR:
case IDENTIFIER:
- case DOLLAR_ID:
expr = PostfixExpression();
{if (true) return expr;}
break;
@@ -2053,6 +2129,7 @@ final int operator;
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
expr = Literal();
{if (true) return expr;}
break;
@@ -2064,14 +2141,14 @@ final int operator;
} catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = expr.sourceEnd +1;
+ errorEnd = expr.sourceEnd +1;
+ processParseExceptionDebug(e);
}
{if (true) return expr;}
break;
default:
- jj_la1[56] = jj_gen;
+ jj_la1[53] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2079,11 +2156,11 @@ final int operator;
throw new Error("Missing return statement in function");
}
- static final public CastExpression CastExpression() throws ParseException {
+ final public CastExpression CastExpression() throws ParseException {
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:
@@ -2097,79 +2174,132 @@ final int pos = SimpleCharStream.getPosition();
type = Type();
break;
case ARRAY:
- jj_consume_token(ARRAY);
- type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());
+ token = jj_consume_token(ARRAY);
+ type = new ConstantIdentifier(token);
break;
default:
- jj_la1[57] = jj_gen;
+ 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,pos,SimpleCharStream.getPosition());}
+ {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 public Expression PostfixExpression() throws ParseException {
final Expression expr;
int operator = -1;
- final int pos = SimpleCharStream.getPosition();
+ 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 PLUS_PLUS:
- jj_consume_token(PLUS_PLUS);
- operator = OperatorIds.PLUS_PLUS;
+ token = jj_consume_token(PLUS_PLUS);
+ operator = OperatorIds.PLUS_PLUS;
break;
case MINUS_MINUS:
- jj_consume_token(MINUS_MINUS);
- operator = OperatorIds.MINUS_MINUS;
+ token = jj_consume_token(MINUS_MINUS);
+ operator = OperatorIds.MINUS_MINUS;
break;
default:
- jj_la1[58] = jj_gen;
+ jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[59] = jj_gen;
+ jj_la1[56] = jj_gen;
;
}
if (operator == -1) {
{if (true) return expr;}
}
- {if (true) return new PostfixedUnaryExpression(expr,operator,pos);}
+ {if (true) return new PostfixedUnaryExpression(expr,operator,token.sourceEnd);}
throw new Error("Missing return statement in function");
}
- static final public Expression PrimaryExpression() throws ParseException {
+ final public Expression PrimaryExpression() throws ParseException {
Expression expr;
- int assignOperator = -1;
- final Token identifier;
- final String var;
- final int pos = SimpleCharStream.getPosition();
+ Token token = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case NEW:
+ case BIT_AND:
case DOLLAR:
case IDENTIFIER:
- case DOLLAR_ID:
- expr = PrimaryPrefix();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BIT_AND:
+ token = jj_consume_token(BIT_AND);
+ break;
+ default:
+ jj_la1[57] = jj_gen;
+ ;
+ }
+ 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();
+ }
+ throw new Error("Missing return statement in function");
+ }
+
+ final public Expression refPrimaryExpression(final Token reference) throws ParseException {
+ Expression expr;
+ Expression expr2 = null;
+ final Token identifier;
+ 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 CLASSACCESS:
case STATICCLASSACCESS:
- case LBRACKET:
;
break;
default:
- jj_la1[60] = jj_gen;
+ jj_la1[59] = jj_gen;
break label_19;
}
- expr = PrimarySuffix(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;
+ 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);
@@ -2181,11 +2311,17 @@ final int pos = SimpleCharStream.getPosition();
{if (true) return expr;}
break;
case NEW:
- jj_consume_token(NEW);
+ token = jj_consume_token(NEW);
expr = ClassIdentifier();
- expr = new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);
+ 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);
@@ -2196,10 +2332,6 @@ final int pos = SimpleCharStream.getPosition();
}
{if (true) return expr;}
break;
- case ARRAY:
- expr = ArrayDeclarator();
- {if (true) return expr;}
- break;
default:
jj_la1[63] = jj_gen;
jj_consume_token(-1);
@@ -2208,112 +2340,29 @@ final int pos = SimpleCharStream.getPosition();
throw new Error("Missing return statement in function");
}
- static final public Expression PrimaryPrefix() throws ParseException {
- final Expression expr;
- final Token token;
- final String var;
- final int pos = SimpleCharStream.getPosition();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IDENTIFIER:
- token = jj_consume_token(IDENTIFIER);
- {if (true) return new ConstantIdentifier(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
- break;
- case DOLLAR:
- case DOLLAR_ID:
- var = VariableDeclaratorId();
- {if (true) return new Variable(var.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
- break;
- default:
- jj_la1[64] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- }
-
- static final public AbstractSuffixExpression PrimarySuffix(final Expression prefix) throws ParseException {
- final AbstractSuffixExpression suffix;
- final Expression expr;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case CLASSACCESS:
- case LBRACKET:
- suffix = VariableSuffix(prefix);
- {if (true) return suffix;}
- break;
- case STATICCLASSACCESS:
- jj_consume_token(STATICCLASSACCESS);
- expr = ClassIdentifier();
- suffix = new ClassAccess(prefix,
- expr,
- ClassAccess.STATIC);
- {if (true) return suffix;}
- break;
- default:
- jj_la1[65] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- }
-
/**
* An array declarator.
* array(vars)
* @return an array
*/
- static final public ArrayInitializer ArrayDeclarator() throws ParseException {
+ final public ArrayInitializer ArrayDeclarator() throws ParseException {
final ArrayVariableDeclaration[] vars;
- final int pos = SimpleCharStream.getPosition();
- jj_consume_token(ARRAY);
+ final Token token;
+ token = jj_consume_token(ARRAY);
vars = ArrayInitializer();
- {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
- throw new Error("Missing return statement in function");
- }
-
- static final public PrefixedUnaryExpression classInstantiation() throws ParseException {
- Expression expr;
- final StringBuffer buff;
- 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[66] = jj_gen;
- ;
- }
- {if (true) return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);}
+ {if (true) return new ArrayInitializer(vars,
+ token.sourceStart,
+ this.token.sourceEnd);}
throw new Error("Missing return statement in function");
}
- static final public ConstantIdentifier ClassIdentifier() throws ParseException {
- final String expr;
+ final public Expression ClassIdentifier() throws ParseException {
+ final Expression expr;
final Token token;
- final int pos = SimpleCharStream.getPosition();
- final ConstantIdentifier type;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
- {if (true) return new ConstantIdentifier(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ {if (true) return new ConstantIdentifier(token);}
break;
case STRING:
case OBJECT:
@@ -2324,46 +2373,68 @@ final int pos = SimpleCharStream.getPosition();
case FLOAT:
case INT:
case INTEGER:
- type = Type();
- {if (true) return type;}
+ expr = Type();
+ {if (true) return expr;}
break;
case DOLLAR:
- case DOLLAR_ID:
expr = VariableDeclaratorId();
- {if (true) return new ConstantIdentifier(expr.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ {if (true) return expr;}
break;
default:
- jj_la1[67] = jj_gen;
+ jj_la1[64] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
- static final public AbstractSuffixExpression VariableSuffix(final Expression prefix) throws ParseException {
- String expr = null;
- final int pos = SimpleCharStream.getPosition();
+/**
+ * Used by Variabledeclaratorid and primarysuffix
+ */
+ final public AbstractVariable VariableSuffix(final AbstractVariable prefix) throws ParseException {
Expression expression = null;
+ final Token classAccessToken,lbrace,rbrace;
+ Token token;
+ int pos;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CLASSACCESS:
- jj_consume_token(CLASSACCESS);
+ classAccessToken = jj_consume_token(CLASSACCESS);
try {
- expr = VariableName();
+ 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,
- new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+ expression,
ClassAccess.NORMAL);}
break;
case LBRACKET:
- jj_consume_token(LBRACKET);
+ token = jj_consume_token(LBRACKET);
+ pos = token.sourceEnd+1;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case LIST:
@@ -2382,8 +2453,8 @@ final int pos = SimpleCharStream.getPosition();
case INT:
case INTEGER:
case AT:
- case DOLLAR:
case BANG:
+ case TILDE:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
@@ -2392,9 +2463,10 @@ final int pos = SimpleCharStream.getPosition();
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case LIST:
@@ -2404,8 +2476,103 @@ final int pos = SimpleCharStream.getPosition();
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 DOUBLEQUOTE:
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[66] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ break;
+ default:
+ jj_la1[67] = jj_gen;
+ ;
+ }
+ try {
+ token = jj_consume_token(RBRACKET);
+ pos = token.sourceEnd;
+ } catch (ParseException e) {
+ errorMessage = "']' expected";
+ errorLevel = ERROR;
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ }
+ {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:
+ 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 DOUBLEQUOTE:
+ case DOLLAR:
+ case IDENTIFIER:
+ case 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:
@@ -2414,10 +2581,12 @@ final int pos = SimpleCharStream.getPosition();
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expression = Expression();
+ pos = expression.sourceEnd+1;
break;
case STRING:
case OBJECT:
@@ -2429,6 +2598,7 @@ final int pos = SimpleCharStream.getPosition();
case INT:
case INTEGER:
expression = Type();
+ pos = expression.sourceEnd+1;
break;
default:
jj_la1[68] = jj_gen;
@@ -2441,15 +2611,16 @@ final int pos = SimpleCharStream.getPosition();
;
}
try {
- jj_consume_token(RBRACKET);
+ token = jj_consume_token(RBRACE);
+ pos = token.sourceEnd;
} catch (ParseException e) {
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 ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
+ {if (true) return new ArrayDeclarator(prefix,expression,pos);}
break;
default:
jj_la1[70] = jj_gen;
@@ -2459,39 +2630,37 @@ final int pos = SimpleCharStream.getPosition();
throw new Error("Missing return statement in function");
}
- static final public Literal Literal() throws ParseException {
+ final public Literal Literal() throws ParseException {
final Token token;
- final int pos;
+ StringLiteral literal;
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);}
+ {if (true) return new NumberLiteral(token);}
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);}
+ {if (true) return new NumberLiteral(token);}
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());}
+ {if (true) return new StringLiteral(token);}
break;
case TRUE:
- jj_consume_token(TRUE);
- pos = SimpleCharStream.getPosition();
- {if (true) return new TrueLiteral(pos-4,pos);}
+ token = jj_consume_token(TRUE);
+ {if (true) return new TrueLiteral(token);}
break;
case FALSE:
- jj_consume_token(FALSE);
- pos = SimpleCharStream.getPosition();
- {if (true) return new FalseLiteral(pos-4,pos);}
+ token = jj_consume_token(FALSE);
+ {if (true) return new FalseLiteral(token);}
break;
case NULL:
- jj_consume_token(NULL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new NullLiteral(pos-4,pos);}
+ token = jj_consume_token(NULL);
+ {if (true) return new NullLiteral(token);}
+ break;
+ case DOUBLEQUOTE:
+ literal = evaluableString();
+ {if (true) return literal;}
break;
default:
jj_la1[71] = jj_gen;
@@ -2501,9 +2670,59 @@ final int pos = SimpleCharStream.getPosition();
throw new Error("Missing return statement in function");
}
- static final public FunctionCall Arguments(final Expression func) throws ParseException {
+ final public StringLiteral evaluableString() throws ParseException {
+ ArrayList list = new ArrayList();
+ Token start,end;
+ Token token,lbrace,rbrace;
+ AbstractVariable var;
+ Expression expr;
+ start = jj_consume_token(DOUBLEQUOTE);
+ label_20:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DOLLARS:
+ ;
+ break;
+ default:
+ jj_la1[72] = jj_gen;
+ break label_20;
+ }
+ jj_consume_token(DOLLARS);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ list.add(new Variable(token.image,
+ token.sourceStart,
+ token.sourceEnd));
+ break;
+ case LBRACE1:
+ lbrace = jj_consume_token(LBRACE1);
+ token = jj_consume_token(ID);
+ list.add(new Variable(token.image,
+ token.sourceStart,
+ token.sourceEnd));
+ rbrace = jj_consume_token(RBRACE1);
+ break;
+ default:
+ jj_la1[73] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ }
+ end = jj_consume_token(DOUBLEQUOTE2);
+ AbstractVariable[] vars = new AbstractVariable[list.size()];
+ list.toArray(vars);
+ {if (true) return new StringLiteral(jj_input_stream.getCurrentBuffer().substring(start.sourceEnd,end.sourceStart),
+ start.sourceStart,
+ end.sourceEnd,
+ vars);}
+ throw new Error("Missing return statement in function");
+ }
+
+ final public FunctionCall Arguments(final Expression func) throws ParseException {
Expression[] args = null;
- jj_consume_token(LPAREN);
+final Token token,lparen;
+ lparen = jj_consume_token(LPAREN);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case LIST:
@@ -2513,8 +2732,8 @@ Expression[] args = null;
case TRUE:
case FALSE:
case AT:
- case DOLLAR:
case BANG:
+ case TILDE:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
@@ -2523,25 +2742,33 @@ Expression[] args = null;
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
args = ArgumentList();
break;
default:
- jj_la1[72] = jj_gen;
+ jj_la1[74] = jj_gen;
;
}
try {
- jj_consume_token(RPAREN);
+ 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 = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ if (args == null) {
+ errorStart = lparen.sourceEnd+1;
+ errorEnd = lparen.sourceEnd+2;
+ } else {
+ errorStart = args[args.length-1].sourceEnd+1;
+ errorEnd = args[args.length-1].sourceEnd+2;
}
- {if (true) return new FunctionCall(func,args,SimpleCharStream.getPosition());}
+ processParseExceptionDebug(e);
+ }
+ int sourceEnd = (args == null && args.length != 0) ? lparen.sourceEnd+1 : args[args.length-1].sourceEnd;
+ {if (true) return new FunctionCall(func,args,sourceEnd);}
throw new Error("Missing return statement in function");
}
@@ -2550,31 +2777,35 @@ Expression[] args = null;
* argumentDeclaration() (, argumentDeclaration)*
* @return an array of arguments
*/
- static final public Expression[] ArgumentList() throws ParseException {
+ final public Expression[] ArgumentList() throws ParseException {
Expression arg;
final ArrayList list = new ArrayList();
+int pos;
+Token token;
arg = Expression();
- list.add(arg);
- label_20:
+ list.add(arg);pos = arg.sourceEnd;
+ label_21:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[73] = jj_gen;
- break label_20;
+ jj_la1[75] = jj_gen;
+ break label_21;
}
- jj_consume_token(COMMA);
+ token = jj_consume_token(COMMA);
+ pos = token.sourceEnd;
try {
arg = Expression();
list.add(arg);
+ 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()];
@@ -2587,7 +2818,7 @@ final ArrayList list = new ArrayList();
* A Statement without break.
* @return a statement
*/
- static final public Statement StatementNoBreak() throws ParseException {
+ final public Statement StatementNoBreak() throws ParseException {
final Statement statement;
Token token = null;
if (jj_2_4(2)) {
@@ -2653,12 +2884,13 @@ final ArrayList list = new ArrayList();
token = jj_consume_token(AT);
break;
default:
- jj_la1[74] = jj_gen;
+ jj_la1[76] = jj_gen;
;
}
statement = IncludeStatement();
if (token != null) {
((InclusionStatement)statement).silent = true;
+ statement.sourceStart = token.sourceStart;
}
{if (true) return statement;}
break;
@@ -2675,7 +2907,7 @@ final ArrayList list = new ArrayList();
currentSegment.add((Outlineable)statement);{if (true) return statement;}
break;
default:
- jj_la1[75] = jj_gen;
+ jj_la1[77] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2688,85 +2920,97 @@ final ArrayList list = new ArrayList();
* expression ;
* @return an expression
*/
- static final public Statement expressionStatement() throws ParseException {
+ final public Statement expressionStatement() throws ParseException {
final Statement statement;
+ final Token token;
statement = Expression();
try {
- jj_consume_token(SEMICOLON);
+ 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");
}
- static final public Define defineStatement() throws ParseException {
- final int start = SimpleCharStream.getPosition();
+ final public Define defineStatement() throws ParseException {
Expression defineName,defineValue;
- jj_consume_token(DEFINE);
+ final Token defineToken;
+ Token token;
+ int pos;
+ defineToken = jj_consume_token(DEFINE);
+ pos = defineToken.sourceEnd+1;
try {
- jj_consume_token(LPAREN);
+ 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;
- processParseException(e);
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(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;}
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ defineName = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
}
try {
- jj_consume_token(COMMA);
+ 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;
- processParseException(e);
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(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;}
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ defineValue = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
}
try {
- jj_consume_token(RPAREN);
+ 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;
- processParseException(e);
+ 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");
}
/**
* A Normal statement.
*/
- static final public Statement Statement() throws ParseException {
+ final public Statement Statement() throws ParseException {
final Statement statement;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IF:
@@ -2793,8 +3037,8 @@ final ArrayList list = new ArrayList();
case WHILE:
case FOREACH:
case AT:
- case DOLLAR:
case BANG:
+ case TILDE:
case PLUS_PLUS:
case MINUS_MINUS:
case PLUS:
@@ -2803,11 +3047,12 @@ final ArrayList list = new ArrayList();
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
case LBRACE:
case SEMICOLON:
- case DOLLAR_ID:
statement = StatementNoBreak();
{if (true) return statement;}
break;
@@ -2816,7 +3061,7 @@ final ArrayList list = new ArrayList();
{if (true) return statement;}
break;
default:
- jj_la1[76] = jj_gen;
+ jj_la1[78] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2826,20 +3071,22 @@ final ArrayList list = new ArrayList();
/**
* An html block inside a php syntax.
*/
- static final public HTMLBlock htmlBlock() throws ParseException {
+ final public HTMLBlock htmlBlock() throws ParseException {
final int startIndex = nodePtr;
final AstNode[] blockNodes;
final int nbNodes;
- jj_consume_token(PHPEND);
- label_21:
+ final Token phpEnd;
+ phpEnd = jj_consume_token(PHPEND);
+ htmlStart = phpEnd.sourceEnd;
+ label_22:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPECHOSTART:
;
break;
default:
- jj_la1[77] = jj_gen;
- break label_21;
+ jj_la1[79] = jj_gen;
+ break label_22;
}
phpEchoBlock();
}
@@ -2852,20 +3099,24 @@ final ArrayList list = new ArrayList();
jj_consume_token(PHPSTARTSHORT);
break;
default:
- jj_la1[78] = jj_gen;
+ jj_la1[80] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
+ createNewHTMLCode();
} catch (ParseException e) {
errorMessage = "unexpected end of file , '= 100) return;
if (pos == jj_endpos + 1) {
jj_lasttokens[jj_endpos++] = kind;
@@ -6986,17 +7462,17 @@ final int startBlock, endBlock;
}
}
- static public ParseException generateParseException() {
+ public ParseException generateParseException() {
jj_expentries.removeAllElements();
- boolean[] la1tokens = new boolean[143];
- for (int i = 0; i < 143; i++) {
+ boolean[] la1tokens = new boolean[160];
+ for (int i = 0; i < 160; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 127; i++) {
+ for (int i = 0; i < 128; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1< jj_gen) {
if (p.next == null) { p = p.next = new JJCalls(); break; }