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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 530693d..7648721 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -17,6 +17,7 @@ options {
   BUILD_TOKEN_MANAGER = true;
   SANITY_CHECK = true;
   FORCE_LA_CHECK = false;
+  COMMON_TOKEN_ACTION = true;
 }
 
 PARSER_BEGIN(PHPParser)
@@ -40,7 +41,7 @@ import net.sourceforge.phpdt.internal.compiler.ast.*;
 import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
 import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
 import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
-import junit.framework.Assert;
+import net.sourceforge.phpdt.internal.corext.Assert;
 
 /**
  * A new php parser.
@@ -67,7 +68,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
@@ -95,6 +96,46 @@ public final class PHPParser extends PHPParserSuperclass {
     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();
+  }
+
   /**
    * Reinitialize the parser.
    */
@@ -144,21 +185,23 @@ public final class PHPParser extends PHPParserSuperclass {
     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
    * @param e the ParseException
    */
   private static void processParseException(final ParseException e) {
-    if (PARSER_DEBUG) {
-      e.printStackTrace();
-      Assert.assertTrue(false);
-    }
     if (errorMessage == null) {
       PHPeclipsePlugin.log(e);
       errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
-      errorStart = SimpleCharStream.getPosition();
-      errorEnd   = errorStart + 1;
+      errorStart = e.currentToken.sourceStart;
+      errorEnd   = e.currentToken.sourceEnd;
     }
     setMarker(e);
     errorMessage = null;
@@ -174,8 +217,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 {
@@ -307,6 +350,18 @@ public final class PHPParser extends PHPParserSuperclass {
 
 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
@@ -581,6 +636,13 @@ MORE :
   <DOLLAR_ID: <DOLLAR> <IDENTIFIER>>
 }
 
+void phpTest() :
+{}
+{
+  Php()
+  <EOF>
+}
+
 void phpFile() :
 {}
 {
@@ -632,20 +694,20 @@ void PhpBlock() :
     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,token.sourceEnd);
   pushOnAstNodes(echoBlock);
   return echoBlock;}
 }
@@ -659,50 +721,58 @@ 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;
     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;
@@ -724,7 +794,7 @@ void ClassBody(final ClassDeclaration classDeclaration) :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   ( ClassBodyDeclaration(classDeclaration) )*
   try {
@@ -734,7 +804,7 @@ void ClassBody(final ClassDeclaration classDeclaration) :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
 }
 
@@ -762,31 +832,39 @@ FieldDeclaration FieldDeclaration() :
   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;
     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);}
 }
 
@@ -798,7 +876,6 @@ VariableDeclaration VariableDeclaratorNoSuffix() :
 {
   final Token varName;
   Expression initializer = null;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
   varName = <DOLLAR_ID>
@@ -811,21 +888,25 @@ VariableDeclaration VariableDeclaratorNoSuffix() :
       errorLevel   = ERROR;
       errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
       errorEnd   = SimpleCharStream.getPosition() + 1;
-      processParseException(e);
+      processParseExceptionDebug(e);
     }
   ]
   {
   if (initializer == null) {
     return new VariableDeclaration(currentSegment,
-                                   new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
-                                   pos,
-                                   SimpleCharStream.getPosition());
+                                   new Variable(varName.image.substring(1),
+                                                varName.sourceStart,
+                                                varName.sourceEnd),
+                                   varName.sourceStart,
+                                   varName.sourceEnd);
   }
   return new VariableDeclaration(currentSegment,
-                                   new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
+                                 new Variable(varName.image.substring(1),
+                                              varName.sourceStart,
+                                              varName.sourceEnd),
                                  initializer,
                                  VariableDeclaration.EQUAL,
-                                 pos);
+                                 varName.sourceStart);
   }
 }
 
@@ -834,12 +915,11 @@ VariableDeclaration VariableDeclaratorNoSuffix() :
  */
 VariableDeclaration VariableDeclarator() :
 {
-  final String varName;
+  final AbstractVariable variable;
   Expression initializer = null;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
-  varName = VariableDeclaratorId()
+  variable = VariableDeclaratorId()
   [
     <ASSIGN>
     try {
@@ -849,21 +929,21 @@ VariableDeclaration VariableDeclarator() :
       errorLevel   = ERROR;
       errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
       errorEnd   = SimpleCharStream.getPosition() + 1;
-      processParseException(e);
+      processParseExceptionDebug(e);
     }
   ]
   {
   if (initializer == null) {
     return new VariableDeclaration(currentSegment,
-                                   new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
-                                  pos,
-                                  SimpleCharStream.getPosition());
+                                   variable,
+                                   variable.sourceStart,
+                                   variable.sourceEnd);
   }
     return new VariableDeclaration(currentSegment,
-                                   new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
+                                   variable,
                                    initializer,
                                    VariableDeclaration.EQUAL,
-                                   pos);
+                                   variable.sourceStart);
   }
 }
 
