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..84d3954 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.
@@ -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;
@@ -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,7 +694,7 @@ void PhpBlock() :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
 }
 
@@ -675,7 +737,7 @@ ClassDeclaration ClassDeclaration() :
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd     = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   [
     <EXTENDS>
@@ -687,7 +749,7 @@ ClassDeclaration ClassDeclaration() :
       errorLevel   = ERROR;
       errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
       errorEnd   = SimpleCharStream.getPosition() + 1;
-      processParseException(e);
+      processParseExceptionDebug(e);
       superclassNameImage = SYNTAX_ERROR_CHAR;
     }
   ]
@@ -724,7 +786,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 +796,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);
   }
 }
 
@@ -779,7 +841,7 @@ FieldDeclaration FieldDeclaration() :
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd     = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
 
   {list = new VariableDeclaration[arrayList.size()];
@@ -798,10 +860,10 @@ VariableDeclaration VariableDeclaratorNoSuffix() :
 {
   final Token varName;
   Expression initializer = null;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
   varName = <DOLLAR_ID>
+  {final int pos = SimpleCharStream.getPosition()-varName.image.length();}
   [
     <ASSIGN>
     try {
@@ -811,18 +873,22 @@ 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()),
+                                   new Variable(varName.image.substring(1),
+                                                varName.sourceStart,
+                                                varName.sourceEnd),
                                    pos,
                                    SimpleCharStream.getPosition());
   }
   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);
@@ -834,12 +900,12 @@ 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,18 +915,18 @@ 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,
+                                   pos,
+                                   SimpleCharStream.getPosition());
   }
     return new VariableDeclaration(currentSegment,
-                                   new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
+                                   variable,
                                    initializer,
                                    VariableDeclaration.EQUAL,
                                    pos);
@@ -871,28 +937,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";
@@ -907,99 +969,128 @@ 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> {pos = SimpleCharStream.getPosition()-token.image.length();}
+  [<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);}
 }
 
 /**
  * A Variable name (without the $)
  * @return a variable name String
  */
-String VariableName():
+Variable 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>
+  {pos = SimpleCharStream.getPosition()-1;}
+  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 Variable(expr,
+                       token.sourceStart,
+                       token2.sourceEnd);
+
+   }
 |
-  token = <IDENTIFIER> [<LBRACE> expression = Expression() <RBRACE>]
+  token = <IDENTIFIER>
+  {pos = SimpleCharStream.getPosition() - token.image.length();}
+  [<LBRACE> expression = Expression() token2 = <RBRACE>]
   {
     if (expression == null) {
-      return token.image;
+      return new Variable(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 Variable(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() :
@@ -1092,7 +1183,7 @@ MethodDeclaration MethodDeclarator() :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   formalParameters = FormalParameters()
   {MethodDeclaration method =  new MethodDeclaration(currentSegment,
@@ -1121,7 +1212,7 @@ Hashtable FormalParameters() :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   [
     var = FormalParameter()
@@ -1138,7 +1229,7 @@ Hashtable FormalParameters() :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
  {return parameters;}
 }
@@ -1162,26 +1253,17 @@ 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() :
@@ -1209,21 +1291,24 @@ 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;
+                                       new Variable(varName,
+                                                    expr.sourceStart,
+                                                    expr.sourceEnd),
+                                       expr.sourceStart,
+                                       initializer.sourceEnd);
     }
-    return new VariableDeclaration(currentSegment,
-                                   new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()),
-                                   initializer,
-                                   assignOperator,
-                                   pos);
-    }
-  {return expr;}
+    return expr;
+  }
 | expr = ExpressionWBang()       {return expr;}
 }
 
@@ -1242,8 +1327,9 @@ Expression ExpressionNoBang() :
   Expression expr;
 }
 {
+  expr = ListExpression()    {return expr;}
+|
   expr = PrintExpression()   {return expr;}
-| expr = ListExpression()    {return expr;}
 }
 
 /**
@@ -1447,9 +1533,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);}
    )*
@@ -1491,9 +1578,9 @@ Expression UnaryExpression() :
   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;}
 }
 
@@ -1523,26 +1610,18 @@ Expression AtNotUnaryExpression() :
 Expression UnaryExpressionNoPrefix() :
 {
   final Expression expr;
-  final int operator;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  (
-      <PLUS>  {operator = OperatorIds.PLUS;}
-    |
-      <MINUS> {operator = OperatorIds.MINUS;}
-  )
-  expr = UnaryExpression()
-  {return new PrefixedUnaryExpression(expr,operator,pos);}
+  <PLUS> expr = AtNotUnaryExpression()   {return new PrefixedUnaryExpression(expr,OperatorIds.PLUS,pos);}
+|
+  <MINUS> expr = AtNotUnaryExpression()  {return new PrefixedUnaryExpression(expr,OperatorIds.MINUS,pos);}
 |
   expr = PreIncDecExpression()
   {return expr;}
 |
   expr = UnaryExpressionNotPlusMinus()
   {return expr;}
-/*|
-  LOOKAHEAD(2)
-  expr = PrintExpression()   {return expr;}*/
 }
 
 
@@ -1589,58 +1668,72 @@ 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;
+  Expression expr = null;
+  Expression expr2;
   int assignOperator = -1;
   final Token identifier;
   final String var;
