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
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 {
| <PHPECHOSTART : "<?="> {PHPParser.createNewHTMLCode();} : PHPPARSING
}
-<PHPPARSING> TOKEN :
+<PHPPARSING, IN_SINGLE_LINE_COMMENT> TOKEN :
{
<PHPEND :"?>"> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT
}
<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 :
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,token.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;
<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;
}
]
{
+ 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;
final VariableDeclaration[] list;
final ArrayList arrayList = new ArrayList();
final int pos = SimpleCharStream.getPosition();
+ final Token token;
+ Token token2 = null;
}
{
- <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
+ token = <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
{arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name()));}
+ 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;
{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);}
}
}
{
varName = <DOLLAR_ID>
- {final int pos = SimpleCharStream.getPosition()-varName.image.length();}
[
<ASSIGN>
try {
new Variable(varName.image.substring(1),
varName.sourceStart,
varName.sourceEnd),
- pos,
- SimpleCharStream.getPosition());
+ varName.sourceStart,
+ varName.sourceEnd);
}
return new VariableDeclaration(currentSegment,
new Variable(varName.image.substring(1),
varName.sourceEnd),
initializer,
VariableDeclaration.EQUAL,
- pos);
+ varName.sourceStart);
}
}
{
final AbstractVariable variable;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
}
{
variable = VariableDeclaratorId()
if (initializer == null) {
return new VariableDeclaration(currentSegment,
variable,
- pos,
- SimpleCharStream.getPosition());
+ variable.sourceStart,
+ variable.sourceEnd);
}
return new VariableDeclaration(currentSegment,
variable,
initializer,
VariableDeclaration.EQUAL,
- pos);
+ variable.sourceStart);
}
}
/**
* Return a variablename without the $.
* @return a variable name
- */
+ *//*
Variable Variable():
{
final StringBuffer buff;
final int pos;
}
{
- token = <DOLLAR_ID> {pos = SimpleCharStream.getPosition()-token.image.length();}
+ token = <DOLLAR_ID>
[<LBRACE> expression = Expression() <RBRACE>]
{
if (expression == null) {
- return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd);
+ return new Variable(token.image.substring(1),
+ token.sourceStart,
+ token.sourceEnd);
}
String s = expression.toStringExpression();
buff = new StringBuffer(token.image.length()+s.length()+2);
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,token.sourceEnd);
+ }
+ final StringBuffer buff = new StringBuffer();
+ buff.append(token.image.substring(1));
+ buff.append(variable.toStringExpression());
+ return new Variable(buff.toString(),token.sourceStart,variable.sourceEnd);
+ }
+|
+ 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,token.sourceEnd);
+ }
+ 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
*/
-Variable VariableName():
+ConstantIdentifier VariableName():
{
final StringBuffer buff;
String expr;
int pos;
}
{
- token = <LBRACE>
- {pos = SimpleCharStream.getPosition()-1;}
- expression = Expression() token2 = <RBRACE>
+ token = <LBRACE> expression = Expression() token2 = <RBRACE>
{expr = expression.toStringExpression();
buff = new StringBuffer(expr.length()+2);
buff.append("{");
buff.append("}");
pos = SimpleCharStream.getPosition();
expr = buff.toString();
- return new Variable(expr,
- token.sourceStart,
- token2.sourceEnd);
+ return new ConstantIdentifier(expr,
+ token.sourceStart,
+ token2.sourceEnd);
}
|
token = <IDENTIFIER>
- {pos = SimpleCharStream.getPosition() - token.image.length();}
[<LBRACE> expression = Expression() token2 = <RBRACE>]
{
if (expression == null) {
- return new Variable(token.image,
- token.sourceStart,
- token.sourceEnd);
+ return new ConstantIdentifier(token.image,
+ token.sourceStart,
+ token.sourceEnd);
}
expr = expression.toStringExpression();
buff = new StringBuffer(token.image.length()+expr.length()+2);
buff.append(expr);
buff.append("}");
expr = buff.toString();
- return new Variable(expr,
- token.sourceStart,
- token2.sourceEnd);
+ return new ConstantIdentifier(expr,
+ token.sourceStart,
+ token2.sourceEnd);
}
-|
+/*|
<DOLLAR>
var = VariableName()
{
return new Variable(token.image,
token.sourceStart,
token.sourceEnd);
- }
+ } */
}
Expression VariableInitializer() :
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;
errorEnd = SimpleCharStream.getPosition() + 1;
processParseExceptionDebug(e);
}
- formalParameters = FormalParameters()
- {MethodDeclaration method = new MethodDeclaration(currentSegment,
- identifierChar,
- formalParameters,
- reference != null,
- pos,
- SimpleCharStream.getPosition());
- return method;}
+ 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 follows method identifier.
* (FormalParameter())
*/
-Hashtable FormalParameters() :
+int FormalParameters(final Hashtable parameters) :
{
VariableDeclaration var;
- final Hashtable parameters = new Hashtable();
+ final Token token;
+ int end;
}
{
try {
)*
]
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;
processParseExceptionDebug(e);
+ end = e.currentToken.sourceStart;
}
- {return parameters;}
+ {return end;}
}
/**
{
final Expression expr;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
int assignOperator = -1;
}
{
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 UnaryExpression() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
}
{
/* <BIT_AND> expr = UnaryExpressionNoPrefix() //why did I had that ?
Expression AtNotUnaryExpression() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
}
{
- <AT>
+ token = <AT>
expr = AtNotUnaryExpression()
- {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
+ {return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
|
- <BANG>
+ token = <BANG>
expr = AtNotUnaryExpression()
- {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+ {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
|
expr = UnaryExpressionNoPrefix()
{return expr;}
Expression UnaryExpressionNoPrefix() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ final Token token;
}
{
- <PLUS> expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.PLUS,pos);}
+ token = <PLUS> expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,
+ OperatorIds.PLUS,
+ token.sourceStart);}
|
- <MINUS> expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.MINUS,pos);}
+ 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;}
+ token = <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
|
- <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+ token = <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
)
expr = PrimaryExpression()
- {return new PrefixedUnaryExpression(expr,operator,pos);}
+ {return new PrefixedUnaryExpression(expr,operator,token.sourceStart);}
}
Expression UnaryExpressionNotPlusMinus() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
}
{
LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
Expression PrimaryExpression() :
{
Expression expr = null;
- Expression expr2;
+ Token token = null;
+}
+{
+ [token = <BIT_AND>] expr = refPrimaryExpression(token)
+ {return expr;}
+|
+ expr = ArrayDeclarator()
+ {return expr;}
+}
+
+Expression refPrimaryExpression(final Token reference) :
+{
+ Expression expr = null;
+ Expression expr2 = null;
int assignOperator = -1;
final Token identifier;
final String var;
- final int pos;
}
{
- token = <IDENTIFIER>
+ identifier = <IDENTIFIER>
{
- expr = new ConstantIdentifier(token);
+ expr = new ConstantIdentifier(identifier);
}
(
<STATICCLASSACCESS> expr2 = ClassIdentifier()
expr2,
ClassAccess.STATIC);}
)*
- [ expr = Arguments(expr) ]
- {return expr;}
+ [ 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()
+ expr = VariableDeclaratorId() //todo use the reference parameter ...
[ expr = Arguments(expr) ]
{return expr;}
|
token = <NEW>
expr = ClassIdentifier()
- {expr = new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- token.sourceStart);
+ {
+ int start;
+ if (reference == null) {
+ start = token.sourceStart;
+ } else {
+ start = reference.sourceStart;
+ }
+ expr = new ClassInstantiation(expr,
+ reference != null,
+ start);
}
[ expr = Arguments(expr) ]
{return expr;}
-|
- expr = ArrayDeclarator()
- {return expr;}
}
/**
ArrayInitializer ArrayDeclarator() :
{
final ArrayVariableDeclaration[] vars;
- final int pos = SimpleCharStream.getPosition();
-}
-{
- <ARRAY> vars = ArrayInitializer()
- {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
-}
-
-PrefixedUnaryExpression classInstantiation() :
-{
- Expression expr;
- final StringBuffer buff;
- final int pos;
final Token token;
}
{
- token = <NEW> expr = ClassIdentifier()
- [
- {pos = expr.sourceStart;
- buff = new StringBuffer(expr.toStringExpression());}
- expr = PrimaryExpression()
- {buff.append(expr.toStringExpression());
- expr = new ConstantIdentifier(buff.toString(),
- expr.sourceStart,
- expr.sourceEnd);}
- ]
- {return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- token.sourceStart);}
+ token = <ARRAY> vars = ArrayInitializer()
+ {return new ArrayInitializer(vars,token.sourceStart,SimpleCharStream.getPosition());}
}
Expression ClassIdentifier():
{
<CLASSACCESS>
try {
- expr = VariableName()
+ expression = VariableName()
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected";
errorLevel = ERROR;
throw e;
}
{return new ClassAccess(prefix,
- expr,
+ expression,
ClassAccess.NORMAL);}
|
<LBRACKET> [ expression = Expression() | expression = Type() ] //Not good
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);}
}
/**
| [token=<AT>] statement = IncludeStatement()
{if (token != null) {
((InclusionStatement)statement).silent = true;
+ statement.sourceStart = token.sourceStart;
}
return statement;}
| statement = StaticStatement() {return statement;}
Statement expressionStatement() :
{
final Statement statement;
+ final Token token;
}
{
statement = Expression()
try {
- <SEMICOLON>
+ 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";
{
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() :
{
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();
Variable expr;
final ArrayList vars = new ArrayList();
final GlobalStatement global;
+ final Token token, token2;
}
{
- <GLOBAL>
+ token = <GLOBAL>
expr = Variable()
{vars.add(expr);}
(<COMMA>
{vars.add(expr);}
)*
try {
- <SEMICOLON>
+ token2 = <SEMICOLON>
{
final Variable[] variables = new Variable[vars.size()];
vars.toArray(variables);
global = new GlobalStatement(currentSegment,
variables,
- pos,
- SimpleCharStream.getPosition());
+ 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(expr);}
+ token = <STATIC> expr = VariableDeclarator() {vars.add(expr);}
(
<COMMA> expr = VariableDeclarator() {vars.add(expr);}
)*
try {
- <SEMICOLON>
+ token2 = <SEMICOLON>
{
final VariableDeclaration[] variables = new VariableDeclaration[vars.size()];
vars.toArray(variables);
return new StaticStatement(variables,
- pos,
- SimpleCharStream.getPosition());}
+ 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);
{
final Variable varName;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
}
{
varName = Variable() [ <ASSIGN> initializer = Expression() ]
if (initializer == null) {
return new VariableDeclaration(currentSegment,
varName,
- pos,
- SimpleCharStream.getPosition());
+ varName.sourceStart,
+ varName.sourceEnd);
}
return new VariableDeclaration(currentSegment,
varName,
initializer,
VariableDeclaration.EQUAL,
- pos);
+ 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);}
}
/**
|
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());}
+ OperatorIds.MINUS_MINUS,
+ SimpleCharStream.getPosition());}
]
{return expr;}
}
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.sourceStart+2)
{return ifStatement;}
}
{
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);}
}
ForStatement ForStatement() :
{
-final Token token;
+final Token token,token2;
final int pos = SimpleCharStream.getPosition();
Expression[] initializations = null;
Expression condition = null;
[ 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();}
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;
expr = StatementExpression() {list.add(expr);}
(<COMMA> StatementExpression() {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;
git://secure.phpeclipse.com / phpeclipse.git / blobdiff