X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 84d3954..d45ca07 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -1,3 +1,4 @@
+
 options {
   LOOKAHEAD = 1;
   CHOICE_AMBIGUITY_CHECK = 2;
@@ -52,6 +53,10 @@ import net.sourceforge.phpdt.internal.corext.Assert;
  */
 public final class PHPParser extends PHPParserSuperclass {
 
+//todo : fix the variables names bug
+//todo : handle tilde operator
+
+
   /** The current segment. */
   private static OutlineableWithChildren currentSegment;
 
@@ -68,7 +73,7 @@ public final class PHPParser extends PHPParserSuperclass {
   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
@@ -82,7 +87,7 @@ public final class PHPParser extends PHPParserSuperclass {
   /** The cursor in expression stack. */
   private static int nodePtr;
 
-  private static final boolean PARSER_DEBUG = false;
+  private static final boolean PARSER_DEBUG = true;
 
   public final void setFileToParse(final IFile fileToParse) {
     PHPParser.fileToParse = fileToParse;
@@ -217,8 +222,8 @@ public final class PHPParser extends PHPParserSuperclass {
       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 {
@@ -317,8 +322,9 @@ public final class PHPParser extends PHPParserSuperclass {
    * 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();
@@ -327,19 +333,20 @@ public final class PHPParser extends PHPParserSuperclass {
 
   /** Create a new task. */
   public static final void createNewTask() {
-    final int currentPosition = SimpleCharStream.getPosition();
+    final int currentPosition = token.sourceStart;
     final String  todo = SimpleCharStream.currentBuffer.substring(currentPosition-3,
                                                                   SimpleCharStream.currentBuffer.indexOf("\n",
                                                                                                          currentPosition)-1);
-    PHPeclipsePlugin.log(1,SimpleCharStream.currentBuffer.toString());
-    try {
-      setMarker(fileToParse,
-                todo,
-                SimpleCharStream.getBeginLine(),
-                TASK,
-                "Line "+SimpleCharStream.getBeginLine());
-    } catch (CoreException e) {
-      PHPeclipsePlugin.log(e);
+    if (!PARSER_DEBUG) {
+      try {
+        setMarker(fileToParse,
+                  todo,
+                  SimpleCharStream.getBeginLine(),
+                  TASK,
+                  "Line "+SimpleCharStream.getBeginLine());
+      } catch (CoreException e) {
+        PHPeclipsePlugin.log(e);
+      }
     }
   }
 
@@ -369,9 +376,9 @@ TOKEN_MGR_DECLS:
 | <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 */
@@ -403,7 +410,7 @@ TOKEN_MGR_DECLS:
 <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 :
@@ -666,20 +673,20 @@ 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) {
@@ -701,13 +708,13 @@ void PhpBlock() :
 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;}
 }
@@ -721,17 +728,16 @@ void Php() :
 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;
@@ -743,7 +749,7 @@ ClassDeclaration ClassDeclaration() :
     <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;
@@ -754,17 +760,26 @@ ClassDeclaration ClassDeclaration() :
     }
   ]
   {
+    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;
@@ -823,19 +838,20 @@ 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 = 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;
@@ -846,9 +862,15 @@ FieldDeclaration FieldDeclaration() :
 
   {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);}
 }
 
@@ -860,19 +882,19 @@ VariableDeclaration VariableDeclaratorNoSuffix() :
 {
   final Token varName;
   Expression initializer = null;
+  Token assignToken;
 }
 {
   varName = <DOLLAR_ID>
-  {final int pos = SimpleCharStream.getPosition()-varName.image.length();}
   [
-    <ASSIGN>
+    assignToken = <ASSIGN>
     try {
       initializer = VariableInitializer()
     } catch (ParseException e) {
       errorMessage = "Literal expression expected in variable initializer";
       errorLevel   = ERROR;
-      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = SimpleCharStream.getPosition() + 1;
+      errorStart = assignToken.sourceEnd +1;
+      errorEnd   = assignToken.sourceEnd +1;
       processParseExceptionDebug(e);
     }
   ]
@@ -880,18 +902,18 @@ VariableDeclaration VariableDeclaratorNoSuffix() :
   if (initializer == null) {
     return new VariableDeclaration(currentSegment,
                                    new Variable(varName.image.substring(1),
-                                                varName.sourceStart,
-                                                varName.sourceEnd),
-                                   pos,
-                                   SimpleCharStream.getPosition());
+                                                varName.sourceStart+1,
+                                                varName.sourceEnd+1),
+                                   varName.sourceStart+1,
+                                   varName.sourceEnd+1);
   }
   return new VariableDeclaration(currentSegment,
                                  new Variable(varName.image.substring(1),
-                                              varName.sourceStart,
-                                              varName.sourceEnd),
+                                              varName.sourceStart+1,
+                                              varName.sourceEnd+1),
                                  initializer,
                                  VariableDeclaration.EQUAL,
-                                 pos);
+                                 varName.sourceStart+1);
   }
 }
 