@@ -871,28 +951,24 @@ VariableDeclaration VariableDeclarator() :
  * A Variable name.
  * @return the variable name (with suffix)
  */
-String VariableDeclaratorId() :
+AbstractVariable VariableDeclaratorId() :
 {
-  final String var;
-  Expression expression = null;
+  final Variable var;
+  AbstractVariable expression = null;
   final int pos = SimpleCharStream.getPosition();
-  ConstantIdentifier ex;
 }
 {
   try {
     var = Variable()
     (
       LOOKAHEAD(2)
-      {ex = new ConstantIdentifier(var.toCharArray(),
-                                   pos,
-                                   SimpleCharStream.getPosition());}
-      expression = VariableSuffix(ex)
+      expression = VariableSuffix(var)
     )*
     {
      if (expression == null) {
        return var;
      }
-     return expression.toStringExpression();
+     return expression;
     }
   } catch (ParseException e) {
     errorMessage = "'$' expected for variable identifier";
@@ -906,100 +982,172 @@ String VariableDeclaratorId() :
 /**
  * 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,
+                          token.sourceEnd);
     }
-    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,token.sourceEnd);
   }
 |
-  <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,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;
+  final Token token;
+  ConstantIdentifier constant;
+}
+{
+  token = <DOLLAR_ID> variable = Var(token)
+  {final StringBuffer buff = new StringBuffer();
+   buff.append(token.image.substring(1));
+   buff.append(variable.toStringExpression());
+   return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd);
+   }
+|
+  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;
+  final Variable var;
   Expression expression = null;
   final Token token;
+  Token token2 = null;
+  int pos;
 }
 {
-  <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();}
+   pos = SimpleCharStream.getPosition();
+   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();
+    expr = buff.toString();
+    return new ConstantIdentifier(expr,
+                                  token.sourceStart,
+                                  token2.sourceEnd);
   }
-|
-  <DOLLAR> expr = VariableName()
+/*|
+  <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,
+                      token.sourceEnd);
+  } */
 }
 
 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() :
@@ -1048,11 +1196,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;
@@ -1074,44 +1223,61 @@ 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;
     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()
-  {MethodDeclaration method =  new MethodDeclaration(currentSegment,
-                                                     identifierChar,
-                                                     formalParameters,
-                                                     reference != null,
-                                                     pos,
-                                                     SimpleCharStream.getPosition());
-   return method;}
 }
 
 /**
  * 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 {
@@ -1121,7 +1287,7 @@ Hashtable FormalParameters() :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   [
     var = FormalParameter()
@@ -1132,15 +1298,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;
-    processParseException(e);
+    processParseExceptionDebug(e);
+    end = e.currentToken.sourceStart;
   }
- {return parameters;}
+ {return end;}
 }
 
 /**
@@ -1162,33 +1330,23 @@ VariableDeclaration FormalParameter() :
 }
 
 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;
-  final int pos = SimpleCharStream.getPosition();
   int assignOperator = -1;
 }
 {
@@ -1209,31 +1367,35 @@ Expression Expression() :
     }
   ]
   {
-    char[] varName = expr.toStringExpression().substring(1).toCharArray();
-    if (assignOperator == -1) {
+    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,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()),
-                                       pos,
-                                       SimpleCharStream.getPosition());
-      return expr;
-    }
-    return new VariableDeclaration(currentSegment,
-                                   new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()),
-                                   initializer,
-                                   assignOperator,
-                                   pos);
+                                       new Variable(varName,
+                                                    expr.sourceStart,
+                                                    expr.sourceEnd),
+                                       expr.sourceStart,
+                                       initializer.sourceEnd);
     }
-  {return expr;}
+    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;}
 }
 
@@ -1242,8 +1404,9 @@ Expression ExpressionNoBang() :
   Expression expr;
 }
 {
+  expr = ListExpression()    {return expr;}
+|
   expr = PrintExpression()   {return expr;}
-| expr = ListExpression()    {return expr;}
 }
 
 /**
@@ -1447,9 +1610,10 @@ Expression AdditiveExpression() :
 {
   expr = MultiplicativeExpression()
   (
-  LOOKAHEAD(1)
-   ( <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);}
    )*
@@ -1488,12 +1652,11 @@ Expression MultiplicativeExpression() :
 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 = AtNotUnaryExpression() {return expr;}
 }
 
@@ -1504,16 +1667,16 @@ 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;}
@@ -1523,26 +1686,22 @@ Expression AtNotUnaryExpression() :
 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;}
 |
   expr = UnaryExpressionNotPlusMinus()
   {return expr;}
-/*|
-  LOOKAHEAD(2)
-  expr = PrintExpression()   {return expr;}*/
 }
 
 
