+
options {
LOOKAHEAD = 1;
CHOICE_AMBIGUITY_CHECK = 2;
BUILD_TOKEN_MANAGER = true;
SANITY_CHECK = true;
FORCE_LA_CHECK = false;
+ COMMON_TOKEN_ACTION = true;
}
PARSER_BEGIN(PHPParser)
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 net.sourceforge.phpdt.internal.corext.Assert;
/**
* A new php parser.
* given with JavaCC. You can get JavaCC at http://www.webgain.com
* You can test the parser with the PHPParserTestCase2.java
* @author Matthieu Casanova
- * @version $Reference: 1.0$
*/
public final class PHPParser extends PHPParserSuperclass {
- /** The file that is parsed. */
- private static IFile fileToParse;
+//todo : fix the variables names bug
+//todo : handle tilde operator
+
/** The current segment. */
private static OutlineableWithChildren currentSegment;
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
/** The cursor in expression stack. */
private static int nodePtr;
+ private static final boolean PARSER_DEBUG = true;
+
public final void setFileToParse(final IFile fileToParse) {
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
}
public PHPParser() {
public PHPParser(final IFile fileToParse) {
this(new StringReader(""));
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
+ }
+
+ public static 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);
+ }
+ ReInit(new StringReader(strEval));
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
+ phpTest();
+ }
+
+ public static 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);
+ }
+ ReInit(stream);
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ phpFile();
+ }
+
+ public static 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);
+ }
+ ReInit(stream);
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ phpFile();
}
/**
return outlineInfo;
}
+ 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
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;
- if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e);
+ // if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e);
}
/**
- * Create marker for the parse error
+ * Create marker for the parse error.
* @param e the ParseException
*/
private static void setMarker(final ParseException e) {
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);
} else {
final int indx,
final int brIndx) throws CoreException {
String current;
- StringBuffer lineNumberBuffer = new StringBuffer(10);
+ final StringBuffer lineNumberBuffer = new StringBuffer(10);
char ch;
current = output.substring(indx, brIndx);
if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) {
- int onLine = current.indexOf("on line <b>");
+ final int onLine = current.indexOf("on line <b>");
if (onLine != -1) {
lineNumberBuffer.delete(0, lineNumberBuffer.length());
for (int i = onLine; i < current.length(); i++) {
}
}
- int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
+ final int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
- Hashtable attributes = new Hashtable();
+ final Hashtable attributes = new Hashtable();
current = current.replaceAll("\n", "");
current = current.replaceAll("<b>", "");
}
}
- public final void parse(final String s) throws CoreException {
+ public final void parse(final String s) {
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
* 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 > SimpleCharStream.currentBuffer.length()) {
return;
}
final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray();
pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
}
- /**
- * Create a new task.
- */
+ /** Create a new task. */
public static final void createNewTask() {
- final int currentPosition = SimpleCharStream.getPosition();
- final String todo = SimpleCharStream.currentBuffer.substring(currentPosition+1,
+ final int currentPosition = token.sourceStart;
+ final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3,
SimpleCharStream.currentBuffer.indexOf("\n",
currentPosition)-1);
- try {
- setMarker(fileToParse,
- "todo : " + todo,
- SimpleCharStream.getBeginLine(),
- TASK,
- "Line "+SimpleCharStream.getBeginLine());
- } catch (CoreException e) {
- PHPeclipsePlugin.log(e);
+ if (!PARSER_DEBUG) {
+ try {
+ setMarker(fileToParse,
+ todo,
+ SimpleCharStream.getBeginLine(),
+ TASK,
+ "Line "+SimpleCharStream.getBeginLine());
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
}
}
PARSER_END(PHPParser)
+TOKEN_MGR_DECLS:
+{
+ // CommonTokenAction: use the begins/ends fields added to the Jack
+ // CharStream class to set corresponding fields in each Token (which was
+ // also extended with new fields). By default Jack doesn't supply absolute
+ // offsets, just line/column offsets
+ static void CommonTokenAction(Token t) {
+ t.sourceStart = input_stream.beginOffset;
+ t.sourceEnd = input_stream.endOffset;
+ } // CommonTokenAction
+} // TOKEN_MGR_DECLS
+
<DEFAULT> TOKEN :
{
<PHPSTARTSHORT : "<?"> {PHPParser.createNewHTMLCode();} : PHPPARSING
| <PHPECHOSTART : "<?="> {PHPParser.createNewHTMLCode();} : PHPPARSING
}
-<PHPPARSING> TOKEN :
+<PHPPARSING, IN_SINGLE_LINE_COMMENT> TOKEN :
{
- <PHPEND :"?>"> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT
+ <PHPEND :"?>"> {PHPParser.htmlStart = PHPParser.token.sourceEnd;} : DEFAULT
}
/* Skip any character if we are not in php mode */
<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
{
<SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : PHPPARSING
-| "?>" : DEFAULT
+| < ~[] >
}
<IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT> SPECIAL_TOKEN :
<DOLLAR_ID: <DOLLAR> <IDENTIFIER>>
}
+void phpTest() :
+{}
+{
+ Php()
+ <EOF>
+}
+
void phpFile() :
{}
{
*/
void PhpBlock() :
{
- final int start = SimpleCharStream.getPosition();
final PHPEchoBlock phpEchoBlock;
+ final Token token;
}
{
phpEchoBlock = phpEchoBlock()
{pushOnAstNodes(phpEchoBlock);}
|
[ <PHPSTARTLONG>
- | <PHPSTARTSHORT>
+ | token = <PHPSTARTSHORT>
{try {
setMarker(fileToParse,
"You should use '<?php' instead of '<?' it will avoid some problems with XML",
- start,
- SimpleCharStream.getPosition(),
+ token.sourceStart,
+ token.sourceEnd,
INFO,
"Line " + token.beginLine);
} catch (CoreException e) {
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- processParseException(e);
+ processParseExceptionDebug(e);
}
}
PHPEchoBlock phpEchoBlock() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
final PHPEchoBlock echoBlock;
+ final Token token, token2;
}
{
- <PHPECHOSTART> expr = Expression() [ <SEMICOLON> ] <PHPEND>
+ token = <PHPECHOSTART> expr = Expression() [ <SEMICOLON> ] token2 = <PHPEND>
{
- echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
+ echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd);
pushOnAstNodes(echoBlock);
return echoBlock;}
}
ClassDeclaration ClassDeclaration() :
{
final ClassDeclaration classDeclaration;
- final Token className,superclassName;
- final int pos;
- char[] classNameImage = SYNTAX_ERROR_CHAR;
- char[] superclassNameImage = null;
+ Token className = null;
+ final Token superclassName, token;
+ String classNameImage = SYNTAX_ERROR_CHAR;
+ String superclassNameImage = null;
}
{
- <CLASS>
- {pos = SimpleCharStream.getPosition();}
+ token = <CLASS>
try {
className = <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);
+ processParseExceptionDebug(e);
}
[
<EXTENDS>
try {
superclassName = <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);
+ processParseExceptionDebug(e);
superclassNameImage = SYNTAX_ERROR_CHAR;
}
]
{
+ 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;
try {
<LBRACE>
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ processParseExceptionDebug(e);
}
( ClassBodyDeclaration(classDeclaration) )*
try {
<RBRACE>
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', 'var', 'function' or '}' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ processParseExceptionDebug(e);
}
}
final FieldDeclaration field;
}
{
- method = MethodDeclaration() {classDeclaration.addMethod(method);}
+ method = MethodDeclaration() {method.analyzeCode();
+ classDeclaration.addMethod(method);}
| field = FieldDeclaration() {classDeclaration.addField(field);}
}
/**
* A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ * it is only used by ClassBodyDeclaration()
*/
FieldDeclaration FieldDeclaration() :
{
VariableDeclaration variableDeclaration;
final VariableDeclaration[] list;
final ArrayList arrayList = new ArrayList();
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
+ Token token2 = null;
}
{
- <VAR> variableDeclaration = VariableDeclarator()
+ token = <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
{arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name));}
- ( <COMMA> variableDeclaration = VariableDeclarator()
+ outlineInfo.addVariable(variableDeclaration.name());}
+ (
+ <COMMA> variableDeclaration = VariableDeclaratorNoSuffix()
{arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name));}
+ outlineInfo.addVariable(variableDeclaration.name());}
)*
try {
- <SEMICOLON>
+ token2 = <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);
+ 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;
+ }
return new FieldDeclaration(list,
- pos,
- SimpleCharStream.getPosition(),
+ token.sourceStart,
+ end,
currentSegment);}
}
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ * It will be used by fields and formal parameters
+ */
+VariableDeclaration VariableDeclaratorNoSuffix() :
+{
+ final Token varName;
+ Expression initializer = null;
+ Token assignToken;
+}
+{
+ varName = <DOLLAR_ID>
+ [
+ assignToken = <ASSIGN>
+ try {
+ initializer = VariableInitializer()
+ } catch (ParseException e) {
+ errorMessage = "Literal expression expected in variable initializer";
+ errorLevel = ERROR;
+ errorStart = assignToken.sourceEnd +1;
+ errorEnd = assignToken.sourceEnd +1;
+ processParseExceptionDebug(e);
+ }
+ ]
+ {
+ if (initializer == null) {
+ return new VariableDeclaration(currentSegment,
+ new Variable(varName.image.substring(1),
+ varName.sourceStart+1,
+ varName.sourceEnd+1),
+ varName.sourceStart+1,
+ varName.sourceEnd+1);
+ }
+ return new VariableDeclaration(currentSegment,
+ new Variable(varName.image.substring(1),
+ varName.sourceStart+1,
+ varName.sourceEnd+1),
+ initializer,
+ VariableDeclaration.EQUAL,
+ varName.sourceStart+1);
+ }
+}
+
+/**
+ * this will be used by static statement
+ */
VariableDeclaration VariableDeclarator() :
{
- final String varName;
+ final AbstractVariable variable;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
}
{
- varName = VariableDeclaratorId()
+ variable = VariableDeclaratorId()
[
<ASSIGN>
try {
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ processParseExceptionDebug(e);
}
]
{
if (initializer == null) {
return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- pos,
- SimpleCharStream.getPosition());
+ variable,
+ variable.sourceStart,
+ variable.sourceEnd);
}
return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- initializer,
- pos);
+ variable,
+ initializer,
+ VariableDeclaration.EQUAL,
+ variable.sourceStart);
}
}
* A Variable name.
* @return the variable name (with suffix)
*/
-String VariableDeclaratorId() :
+AbstractVariable VariableDeclaratorId() :
{
- final String expr;
- Expression expression = null;
- final int pos = SimpleCharStream.getPosition();
- ConstantIdentifier ex;
+ final Variable var;
+ AbstractVariable expression = null;
}
{
try {
- expr = Variable()
- ( LOOKAHEAD(2)
- {ex = new ConstantIdentifier(expr.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
- expression = VariableSuffix(ex)
+ var = Variable()
+ (
+ LOOKAHEAD(2)
+ expression = VariableSuffix(var)
)*
{
if (expression == null) {
- return expr;
+ return var;
}
- return expression.toStringExpression();
+ return expression;
}
} catch (ParseException e) {
errorMessage = "'$' expected for variable identifier";
/**
* Return a variablename without the $.
* @return a variable name
- */
-String Variable():
+ *//*
+Variable Variable():
{
final StringBuffer buff;
Expression expression = null;
final Token token;
- final String expr;
+ Variable expr;
+ final int pos;
}
{
- token = <DOLLAR_ID> [<LBRACE> expression = Expression() <RBRACE>]
+ token = <DOLLAR_ID>
+ [<LBRACE> expression = Expression() <RBRACE>]
{
if (expression == null) {
- return token.image.substring(1);
+ return new Variable(token.image.substring(1),
+ token.sourceStart+1,
+ token.sourceEnd+1);
}
- buff = new StringBuffer(token.image);
+ String s = expression.toStringExpression();
+ buff = new StringBuffer(token.image.length()+s.length()+2);
+ buff.append(token.image);
buff.append("{");
- buff.append(expression.toStringExpression());
+ buff.append(s);
buff.append("}");
- return buff.toString();
+ s = buff.toString();
+ return new Variable(s,token.sourceStart+1,token.sourceEnd+1);
}
|
- <DOLLAR> expr = VariableName()
- {return expr;}
+ token = <DOLLAR>
+ expr = VariableName()
+ {return new Variable(expr,token.sourceStart,expr.sourceEnd);}
+} */
+
+Variable Variable() :
+{
+ Variable variable = null;
+ final Token token;
+}
+{
+ token = <DOLLAR_ID> [variable = Var(token)]
+ {
+ if (variable == null) {
+ return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);
+ }
+ final StringBuffer buff = new StringBuffer();
+ buff.append(token.image.substring(1));
+ buff.append(variable.toStringExpression());
+ return new Variable(buff.toString(),token.sourceStart+1,variable.sourceEnd+1);
+ }
+|
+ token = <DOLLAR> variable = Var(token)
+ {
+ return new Variable(variable,token.sourceStart,variable.sourceEnd);
+ }
+}
+
+Variable Var(final Token dollar) :
+{
+ Variable variable = null;
+ final Token token;
+ ConstantIdentifier constant;
+}
+{
+ token = <DOLLAR_ID> [variable = Var(token)]
+ {if (variable == null) {
+ return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);
+ }
+ final StringBuffer buff = new StringBuffer();
+ buff.append(token.image.substring(1));
+ buff.append(variable.toStringExpression());
+ return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd);
+ }
+|
+ LOOKAHEAD(<DOLLAR> <DOLLAR>)
+ token = <DOLLAR> variable = Var(token)
+ {return new Variable(variable,dollar.sourceStart,variable.sourceEnd);}
+|
+ constant = VariableName()
+ {return new Variable(constant.name,dollar.sourceStart,constant.sourceEnd);}
}
/**
* A Variable name (without the $)
* @return a variable name String
*/
-String VariableName():
+ConstantIdentifier VariableName():
{
final StringBuffer buff;
- final String expr;
+ String expr;
Expression expression = null;
final Token token;
+ Token token2 = null;
}
{
- <LBRACE> expression = Expression() <RBRACE>
- {buff = new StringBuffer("{");
- buff.append(expression.toStringExpression());
+ token = <LBRACE> expression = Expression() token2 = <RBRACE>
+ {expr = expression.toStringExpression();
+ buff = new StringBuffer(expr.length()+2);
+ buff.append("{");
+ buff.append(expr);
buff.append("}");
- return buff.toString();}
+ expr = buff.toString();
+ return new ConstantIdentifier(expr,
+ token.sourceStart,
+ token2.sourceEnd);
+
+ }
|
- token = <IDENTIFIER> [<LBRACE> expression = Expression() <RBRACE>]
+ token = <IDENTIFIER>
+ [<LBRACE> expression = Expression() token2 = <RBRACE>]
{
if (expression == null) {
- return token.image;
+ return new ConstantIdentifier(token.image,
+ token.sourceStart,
+ token.sourceEnd);
}
- buff = new StringBuffer(token.image);
+ expr = expression.toStringExpression();
+ buff = new StringBuffer(token.image.length()+expr.length()+2);
+ buff.append(token.image);
buff.append("{");
- buff.append(expression.toStringExpression());
+ buff.append(expr);
buff.append("}");
- return buff.toString();
- }
-|
- <DOLLAR> expr = VariableName()
+ expr = buff.toString();
+ return new ConstantIdentifier(expr,
+ token.sourceStart,
+ token2.sourceEnd);
+ }
+/*|
+ <DOLLAR>
+ var = VariableName()
{
- buff = new StringBuffer("$");
- buff.append(expr);
- return buff.toString();
+ return new Variable(var,
+ var.sourceStart-1,
+ var.sourceEnd);
}
|
- token = <DOLLAR_ID> {return token.image;}
+ token = <DOLLAR_ID>
+ {
+ return new Variable(token.image,
+ token.sourceStart+1,
+ token.sourceEnd+1);
+ } */
}
Expression VariableInitializer() :
{
final Expression expr;
- final Token token;
- final int pos = SimpleCharStream.getPosition();
+ final Token token, token2;
}
{
expr = Literal()
{return expr;}
|
- <MINUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
- {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ token2 = <MINUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+ {return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.MINUS,
- pos);}
+ token2.sourceStart);}
|
- <PLUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
- {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ token2 = <PLUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+ {return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.PLUS,
- pos);}
+ token2.sourceStart);}
|
expr = ArrayDeclarator()
{return expr;}
|
token = <IDENTIFIER>
- {return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
+ {return new ConstantIdentifier(token);}
}
ArrayVariableDeclaration ArrayVariable() :
}
{
expr = Expression()
- [<ARRAYASSIGN> expr2 = Expression()
- {return new ArrayVariableDeclaration(expr,expr2);}
+ [
+ <ARRAYASSIGN> expr2 = Expression()
+ {return new ArrayVariableDeclaration(expr,expr2);}
]
{return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
}
final ArrayList list = new ArrayList();
}
{
- <LPAREN> [ expr = ArrayVariable()
- {list.add(expr);}
- ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
- {list.add(expr);}
- )*
- ]
- [<COMMA> {list.add(null);}]
+ <LPAREN>
+ [
+ expr = ArrayVariable()
+ {list.add(expr);}
+ ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
+ {list.add(expr);}
+ )*
+ ]
+ [
+ <COMMA> {list.add(null);}
+ ]
<RPAREN>
{
final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
final MethodDeclaration functionDeclaration;
final Block block;
final OutlineableWithChildren seg = currentSegment;
+ final Token token;
}
{
- <FUNCTION>
+ token = <FUNCTION>
try {
- functionDeclaration = MethodDeclarator()
+ functionDeclaration = MethodDeclarator(token.sourceStart)
{outlineInfo.addVariable(new String(functionDeclaration.name));}
} catch (ParseException e) {
if (errorMessage != null) throw e;
* [&] IDENTIFIER(parameters ...).
* @return a function description for the outline
*/
-MethodDeclaration MethodDeclarator() :
+MethodDeclaration MethodDeclarator(final int start) :
{
- final Token identifier;
+ Token identifier = null;
Token reference = null;
- final Hashtable formalParameters;
- final int pos = SimpleCharStream.getPosition();
- char[] identifierChar = SYNTAX_ERROR_CHAR;
+ final Hashtable formalParameters = new Hashtable();
+ String identifierChar = SYNTAX_ERROR_CHAR;
+ final int end;
}
{
[reference = <BIT_AND>]
try {
identifier = <IDENTIFIER>
- {identifierChar = identifier.image.toCharArray();}
+ {identifierChar = identifier.image;}
} 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);
+ 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;
+ }
+ return new MethodDeclaration(currentSegment,
+ identifierChar,
+ formalParameters,
+ reference != null,
+ nameStart,
+ nameEnd,
+ start,
+ end);
}
- formalParameters = FormalParameters()
- {return new MethodDeclaration(currentSegment,
- identifierChar,
- formalParameters,
- reference != null,
- pos,
- SimpleCharStream.getPosition());}
}
/**
* FormalParameters follows method identifier.
* (FormalParameter())
*/
-Hashtable FormalParameters() :
+int FormalParameters(final Hashtable parameters) :
{
VariableDeclaration var;
- final Hashtable parameters = new Hashtable();
+ final Token token;
+ int end;
}
{
try {
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- processParseException(e);
+ processParseExceptionDebug(e);
}
- [ var = FormalParameter()
- {parameters.put(new String(var.name),var);}
- (
- <COMMA> var = FormalParameter()
- {parameters.put(new String(var.name),var);}
- )*
- ]
+ [
+ var = FormalParameter()
+ {parameters.put(new String(var.name()),var);}
+ (
+ <COMMA> var = FormalParameter()
+ {parameters.put(new String(var.name()),var);}
+ )*
+ ]
try {
- <RPAREN>
+ 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);
+ processParseExceptionDebug(e);
+ end = e.currentToken.sourceStart;
}
- {return parameters;}
+ {return end;}
}
/**
Token token = null;
}
{
- [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
+ [token = <BIT_AND>] variableDeclaration = VariableDeclaratorNoSuffix()
{
if (token != null) {
variableDeclaration.setReference(true);
}
ConstantIdentifier Type() :
-{final int pos;}
-{
- <STRING> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.STRING,pos,pos-6);}
-| <BOOL> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.BOOL,pos,pos-4);}
-| <BOOLEAN> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);}
-| <REAL> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.REAL,pos,pos-4);}
-| <DOUBLE> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);}
-| <FLOAT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.FLOAT,pos,pos-5);}
-| <INT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.INT,pos,pos-3);}
-| <INTEGER> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.INTEGER,pos,pos-7);}
-| <OBJECT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.OBJECT,pos,pos-6);}
+{final Token token;}
+{
+ token = <STRING> {return new ConstantIdentifier(token);}
+| token = <BOOL> {return new ConstantIdentifier(token);}
+| token = <BOOLEAN> {return new ConstantIdentifier(token);}
+| token = <REAL> {return new ConstantIdentifier(token);}
+| token = <DOUBLE> {return new ConstantIdentifier(token);}
+| token = <FLOAT> {return new ConstantIdentifier(token);}
+| token = <INT> {return new ConstantIdentifier(token);}
+| token = <INTEGER> {return new ConstantIdentifier(token);}
+| token = <OBJECT> {return new ConstantIdentifier(token);}
}
Expression Expression() :
final Expression expr;
Expression initializer = null;
int assignOperator = -1;
- final int pos = SimpleCharStream.getPosition();
}
{
LOOKAHEAD(1)
expr = ConditionalExpression()
- [ assignOperator = AssignmentOperator()
+ [
+ assignOperator = AssignmentOperator()
try {
- {final int errorStart = SimpleCharStream.getPosition();}
- initializer = Expression()
+ initializer = Expression()
} catch (ParseException e) {
if (errorMessage != null) {
throw e;
}
]
{
- if (assignOperator == -1) return expr;
- return new VarAssignation(expr,
- initializer,
- assignOperator,
- pos,
- SimpleCharStream.getPosition());
- return expr;}
+ if (assignOperator != -1) {// todo : change this, very very bad :(
+ if (expr instanceof AbstractVariable) {
+ return new VariableDeclaration(currentSegment,
+ (AbstractVariable) expr,
+ initializer,
+ expr.sourceStart,
+ initializer.sourceEnd);
+ }
+ String varName = expr.toStringExpression().substring(1);
+ return new VariableDeclaration(currentSegment,
+ new Variable(varName,
+ expr.sourceStart,
+ expr.sourceEnd),
+ expr.sourceStart,
+ initializer.sourceEnd);
+ }
+ return expr;
+ }
| expr = ExpressionWBang() {return expr;}
}
Expression ExpressionWBang() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
}
{
- <BANG> expr = ExpressionWBang() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+ token = <BANG> expr = ExpressionWBang()
+ {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
| expr = ExpressionNoBang() {return expr;}
}
Expression ExpressionNoBang() :
{
- final Expression expr;
+ Expression expr;
}
{
- expr = PrintExpression() {return expr;}
-| expr = ListExpression() {return expr;}
+ expr = ListExpression() {return expr;}
+|
+ expr = PrintExpression() {return expr;}
}
/**
int AssignmentOperator() :
{}
{
- <ASSIGN> {return VarAssignation.EQUAL;}
-| <STARASSIGN> {return VarAssignation.STAR_EQUAL;}
-| <SLASHASSIGN> {return VarAssignation.SLASH_EQUAL;}
-| <REMASSIGN> {return VarAssignation.REM_EQUAL;}
-| <PLUSASSIGN> {return VarAssignation.PLUS_EQUAL;}
-| <MINUSASSIGN> {return VarAssignation.MINUS_EQUAL;}
-| <LSHIFTASSIGN> {return VarAssignation.LSHIFT_EQUAL;}
-| <RSIGNEDSHIFTASSIGN> {return VarAssignation.RSIGNEDSHIFT_EQUAL;}
-| <ANDASSIGN> {return VarAssignation.AND_EQUAL;}
-| <XORASSIGN> {return VarAssignation.XOR_EQUAL;}
-| <ORASSIGN> {return VarAssignation.OR_EQUAL;}
-| <DOTASSIGN> {return VarAssignation.DOT_EQUAL;}
-| <TILDEEQUAL> {return VarAssignation.TILDE_EQUAL;}
+ <ASSIGN> {return VariableDeclaration.EQUAL;}
+| <STARASSIGN> {return VariableDeclaration.STAR_EQUAL;}
+| <SLASHASSIGN> {return VariableDeclaration.SLASH_EQUAL;}
+| <REMASSIGN> {return VariableDeclaration.REM_EQUAL;}
+| <PLUSASSIGN> {return VariableDeclaration.PLUS_EQUAL;}
+| <MINUSASSIGN> {return VariableDeclaration.MINUS_EQUAL;}
+| <LSHIFTASSIGN> {return VariableDeclaration.LSHIFT_EQUAL;}
+| <RSIGNEDSHIFTASSIGN> {return VariableDeclaration.RSIGNEDSHIFT_EQUAL;}
+| <ANDASSIGN> {return VariableDeclaration.AND_EQUAL;}
+| <XORASSIGN> {return VariableDeclaration.XOR_EQUAL;}
+| <ORASSIGN> {return VariableDeclaration.OR_EQUAL;}
+| <DOTASSIGN> {return VariableDeclaration.DOT_EQUAL;}
+| <TILDEEQUAL> {return VariableDeclaration.TILDE_EQUAL;}
}
Expression ConditionalExpression() :
(
<OR_OR> {operator = OperatorIds.OR_OR;}
| <_ORL> {operator = OperatorIds.ORL;}
- ) expr2 = ConditionalAndExpression()
+ )
+ expr2 = ConditionalAndExpression()
{
expr = new BinaryExpression(expr,expr2,operator);
}
{
expr = EqualityExpression()
(
+ LOOKAHEAD(1)
<BIT_AND> expr2 = EqualityExpression()
{expr = new BinaryExpression(expr,expr2,OperatorIds.AND);}
)*
{
expr = MultiplicativeExpression()
(
- ( <PLUS> {operator = OperatorIds.PLUS;}
- | <MINUS> {operator = OperatorIds.MINUS;} )
+ LOOKAHEAD(1)
+ ( <PLUS> {operator = OperatorIds.PLUS;}
+ | <MINUS> {operator = OperatorIds.MINUS;}
+ )
expr2 = MultiplicativeExpression()
{expr = new BinaryExpression(expr,expr2,operator);}
)*
Expression UnaryExpression() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
}
{
- <BIT_AND> expr = UnaryExpressionNoPrefix()
+ /* <BIT_AND> expr = UnaryExpressionNoPrefix() //why did I had that ?
{return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
-|
- expr = AtUnaryExpression() {return expr;}
+| */
+ expr = AtNotUnaryExpression() {return expr;}
}
-Expression AtUnaryExpression() :
+/**
+ * An expression prefixed (or not) by one or more @ and !.
+ * @return the expression
+ */
+Expression AtNotUnaryExpression() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
}
{
- <AT>
- expr = AtUnaryExpression()
- {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
+ token = <AT>
+ expr = AtNotUnaryExpression()
+ {return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
+|
+ token = <BANG>
+ expr = AtNotUnaryExpression()
+ {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
|
expr = UnaryExpressionNoPrefix()
{return expr;}
}
-
Expression UnaryExpressionNoPrefix() :
{
final Expression expr;
- final int operator;
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
}
{
- ( <PLUS> {operator = OperatorIds.PLUS;}
- | <MINUS> {operator = OperatorIds.MINUS;})
- expr = UnaryExpression()
- {return new PrefixedUnaryExpression(expr,operator,pos);}
+ token = <PLUS> expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,
+ OperatorIds.PLUS,
+ token.sourceStart);}
+|
+ token = <MINUS> expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,
+ OperatorIds.MINUS,
+ token.sourceStart);}
|
expr = PreIncDecExpression()
{return expr;}
{
final Expression expr;
final int operator;
- final int pos = SimpleCharStream.getPosition();
+final Token token;
}
{
- ( <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
- | <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;})
- expr = PrimaryExpression()
- {return new PrefixedUnaryExpression(expr,operator,pos);}
+ (
+ token = <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
+ |
+ token = <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+ )
+ expr = PrimaryExpression()
+ {return new PrefixedUnaryExpression(expr,operator,token.sourceStart);}
}
Expression UnaryExpressionNotPlusMinus() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
}
{
LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
expr = CastExpression() {return expr;}
-| <BANG> expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
| expr = PostfixExpression() {return expr;}
| expr = Literal() {return expr;}
| <LPAREN> expr = Expression()
{
final ConstantIdentifier type;
final Expression expr;
-final int pos = SimpleCharStream.getPosition();
+final Token token,token1;
}
{
- <LPAREN>
- (type = Type()
- | <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());})
+ token1 = <LPAREN>
+ (
+ type = Type()
+ |
+ token = <ARRAY> {type = new ConstantIdentifier(token);}
+ )
<RPAREN> expr = UnaryExpression()
- {return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
+ {return new CastExpression(type,expr,token1.sourceStart,expr.sourceEnd);}
}
Expression PostfixExpression() :
{
final Expression expr;
int operator = -1;
- final int pos = SimpleCharStream.getPosition();
+ Token token = null;
}
{
expr = PrimaryExpression()
- [ <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
- | <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}]
+ [
+ token = <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
+ |
+ token = <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+ ]
{
if (operator == -1) {
return expr;
}
- return new PostfixedUnaryExpression(expr,operator,pos);
+ return new PostfixedUnaryExpression(expr,operator,token.sourceEnd);
}
}
Expression PrimaryExpression() :
{
- final Token identifier;
Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ Token token = null;
}
{
- expr = PrimaryPrefix()
- (
- LOOKAHEAD(PrimarySuffix())
- expr = PrimarySuffix(expr))*
+ [token = <BIT_AND>] expr = refPrimaryExpression(token)
{return expr;}
|
expr = ArrayDeclarator()
{return expr;}
}
-Expression PrimaryPrefix() :
-{
- final Expression expr;
- final Token token;
- final String var;
- final int pos = SimpleCharStream.getPosition();
-}
-{
- token = <IDENTIFIER> {return new ConstantIdentifier(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
-| <NEW> expr = ClassIdentifier() {return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);}
-| var = VariableDeclaratorId() {return new VariableDeclaration(currentSegment,
- var.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
-}
-
-AbstractSuffixExpression PrimarySuffix(final Expression prefix) :
+Expression refPrimaryExpression(final Token reference) :
{
- final AbstractSuffixExpression suffix;
- final Expression expr;
+ Expression expr;
+ Expression expr2 = null;
+ final Token identifier;
}
{
- suffix = Arguments(prefix) {return suffix;}
-| suffix = VariableSuffix(prefix) {return suffix;}
-| <STATICCLASSACCESS> expr = ClassIdentifier()
- {suffix = new ClassAccess(prefix,
- expr,
- ClassAccess.STATIC);
- return suffix;}
+ identifier = <IDENTIFIER>
+ {
+ expr = new ConstantIdentifier(identifier);
+ }
+ (
+ <STATICCLASSACCESS> expr2 = ClassIdentifier()
+ {expr = new ClassAccess(expr,
+ expr2,
+ ClassAccess.STATIC);}
+ )*
+ [ expr2 = Arguments(expr) ]
+ {
+ 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);
+ }
+ return expr;
+ }
+ return expr2;
+ }
+|
+ expr = VariableDeclaratorId() //todo use the reference parameter ...
+ [ expr = Arguments(expr) ]
+ {return expr;}
+|
+ token = <NEW>
+ expr = ClassIdentifier()
+ {
+ int start;
+ if (reference == null) {
+ start = token.sourceStart;
+ } else {
+ start = reference.sourceStart;
+ }
+ expr = new ClassInstantiation(expr,
+ reference != null,
+ start);
+ }
+ [ expr = Arguments(expr) ]
+ {return expr;}
}
/**
ArrayInitializer ArrayDeclarator() :
{
final ArrayVariableDeclaration[] vars;
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
}
{
- <ARRAY> vars = ArrayInitializer()
- {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
+ token = <ARRAY> vars = ArrayInitializer()
+ {return new ArrayInitializer(vars,token.sourceStart,SimpleCharStream.getPosition());}
}
-PrefixedUnaryExpression classInstantiation() :
+Expression ClassIdentifier():
{
- Expression expr;
- final StringBuffer buff;
- final int pos = SimpleCharStream.getPosition();
-}
-{
- <NEW> expr = ClassIdentifier()
- [
- {buff = new StringBuffer(expr.toStringExpression());}
- expr = PrimaryExpression()
- {buff.append(expr.toStringExpression());
- expr = new ConstantIdentifier(buff.toString().toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
- ]
- {return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);}
-}
-
-ConstantIdentifier ClassIdentifier():
-{
- final String expr;
+ final Expression expr;
final Token token;
- final int pos = SimpleCharStream.getPosition();
- final ConstantIdentifier type;
}
{
- token = <IDENTIFIER> {return new ConstantIdentifier(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
-| type = Type() {return type;}
-| expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ token = <IDENTIFIER> {return new ConstantIdentifier(token);}
+| expr = Type() {return expr;}
+| expr = VariableDeclaratorId() {return expr;}
}
-AbstractSuffixExpression VariableSuffix(final Expression prefix) :
+/**
+ * Used by Variabledeclaratorid and primarysuffix
+ */
+AbstractVariable VariableSuffix(final AbstractVariable prefix) :
{
- String expr = null;
- final int pos = SimpleCharStream.getPosition();
Expression expression = null;
+ final Token classAccessToken;
}
{
- <CLASSACCESS>
+ classAccessToken = <CLASSACCESS>
try {
- expr = VariableName()
+ ( expression = VariableName() | expression = Variable() )
} 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;
- throw e;
+ errorStart = classAccessToken.sourceEnd +1;
+ errorEnd = classAccessToken.sourceEnd +1;
+ processParseExceptionDebug(e);
}
{return new ClassAccess(prefix,
- new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+ expression,
ClassAccess.NORMAL);}
|
<LBRACKET> [ expression = Expression() | expression = Type() ] //Not good
Literal Literal() :
{
final Token token;
- final int pos;
}
{
- token = <INTEGER_LITERAL> {pos = SimpleCharStream.getPosition();
- return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
-| token = <FLOATING_POINT_LITERAL> {pos = SimpleCharStream.getPosition();
- return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
-| token = <STRING_LITERAL> {pos = SimpleCharStream.getPosition();
- return new StringLiteral(token.image.toCharArray(),pos-token.image.length());}
-| <TRUE> {pos = SimpleCharStream.getPosition();
- return new TrueLiteral(pos-4,pos);}
-| <FALSE> {pos = SimpleCharStream.getPosition();
- return new FalseLiteral(pos-4,pos);}
-| <NULL> {pos = SimpleCharStream.getPosition();
- return new NullLiteral(pos-4,pos);}
+ token = <INTEGER_LITERAL> {return new NumberLiteral(token);}
+| token = <FLOATING_POINT_LITERAL> {return new NumberLiteral(token);}
+| token = <STRING_LITERAL> {return new StringLiteral(token);}
+| token = <TRUE> {return new TrueLiteral(token);}
+| token = <FALSE> {return new FalseLiteral(token);}
+| token = <NULL> {return new NullLiteral(token);}
}
FunctionCall Arguments(final Expression func) :
{
Expression[] args = null;
+final Token token;
}
{
<LPAREN> [ args = ArgumentList() ]
try {
- <RPAREN>
+ token = <RPAREN>
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
errorLevel = ERROR;
errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- {return new FunctionCall(func,args,SimpleCharStream.getPosition());}
+ {return new FunctionCall(func,args,token.sourceEnd);}
}
/**
/**
* A Statement without break.
+ * @return a statement
*/
Statement StatementNoBreak() :
{
}
{
LOOKAHEAD(2)
- statement = Expression()
- try {
- <SEMICOLON>
- } catch (ParseException e) {
- if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
- }
- }
- {return statement;}
-| LOOKAHEAD(2)
- statement = LabeledStatement() {return statement;}
-| statement = Block() {return statement;}
-| statement = EmptyStatement() {return statement;}
-| statement = StatementExpression()
- try {
- <SEMICOLON>
- } catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
- }
- {return statement;}
+ statement = expressionStatement() {return statement;}
+| LOOKAHEAD(1)
+ statement = LabeledStatement() {return statement;}
+| statement = Block() {return statement;}
+| statement = EmptyStatement() {return statement;}
| statement = SwitchStatement() {return statement;}
| statement = IfStatement() {return statement;}
| statement = WhileStatement() {return statement;}
| [token=<AT>] statement = IncludeStatement()
{if (token != null) {
((InclusionStatement)statement).silent = true;
+ statement.sourceStart = token.sourceStart;
}
return statement;}
| statement = StaticStatement() {return statement;}
| statement = defineStatement() {currentSegment.add((Outlineable)statement);return statement;}
}
+/**
+ * A statement expression.
+ * expression ;
+ * @return an expression
+ */
+Statement expressionStatement() :
+{
+ final Statement statement;
+ final Token token;
+}
+{
+ statement = Expression()
+ try {
+ 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;
+ throw e;
+ }
+ }
+ {return statement;}
+}
+
Define defineStatement() :
{
final int start = SimpleCharStream.getPosition();
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- processParseException(e);
+ processParseExceptionDebug(e);
}
try {
defineName = Expression()
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- processParseException(e);
+ processParseExceptionDebug(e);
}
try {
defineValue = Expression()
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- processParseException(e);
+ processParseExceptionDebug(e);
}
{return new Define(currentSegment,
defineName,
{
final Expression expr;
final int keyword;
- final int pos = SimpleCharStream.getPosition();
final InclusionStatement inclusionStatement;
+ final Token token, token2;
}
{
- ( <REQUIRE> {keyword = InclusionStatement.REQUIRE;}
- | <REQUIRE_ONCE> {keyword = InclusionStatement.REQUIRE_ONCE;}
- | <INCLUDE> {keyword = InclusionStatement.INCLUDE;}
- | <INCLUDE_ONCE> {keyword = InclusionStatement.INCLUDE_ONCE;})
+ ( token = <REQUIRE> {keyword = InclusionStatement.REQUIRE;}
+ | token = <REQUIRE_ONCE> {keyword = InclusionStatement.REQUIRE_ONCE;}
+ | token = <INCLUDE> {keyword = InclusionStatement.INCLUDE;}
+ | token = <INCLUDE_ONCE> {keyword = InclusionStatement.INCLUDE_ONCE;})
try {
expr = Expression()
} catch (ParseException e) {
{inclusionStatement = new InclusionStatement(currentSegment,
keyword,
expr,
- pos);
+ token.sourceStart);
currentSegment.add(inclusionStatement);
}
try {
- <SEMICOLON>
+ token2 = <SEMICOLON>
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
errorLevel = ERROR;
errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- {return inclusionStatement;}
+ {inclusionStatement.sourceEnd = token2.sourceEnd;
+ return inclusionStatement;}
}
PrintExpression PrintExpression() :
ListExpression ListExpression() :
{
- String expr = null;
+ Expression expr = null;
final Expression expression;
final ArrayList list = new ArrayList();
final int pos = SimpleCharStream.getPosition();
+ final Token listToken;
}
{
- <LIST>
+ listToken = <LIST>
try {
<LPAREN>
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ errorStart = listToken.sourceEnd+1;
+ errorEnd = listToken.sourceEnd+1;
+ processParseExceptionDebug(e);
}
[
expr = VariableDeclaratorId()
}
[ <ASSIGN> expression = Expression()
{
- final String[] strings = new String[list.size()];
- list.toArray(strings);
- return new ListExpression(strings,
+ final AbstractVariable[] vars = new AbstractVariable[list.size()];
+ list.toArray(vars);
+ return new ListExpression(vars,
expression,
pos,
SimpleCharStream.getPosition());}
]
{
- final String[] strings = new String[list.size()];
- list.toArray(strings);
- return new ListExpression(strings,pos,SimpleCharStream.getPosition());}
+ final Variable[] vars = new Variable[list.size()];
+ list.toArray(vars);
+ return new ListExpression(vars,pos,SimpleCharStream.getPosition());}
}
/**
{
final ArrayList expressions = new ArrayList();
Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ Token token;
+ Token token2 = null;
}
{
- <ECHO> expr = Expression()
+ token = <ECHO> expr = Expression()
{expressions.add(expr);}
(
<COMMA> expr = Expression()
{expressions.add(expr);}
)*
try {
- <SEMICOLON>
+ token2 = <SEMICOLON>
} catch (ParseException e) {
if (e.currentToken.next.kind != 4) {
errorMessage = "';' expected after 'echo' statement";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ errorStart = e.currentToken.sourceEnd;
+ errorEnd = e.currentToken.sourceEnd;
+ processParseExceptionDebug(e);
}
}
- {final Expression[] exprs = new Expression[expressions.size()];
+ {
+ final Expression[] exprs = new Expression[expressions.size()];
expressions.toArray(exprs);
- return new EchoStatement(exprs,pos);}
+ if (token2 == null) {
+ return new EchoStatement(exprs,token.sourceStart, exprs[exprs.length-1].sourceEnd);
+ }
+ return new EchoStatement(exprs,token.sourceStart, token2.sourceEnd);
+ }
}
GlobalStatement GlobalStatement() :
{
- final int pos = SimpleCharStream.getPosition();
- String expr;
+ Variable expr;
final ArrayList vars = new ArrayList();
final GlobalStatement global;
+ final Token token, token2;
}
{
- <GLOBAL>
- expr = VariableDeclaratorId()
+ token = <GLOBAL>
+ expr = Variable()
{vars.add(expr);}
(<COMMA>
- expr = VariableDeclaratorId()
+ expr = Variable()
{vars.add(expr);}
)*
try {
- <SEMICOLON>
+ token2 = <SEMICOLON>
{
- final String[] strings = new String[vars.size()];
- vars.toArray(strings);
+ final Variable[] variables = new Variable[vars.size()];
+ vars.toArray(variables);
global = new GlobalStatement(currentSegment,
- strings,
- pos,
- SimpleCharStream.getPosition());
+ variables,
+ token.sourceStart,
+ token2.sourceEnd);
currentSegment.add(global);
return global;}
} catch (ParseException e) {
StaticStatement StaticStatement() :
{
- final int pos = SimpleCharStream.getPosition();
final ArrayList vars = new ArrayList();
VariableDeclaration expr;
+ final Token token, token2;
}
{
- <STATIC> expr = VariableDeclarator() {vars.add(new String(expr.name));}
- (<COMMA> expr = VariableDeclarator() {vars.add(new String(expr.name));})*
+ token = <STATIC> expr = VariableDeclarator() {vars.add(expr);}
+ (
+ <COMMA> expr = VariableDeclarator() {vars.add(expr);}
+ )*
try {
- <SEMICOLON>
+ token2 = <SEMICOLON>
{
- final String[] strings = new String[vars.size()];
- vars.toArray(strings);
- return new StaticStatement(strings,
- pos,
- SimpleCharStream.getPosition());}
+ final VariableDeclaration[] variables = new VariableDeclaration[vars.size()];
+ vars.toArray(variables);
+ return new StaticStatement(variables,
+ token.sourceStart,
+ token2.sourceEnd);}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
errorLevel = ERROR;
LabeledStatement LabeledStatement() :
{
- final int pos = SimpleCharStream.getPosition();
final Token label;
final Statement statement;
}
{
label = <IDENTIFIER> <COLON> statement = Statement()
- {return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());}
+ {return new LabeledStatement(label.image,statement,label.sourceStart,statement.sourceEnd);}
}
/**
*/
Block Block() :
{
- final int pos = SimpleCharStream.getPosition();
final ArrayList list = new ArrayList();
Statement statement;
+ final Token token, token2;
}
{
try {
- <LBRACE>
+ token = <LBRACE>
} catch (ParseException e) {
errorMessage = "'{' expected";
errorLevel = ERROR;
( statement = BlockStatement() {list.add(statement);}
| statement = htmlBlock() {list.add(statement);})*
try {
- <RBRACE>
+ token2 = <RBRACE>
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected";
errorLevel = ERROR;
{
final Statement[] statements = new Statement[list.size()];
list.toArray(statements);
- return new Block(statements,pos,SimpleCharStream.getPosition());}
+ return new Block(statements,token.sourceStart,token2.sourceEnd);}
}
Statement BlockStatement() :
final Statement statement;
}
{
- statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
- return statement;}
+ try {
+ statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+ return statement;}
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.image +"', a statement was expected";
+ errorLevel = ERROR;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
+ throw e;
+ }
| statement = ClassDeclaration() {return statement;}
| statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
currentSegment.add((MethodDeclaration) statement);
+ ((MethodDeclaration) statement).analyzeCode();
return statement;}
}
statement = StatementNoBreak() {return statement;}
| statement = ClassDeclaration() {return statement;}
| statement = MethodDeclaration() {currentSegment.add((MethodDeclaration) statement);
+ ((MethodDeclaration) statement).analyzeCode();
return statement;}
}
-VariableDeclaration[] LocalVariableDeclaration() :
+/**
+ * used only by ForInit()
+ */
+Expression[] LocalVariableDeclaration() :
{
final ArrayList list = new ArrayList();
- VariableDeclaration var;
+ Expression var;
}
{
- var = LocalVariableDeclarator()
+ var = Expression()
{list.add(var);}
- ( <COMMA> var = LocalVariableDeclarator() {list.add(var);})*
+ ( <COMMA> var = Expression() {list.add(var);})*
{
- final VariableDeclaration[] vars = new VariableDeclaration[list.size()];
+ final Expression[] vars = new Expression[list.size()];
list.toArray(vars);
- return vars;}
+ return vars;
+ }
}
+/**
+ * used only by LocalVariableDeclaration().
+ */
VariableDeclaration LocalVariableDeclarator() :
{
- final String varName;
+ final Variable varName;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
}
{
- varName = VariableDeclaratorId() [ <ASSIGN> initializer = Expression() ]
+ varName = Variable() [ <ASSIGN> initializer = Expression() ]
{
if (initializer == null) {
return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- pos,
- SimpleCharStream.getPosition());
+ varName,
+ varName.sourceStart,
+ varName.sourceEnd);
}
return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- initializer,
- pos);
+ varName,
+ initializer,
+ VariableDeclaration.EQUAL,
+ varName.sourceStart);
}
}
EmptyStatement EmptyStatement() :
{
- final int pos;
+ final Token token;
}
{
- <SEMICOLON>
- {pos = SimpleCharStream.getPosition();
- return new EmptyStatement(pos-1,pos);}
+ token = <SEMICOLON>
+ {return new EmptyStatement(token.sourceStart,token.sourceEnd);}
}
+/**
+ * used only by StatementExpressionList() which is used only by ForInit() and ForStatement()
+ */
Expression StatementExpression() :
{
- final Expression expr,expr2;
- final int operator;
+ final Expression expr;
}
{
expr = PreIncDecExpression() {return expr;}
|
expr = PrimaryExpression()
[ <PLUS_PLUS> {return new PostfixedUnaryExpression(expr,
- OperatorIds.PLUS_PLUS,
- SimpleCharStream.getPosition());}
+ OperatorIds.PLUS_PLUS,
+ SimpleCharStream.getPosition());}
| <MINUS_MINUS> {return new PostfixedUnaryExpression(expr,
- OperatorIds.MINUS_MINUS,
- SimpleCharStream.getPosition());}
- | operator = AssignmentOperator() expr2 = Expression()
- {return new BinaryExpression(expr,expr2,operator);}
+ OperatorIds.MINUS_MINUS,
+ SimpleCharStream.getPosition());}
]
{return expr;}
}
final Expression variable;
final AbstractCase[] cases;
final int pos = SimpleCharStream.getPosition();
+ final Token switchToken;
}
{
- <SWITCH>
+ switchToken = <SWITCH>
try {
<LPAREN>
} catch (ParseException e) {
errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- (cases = switchStatementBrace() | cases = switchStatementColon(pos, pos + 6))
- {return new SwitchStatement(variable,cases,pos,SimpleCharStream.getPosition());}
+ (cases = switchStatementBrace() | cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd))
+ {return new SwitchStatement(variable,cases,switchToken.sourceStart,SimpleCharStream.getPosition());}
}
AbstractCase[] switchStatementBrace() :
if (errorMessage != null) throw e;
errorMessage = "expression expected after 'case' keyword";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = token.sourceEnd +1;
+ errorEnd = token.sourceEnd +1;
throw e;
}
try {
- <COLON>
+ token = <COLON>
{return expr;}
} catch (ParseException e) {
errorMessage = "':' expected after case expression";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ errorStart = expr.sourceEnd+1;
+ errorEnd = expr.sourceEnd+1;
+ processParseExceptionDebug(e);
}
|
token = <_DEFAULT>
} catch (ParseException e) {
errorMessage = "':' expected after 'default' keyword";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ errorStart = token.sourceEnd+1;
+ errorEnd = token.sourceEnd+1;
+ processParseExceptionDebug(e);
}
}
Break BreakStatement() :
{
Expression expression = null;
- final int start = SimpleCharStream.getPosition();
+ final Token token, token2;
}
{
- <BREAK> [ expression = Expression() ]
+ token = <BREAK> [ expression = Expression() ]
try {
- <SEMICOLON>
+ token2 = <SEMICOLON>
} catch (ParseException e) {
errorMessage = "';' expected after 'break' keyword";
errorLevel = ERROR;
errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- {return new Break(expression, start, SimpleCharStream.getPosition());}
+ {return new Break(expression, token.sourceStart, token2.sourceEnd);}
}
IfStatement IfStatement() :
{
- final int pos = SimpleCharStream.getPosition();
final Expression condition;
final IfStatement ifStatement;
+ Token token;
}
{
- <IF> condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2)
+ token = <IF> condition = Condition("if")
+ ifStatement = IfStatement0(condition,token.sourceStart,token.sourceEnd)
{return ifStatement;}
}
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length();
errorEnd = errorStart +1;
- processParseException(e);
+ processParseExceptionDebug(e);
}
condition = Expression()
try {
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- processParseException(e);
+ processParseExceptionDebug(e);
}
{return condition;}
}
{
final Statement action;
final Expression condition;
- final int pos = SimpleCharStream.getPosition();
+ final Token token, token2;
}
{
- <DO> action = Statement() <WHILE> condition = Condition("while")
+ token = <DO> action = Statement() <WHILE> condition = Condition("while")
try {
- <SEMICOLON>
- {return new DoStatement(condition,action,pos,SimpleCharStream.getPosition());}
+ token2 = <SEMICOLON>
+ {return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd);}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
errorLevel = ERROR;
{
Statement statement;
Expression expression;
- final int pos = SimpleCharStream.getPosition();
ArrayVariableDeclaration variable;
+ Token token;
}
{
- <FOREACH>
+ token = <FOREACH>
try {
<LPAREN>
} catch (ParseException e) {
{return new ForeachStatement(expression,
variable,
statement,
- pos,
- SimpleCharStream.getPosition());}
+ token.sourceStart,
+ statement.sourceEnd);}
}
+/**
+ * a for declaration.
+ * @return a node representing the for statement
+ */
ForStatement ForStatement() :
{
-final Token token;
+final Token token,token2;
final int pos = SimpleCharStream.getPosition();
Expression[] initializations = null;
Expression condition = null;
Expression[] increments = null;
Statement action;
final ArrayList list = new ArrayList();
-final int startBlock, endBlock;
}
{
token = <FOR>
} catch (ParseException e) {
errorMessage = "'(' expected after 'for' keyword";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ errorStart = token.sourceEnd;
+ errorEnd = token.sourceEnd +1;
+ processParseExceptionDebug(e);
}
[ initializations = ForInit() ] <SEMICOLON>
[ condition = Expression() ] <SEMICOLON>
[ increments = StatementExpressionList() ] <RPAREN>
(
action = Statement()
- {return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());}
+ {return new ForStatement(initializations,
+ condition,
+ increments,
+ action,
+ token.sourceStart,
+ action.sourceEnd);}
|
<COLON>
- {startBlock = SimpleCharStream.getPosition();}
(action = Statement() {list.add(action);})*
{
try {
setMarker(fileToParse,
"Ugly syntax detected, you should for () {...} instead of for (): ... endfor;",
- pos,
- pos+token.image.length(),
+ token.sourceStart,
+ token.sourceEnd,
INFO,
"Line " + token.beginLine);
} catch (CoreException e) {
PHPeclipsePlugin.log(e);
}
}
- {endBlock = SimpleCharStream.getPosition();}
try {
<ENDFOR>
} catch (ParseException e) {
throw e;
}
try {
- <SEMICOLON>
+ token2 = <SEMICOLON>
{
final Statement[] stmtsArray = new Statement[list.size()];
list.toArray(stmtsArray);
- return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());}
+ return new ForStatement(initializations,
+ condition,
+ increments,
+ new Block(stmtsArray,
+ stmtsArray[0].sourceStart,
+ stmtsArray[stmtsArray.length-1].sourceEnd),
+ token.sourceStart,
+ token2.sourceEnd);}
} catch (ParseException e) {
errorMessage = "';' expected after 'endfor' keyword";
errorLevel = ERROR;
final Expression expr;
}
{
- expr = StatementExpression() {list.add(expr);}
- (<COMMA> StatementExpression() {list.add(expr);})*
+ expr = Expression() {list.add(expr);}
+ (<COMMA> Expression() {list.add(expr);})*
{
- final Expression[] exprsArray = new Expression[list.size()];
- list.toArray(exprsArray);
- return exprsArray;}
+ final Expression[] exprsArray = new Expression[list.size()];
+ list.toArray(exprsArray);
+ return exprsArray;
+ }
}
Continue ContinueStatement() :
{
Expression expr = null;
- final int pos = SimpleCharStream.getPosition();
+ final Token token,token2;
}
{
- <CONTINUE> [ expr = Expression() ]
+ token = <CONTINUE> [ expr = Expression() ]
try {
- <SEMICOLON>
- {return new Continue(expr,pos,SimpleCharStream.getPosition());}
+ token2 = <SEMICOLON>
+ {return new Continue(expr,token.sourceStart,token2.sourceEnd);}
} catch (ParseException e) {
errorMessage = "';' expected after 'continue' statement";
errorLevel = ERROR;
ReturnStatement ReturnStatement() :
{
Expression expr = null;
- final int pos = SimpleCharStream.getPosition();
+ final Token token,token2;
}
{
- <RETURN> [ expr = Expression() ]
+ token = <RETURN> [ expr = Expression() ]
try {
- <SEMICOLON>
- {return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());}
+ token2 = <SEMICOLON>
+ {return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd);}
} catch (ParseException e) {
errorMessage = "';' expected after 'return' statement";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
- }
-}
\ No newline at end of file
+ }
+}
+
git://secure.phpeclipse.com / phpeclipse.git / blobdiff