@@ -902,7 +924,6 @@ VariableDeclaration VariableDeclarator() :
 {
   final AbstractVariable variable;
   Expression initializer = null;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
   variable = VariableDeclaratorId()
@@ -922,14 +943,14 @@ VariableDeclaration VariableDeclarator() :
   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);
   }
 }
 
@@ -941,7 +962,6 @@ AbstractVariable VariableDeclaratorId() :
 {
   final Variable var;
   AbstractVariable expression = null;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
   try {
@@ -968,7 +988,7 @@ AbstractVariable VariableDeclaratorId() :
 /**
  * Return a variablename without the $.
  * @return a variable name
- */
+ *//*
 Variable Variable():
 {
   final StringBuffer buff;
@@ -978,11 +998,13 @@ Variable Variable():
   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+1,
+                          token.sourceEnd+1);
     }
     String s = expression.toStringExpression();
     buff = new StringBuffer(token.image.length()+s.length()+2);
@@ -991,53 +1013,95 @@ Variable Variable():
     buff.append(s);
     buff.append("}");
     s = buff.toString();
-    return new Variable(s,token.sourceStart,token.sourceEnd);
+    return new Variable(s,token.sourceStart+1,token.sourceEnd+1);
   }
 |
   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
  */
-Variable VariableName():
+ConstantIdentifier VariableName():
 {
   final StringBuffer buff;
   String expr;
-  final Variable var;
   Expression expression = null;
   final Token token;
   Token token2 = null;
-  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(expr);
    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);
@@ -1046,11 +1110,11 @@ Variable VariableName():
     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()
   {
@@ -1062,9 +1126,9 @@ Variable VariableName():
   token = <DOLLAR_ID>
   {
   return new Variable(token.image,
-                      token.sourceStart,
-                      token.sourceEnd);
-  }
+                      token.sourceStart+1,
+                      token.sourceEnd+1);
+  } */
 }
 
 Expression VariableInitializer() :
@@ -1139,11 +1203,12 @@ MethodDeclaration MethodDeclaration() :
   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;
@@ -1165,19 +1230,19 @@ MethodDeclaration MethodDeclaration() :
  * [&] 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;
@@ -1185,24 +1250,41 @@ MethodDeclaration MethodDeclarator() :
     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 {
@@ -1223,15 +1305,17 @@ Hashtable FormalParameters() :
     )*
   ]
   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;}
 }
 
 /**
@@ -1270,7 +1354,6 @@ Expression Expression() :
 {
   final Expression expr;
   Expression initializer = null;
-  final int pos = SimpleCharStream.getPosition();
   int assignOperator = -1;
 }
 {
@@ -1315,10 +1398,11 @@ Expression Expression() :
 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;}
 }
 
@@ -1575,7 +1659,6 @@ Expression MultiplicativeExpression() :
 Expression UnaryExpression() :
 {
   final Expression expr;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
  /* <BIT_AND> expr = UnaryExpressionNoPrefix()             //why did I had that ?
@@ -1591,31 +1674,34 @@ Expression UnaryExpression() :
 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;}
@@ -1629,22 +1715,21 @@ Expression PreIncDecExpression() :
 {
 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> )
@@ -1704,17 +1789,27 @@ Expression PostfixExpression() :
 
 Expression PrimaryExpression() :
 {
-  Expression expr = null;
-  Expression expr2;
-  int assignOperator = -1;
+  Expression expr;
+  Token token = null;
+}
+{
+  [token = <BIT_AND>] expr = refPrimaryExpression(token)
+  {return expr;}
+|
+  expr = ArrayDeclarator()
+  {return expr;}
+}
+
+Expression refPrimaryExpression(final Token reference) :
+{
+  Expression expr;
+  Expression expr2 = null;
   final Token identifier;
-  final String var;
-  final int pos;
 }
 {
-  token = <IDENTIFIER>
+  identifier = <IDENTIFIER>
   {
-    expr = new ConstantIdentifier(token);
+    expr = new ConstantIdentifier(identifier);
   }
   (
     <STATICCLASSACCESS> expr2 = ClassIdentifier()
@@ -1722,24 +1817,41 @@ Expression PrimaryExpression() :
                             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;}
 }
 
 /**
@@ -1750,41 +1862,17 @@ Expression PrimaryExpression() :
 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():
 {
   final Expression expr;
   final Token token;
-  final ConstantIdentifier type;
 }
 {
   token = <IDENTIFIER>          {return new ConstantIdentifier(token);}
@@ -1797,23 +1885,22 @@ Expression ClassIdentifier():
  */
 AbstractVariable VariableSuffix(final AbstractVariable prefix) :
 {
-  Variable 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,
-                          expr,
+                          expression,
                           ClassAccess.NORMAL);}
 |
   <LBRACKET> [ expression = Expression() | expression = Type() ]  //Not good
@@ -1845,11 +1932,12 @@ Literal Literal() :
 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;
@@ -1857,7 +1945,7 @@ Expression[] args = null;
     errorEnd   = SimpleCharStream.getPosition() + 1;
     throw e;
   }