@@ -1550,22 +1709,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> )
@@ -1589,95 +1747,107 @@ CastExpression CastExpression() :
 {
 final ConstantIdentifier type;
 final Expression expr;
-final int pos = SimpleCharStream.getPosition();
+final Token token,token1;
 }
 {
-  <LPAREN>
+  token1 = <LPAREN>
   (
       type = Type()
     |
-      <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());}
+      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;}
+      token = <PLUS_PLUS>   {operator = OperatorIds.PLUS_PLUS;}
     |
-      <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+      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() :
 {
-  Expression expr;
-  int assignOperator = -1;
-  final Token identifier;
-  final String var;
-  final int pos = SimpleCharStream.getPosition();
+  Expression expr = null;
+  Token token = null;
 }
 {
-  expr = PrimaryPrefix()
-  (expr = PrimarySuffix(expr))*
-  [ expr = Arguments(expr) ]
-  {return expr;}
-|
-  <NEW> expr = ClassIdentifier()
-  {expr = new PrefixedUnaryExpression(expr,
-                                      OperatorIds.NEW,
-                                      pos);
-  }
-  [ expr = Arguments(expr) ]
+  [token = <BIT_AND>] expr = refPrimaryExpression(token)
   {return expr;}
 |
   expr = ArrayDeclarator()
   {return expr;}
 }
 
-Expression PrimaryPrefix() :
+Expression refPrimaryExpression(final Token reference) :
 {
-  final Expression expr;
-  final Token token;
+  Expression expr = null;
+  Expression expr2 = null;
+  int assignOperator = -1;
+  final Token identifier;
   final String var;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
-  token = <IDENTIFIER>           {return new ConstantIdentifier(token.image.toCharArray(),
-                                                                pos,
-                                                                SimpleCharStream.getPosition());}
+  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;
+  }
 |