-  final int pos = SimpleCharStream.getPosition();
+  final int pos;
 }
 {
-  expr = PrimaryPrefix()
-  (expr = PrimarySuffix(expr))*
+  token = <IDENTIFIER>
+  {
+    expr = new ConstantIdentifier(token);
+  }
+  (
+    <STATICCLASSACCESS> expr2 = ClassIdentifier()
+    {expr = new ClassAccess(expr,
+                            expr2,
+                            ClassAccess.STATIC);}
+  )*
   [ expr = Arguments(expr) ]
   {return expr;}
 |
-  <NEW> expr = ClassIdentifier()
+  expr = VariableDeclaratorId()
+  [ expr = Arguments(expr) ]
+  {return expr;}
+|
+  token = <NEW>
+  expr = ClassIdentifier()
   {expr = new PrefixedUnaryExpression(expr,
                                       OperatorIds.NEW,
-                                      pos);
+                                      token.sourceStart);
   }
   [ expr = Arguments(expr) ]
   {return expr;}
@@ -1649,37 +1742,6 @@ Expression PrimaryExpression() :
   {return expr;}
 }
 
-Expression PrimaryPrefix() :
-{
-  final Expression expr;
-  final Token token;
-  final String var;
-  final int pos = SimpleCharStream.getPosition();
-}
-{
-  token = <IDENTIFIER>           {return new ConstantIdentifier(token.image.toCharArray(),
-                                                                pos,
-                                                                SimpleCharStream.getPosition());}
-|
-  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;}
-}
-
 /**
  * An array declarator.
  * array(vars)
@@ -1699,43 +1761,43 @@ PrefixedUnaryExpression classInstantiation() :
 {
   Expression expr;
   final StringBuffer buff;
-  final int pos = SimpleCharStream.getPosition();
+  final int pos;
+  final Token token;
 }
 {
-  <NEW> expr = ClassIdentifier()
+  token = <NEW> expr = ClassIdentifier()
   [
-    {buff = new StringBuffer(expr.toStringExpression());}
+    {pos = expr.sourceStart;
+    buff = new StringBuffer(expr.toStringExpression());}
     expr = PrimaryExpression()
     {buff.append(expr.toStringExpression());
-    expr = new ConstantIdentifier(buff.toString().toCharArray(),
-                                  pos,
-                                  SimpleCharStream.getPosition());}
+    expr = new ConstantIdentifier(buff.toString(),
+                                  expr.sourceStart,
+                                  expr.sourceEnd);}
   ]
   {return new PrefixedUnaryExpression(expr,
                                       OperatorIds.NEW,
-                                      pos);}
+                                      token.sourceStart);}
 }
 
-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;
 }
@@ -1751,7 +1813,7 @@ AbstractSuffixExpression VariableSuffix(final Expression prefix) :
     throw e;
   }
   {return new ClassAccess(prefix,
-                          new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+                          expr,
                           ClassAccess.NORMAL);}
 |
   <LBRACKET> [ expression = Expression() | expression = Type() ]  //Not good
@@ -1770,21 +1832,14 @@ 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) :
@@ -1910,7 +1965,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 +1983,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 +2001,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,
@@ -2051,7 +2106,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 +2150,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());}
 }
 
 /**
@@ -2144,25 +2199,25 @@ EchoStatement EchoStatement() :
 GlobalStatement GlobalStatement() :
 {
    final int pos = SimpleCharStream.getPosition();
-   String expr;
+   Variable expr;
    final ArrayList vars = new ArrayList();
    final GlobalStatement global;
 }
 {
   <GLOBAL>
-    expr = VariableDeclaratorId()
+    expr = Variable()
     {vars.add(expr);}
   (<COMMA>
-    expr = VariableDeclaratorId()
+    expr = Variable()
     {vars.add(expr);}
   )*
   try {
     <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,
+                                 variables,
                                  pos,
                                  SimpleCharStream.getPosition());
     currentSegment.add(global);
@@ -2183,16 +2238,18 @@ StaticStatement StaticStatement() :
   VariableDeclaration expr;
 }
 {
-  <STATIC> expr = VariableDeclarator() {vars.add(new String(expr.name()));}
-  (<COMMA> expr = VariableDeclarator() {vars.add(new String(expr.name()));})*
+  <STATIC> expr = VariableDeclarator() {vars.add(expr);}
+  (
+    <COMMA> expr = VariableDeclarator() {vars.add(expr);}
+  )*
   try {
     <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,
+                               pos,
+                               SimpleCharStream.getPosition());}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
     errorLevel   = ERROR;
@@ -2305,24 +2362,24 @@ 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,
+                                   pos,
+                                   SimpleCharStream.getPosition());
    }
     return new VariableDeclaration(currentSegment,
-                                    new Variable(varName.toCharArray(),SimpleCharStream.getPosition()-varName.length(),SimpleCharStream.getPosition()),
-                                    initializer,
-                                    VariableDeclaration.EQUAL,
-                                    pos);
+                                   varName,
+                                   initializer,
+                                   VariableDeclaration.EQUAL,
+                                   pos);
   }
 }
 
@@ -2579,7 +2636,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 +2646,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;}
 }