-  {return new FunctionCall(func,args,SimpleCharStream.getPosition());}
+  {return new FunctionCall(func,args,token.sourceEnd);}
 }
 
 /**
@@ -1919,6 +2007,7 @@ Statement StatementNoBreak() :
 | [token=<AT>] statement = IncludeStatement()
   {if (token != null) {
     ((InclusionStatement)statement).silent = true;
+    statement.sourceStart = token.sourceStart;
   }
   return statement;}
 | statement = StaticStatement()         {return statement;}
@@ -1934,11 +2023,13 @@ Statement StatementNoBreak() :
 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";
@@ -2057,14 +2148,14 @@ InclusionStatement IncludeStatement() :
 {
   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) {
@@ -2080,11 +2171,11 @@ InclusionStatement IncludeStatement() :
   {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;
@@ -2092,7 +2183,8 @@ InclusionStatement IncludeStatement() :
     errorEnd     = SimpleCharStream.getPosition() + 1;
     throw e;
   }
-  {return inclusionStatement;}
+  {inclusionStatement.sourceEnd = token2.sourceEnd;
+  return inclusionStatement;}
 }
 
 PrintExpression PrintExpression() :
@@ -2110,17 +2202,18 @@ ListExpression ListExpression() :
   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()
@@ -2150,7 +2243,7 @@ ListExpression ListExpression() :
   }
   [ <ASSIGN> expression = Expression()
     {
-    final Variable[] vars = new Variable[list.size()];
+    final AbstractVariable[] vars = new AbstractVariable[list.size()];
     list.toArray(vars);
     return new ListExpression(vars,
                               expression,
@@ -2171,40 +2264,46 @@ EchoStatement EchoStatement() :
 {
   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>
@@ -2212,14 +2311,14 @@ GlobalStatement GlobalStatement() :
     {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) {
@@ -2233,23 +2332,23 @@ GlobalStatement GlobalStatement() :
 
 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;
@@ -2261,13 +2360,12 @@ StaticStatement StaticStatement() :
 
 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);}
 }
 
 /**
@@ -2279,13 +2377,13 @@ LabeledStatement LabeledStatement() :
  */
 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;
@@ -2296,7 +2394,7 @@ Block Block() :
   ( 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;
@@ -2307,7 +2405,7 @@ Block Block() :
   {
   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() :
@@ -2315,8 +2413,16 @@ 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);
@@ -2342,19 +2448,20 @@ Statement BlockStatementNoBreak() :
 /**
  * used only by ForInit()
  */
-VariableDeclaration[] LocalVariableDeclaration() :
+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;
+  }
 }
 
 /**
@@ -2364,7 +2471,6 @@ VariableDeclaration LocalVariableDeclarator() :
 {
   final Variable varName;
   Expression initializer = null;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
   varName = Variable() [ <ASSIGN> initializer = Expression() ]
@@ -2372,25 +2478,24 @@ VariableDeclaration LocalVariableDeclarator() :
    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);}
 }
 
 /**
@@ -2398,19 +2503,18 @@ EmptyStatement EmptyStatement() :
  */
 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());}
+                                                       OperatorIds.MINUS_MINUS,
+                                                       SimpleCharStream.getPosition());}
   ]
   {return expr;}
 }
@@ -2420,9 +2524,10 @@ SwitchStatement SwitchStatement() :
   final Expression variable;
   final AbstractCase[] cases;
   final int pos = SimpleCharStream.getPosition();
+  final Token switchToken;
 }
 {
-  <SWITCH>
+  switchToken = <SWITCH>
   try {
     <LPAREN>
   } catch (ParseException e) {
@@ -2453,8 +2558,8 @@ SwitchStatement SwitchStatement() :
     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() :
@@ -2565,19 +2670,19 @@ Expression SwitchLabel() :
     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>
@@ -2587,21 +2692,21 @@ Expression SwitchLabel() :
   } 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;
@@ -2609,17 +2714,18 @@ Break BreakStatement() :
     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;}
 }
 
@@ -2863,13 +2969,13 @@ DoStatement DoStatement() :
 {
   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;
@@ -2883,11 +2989,11 @@ ForeachStatement ForeachStatement() :
 {
   Statement statement;
   Expression expression;
-  final int pos = SimpleCharStream.getPosition();
   ArrayVariableDeclaration variable;
+  Token token;
 }
 {
-  <FOREACH>
+  token = <FOREACH>
     try {
     <LPAREN>
   } catch (ParseException e) {
@@ -2946,21 +3052,24 @@ ForeachStatement ForeachStatement() :
   {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>
@@ -2969,33 +3078,36 @@ final int startBlock, endBlock;
   } 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) {
@@ -3006,11 +3118,18 @@ final int startBlock, endBlock;
         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;
@@ -3040,24 +3159,25 @@ Expression[] StatementExpressionList() :
   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;
@@ -3070,18 +3190,19 @@ Continue ContinueStatement() :
 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
+ }
+}
+