-  var = VariableDeclaratorId()   {return new Variable(var.toCharArray(),
-                                                      pos,
-                                                      SimpleCharStream.getPosition());}
-}
-
-AbstractSuffixExpression PrimarySuffix(final Expression prefix) :
-{
-  final AbstractSuffixExpression suffix;
-  final Expression expr;
-}
-{
-  suffix = VariableSuffix(prefix) {return suffix;}
-| <STATICCLASSACCESS> expr = ClassIdentifier()
-  {suffix = new ClassAccess(prefix,
-                            expr,
-                            ClassAccess.STATIC);
-   return suffix;}
+  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;}
 }
 
 /**
@@ -1688,61 +1858,38 @@ AbstractSuffixExpression PrimarySuffix(final Expression prefix) :
 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 = SimpleCharStream.getPosition();
+  final Token token;
 }
 {
-  <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);}
+  token = <ARRAY> vars = ArrayInitializer()
+  {return new ArrayInitializer(vars,token.sourceStart,SimpleCharStream.getPosition());}
 }
 
-ConstantIdentifier ClassIdentifier():
+Expression 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;
+  Variable expr = null;
   final int pos = SimpleCharStream.getPosition();
   Expression expression = null;
 }
 {
   <CLASSACCESS>
   try {
-    expr = VariableName()
+    expression = VariableName()
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected";
     errorLevel   = ERROR;
@@ -1751,7 +1898,7 @@ AbstractSuffixExpression VariableSuffix(final Expression prefix) :
     throw e;
   }
   {return new ClassAccess(prefix,
-                          new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+                          expression,
                           ClassAccess.NORMAL);}
 |
   <LBRACKET> [ expression = Expression() | expression = Type() ]  //Not good
@@ -1770,31 +1917,25 @@ AbstractSuffixExpression VariableSuffix(final Expression prefix) :
 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;
@@ -1802,7 +1943,7 @@ Expression[] args = null;
     errorEnd   = SimpleCharStream.getPosition() + 1;
     throw e;
   }
-  {return new FunctionCall(func,args,SimpleCharStream.getPosition());}
+  {return new FunctionCall(func,args,token.sourceEnd);}
 }
 
 /**
@@ -1864,6 +2005,7 @@ Statement StatementNoBreak() :
 | [token=<AT>] statement = IncludeStatement()
   {if (token != null) {
     ((InclusionStatement)statement).silent = true;
+    statement.sourceStart = token.sourceStart;
   }
   return statement;}
 | statement = StaticStatement()         {return statement;}
@@ -1879,11 +2021,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";
@@ -1910,7 +2054,7 @@ Define defineStatement() :
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd     = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   try {
     defineName = Expression()
@@ -1928,7 +2072,7 @@ Define defineStatement() :
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd     = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   try {
     defineValue = Expression()
@@ -1946,7 +2090,7 @@ Define defineStatement() :
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd     = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   {return new Define(currentSegment,
                      defineName,
@@ -2002,14 +2146,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) {
@@ -2025,11 +2169,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;
@@ -2037,7 +2181,8 @@ InclusionStatement IncludeStatement() :
     errorEnd     = SimpleCharStream.getPosition() + 1;
     throw e;
   }
-  {return inclusionStatement;}
+  {inclusionStatement.sourceEnd = token2.sourceEnd;
+  return inclusionStatement;}
 }
 
 PrintExpression PrintExpression() :
@@ -2051,7 +2196,7 @@ PrintExpression PrintExpression() :
 
 ListExpression ListExpression() :
 {
-  String expr = null;
+  Expression expr = null;
   final Expression expression;
   final ArrayList list = new ArrayList();
   final int pos = SimpleCharStream.getPosition();
@@ -2095,17 +2240,17 @@ ListExpression ListExpression() :
   }
   [ <ASSIGN> expression = Expression()
     {
-    final String[] strings = new String[list.size()];
-    list.toArray(strings);
-    return new ListExpression(strings,
+    final Variable[] vars = new Variable[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());}
 }
 
 /**
@@ -2116,55 +2261,61 @@ 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();
-   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) {
@@ -2178,21 +2329,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(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;
@@ -2204,13 +2357,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);}
 }
 
 /**
@@ -2222,13 +2374,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;
@@ -2239,7 +2391,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;
@@ -2250,7 +2402,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() :
@@ -2258,8 +2410,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);
@@ -2305,35 +2465,33 @@ VariableDeclaration[] 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,
-                                  new Variable(varName.toCharArray(),SimpleCharStream.getPosition()-varName.length(),SimpleCharStream.getPosition()),
-                                  pos,
-                                  SimpleCharStream.getPosition());
+                                   varName,
+                                   varName.sourceStart,
+                                   varName.sourceEnd);
    }
     return new VariableDeclaration(currentSegment,
-                                    new Variable(varName.toCharArray(),SimpleCharStream.getPosition()-varName.length(),SimpleCharStream.getPosition()),
-                                    initializer,
-                                    VariableDeclaration.EQUAL,
-                                    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);}
 }
 
 /**
@@ -2349,11 +2507,11 @@ Expression StatementExpression() :
 |
   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;}
 }
@@ -2539,12 +2697,12 @@ Expression SwitchLabel() :
 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;
@@ -2552,7 +2710,7 @@ 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() :
@@ -2560,9 +2718,11 @@ 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;}
 }
 
@@ -2579,7 +2739,7 @@ Expression Condition(final String keyword) :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length();
     errorEnd   = errorStart +1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   condition = Expression()
   try {
@@ -2589,7 +2749,7 @@ Expression Condition(final String keyword) :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   {return condition;}
 }
@@ -2806,13 +2966,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;
@@ -2826,11 +2986,11 @@ ForeachStatement ForeachStatement() :
 {
   Statement statement;
   Expression expression;
-  final int pos = SimpleCharStream.getPosition();
   ArrayVariableDeclaration variable;
+  Token token;
 }
 {
-  <FOREACH>
+  token = <FOREACH>
     try {
     <LPAREN>
   } catch (ParseException e) {
@@ -2889,14 +3049,14 @@ ForeachStatement ForeachStatement() :
   {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;
@@ -2921,7 +3081,12 @@ final int startBlock, endBlock;
      [ 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();}
@@ -2949,11 +3114,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;
@@ -2986,21 +3158,22 @@ Expression[] StatementExpressionList() :
   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;
@@ -3013,13 +3186,13 @@ 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;