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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 8ee1085..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,6 +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 net.sourceforge.phpdt.internal.corext.Assert;
 
 /**
  * A new php parser.
@@ -47,13 +49,9 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
  * given with JavaCC. You can get JavaCC at http://www.webgain.com
  * You can test the parser with the PHPParserTestCase2.java
  * @author Matthieu Casanova
- * @version $Reference: 1.0$
  */
 public final class PHPParser extends PHPParserSuperclass {
 
-  /** The file that is parsed. */
-  private static IFile fileToParse;
-
   /** The current segment. */
   private static OutlineableWithChildren currentSegment;
 
@@ -84,8 +82,10 @@ public final class PHPParser extends PHPParserSuperclass {
   /** The cursor in expression stack. */
   private static int nodePtr;
 
+  private static final boolean PARSER_DEBUG = false;
+
   public final void setFileToParse(final IFile fileToParse) {
-    this.fileToParse = fileToParse;
+    PHPParser.fileToParse = fileToParse;
   }
 
   public PHPParser() {
@@ -93,7 +93,47 @@ public final class PHPParser extends PHPParserSuperclass {
 
   public PHPParser(final IFile fileToParse) {
     this(new StringReader(""));
-    this.fileToParse = fileToParse;
+    PHPParser.fileToParse = fileToParse;
+  }
+
+  public static final void phpParserTester(final String strEval) throws ParseException {
+    final StringReader stream = new StringReader(strEval);
+    if (jj_input_stream == null) {
+      jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    }
+    ReInit(new StringReader(strEval));
+    init();
+    phpDocument = new PHPDocument(null,"_root".toCharArray());
+    currentSegment = phpDocument;
+    outlineInfo = new PHPOutlineInfo(null, currentSegment);
+    PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
+    phpTest();
+  }
+
+  public static final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException {
+    final Reader stream = new FileReader(fileName);
+    if (jj_input_stream == null) {
+      jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    }
+    ReInit(stream);
+    init();
+    phpDocument = new PHPDocument(null,"_root".toCharArray());
+    currentSegment = phpDocument;
+    outlineInfo = new PHPOutlineInfo(null, currentSegment);
+    phpFile();
+  }
+
+  public static final void htmlParserTester(final String strEval) throws ParseException {
+    final StringReader stream = new StringReader(strEval);
+    if (jj_input_stream == null) {
+      jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    }
+    ReInit(stream);
+    init();
+    phpDocument = new PHPDocument(null,"_root".toCharArray());
+    currentSegment = phpDocument;
+    outlineInfo = new PHPOutlineInfo(null, currentSegment);
+    phpFile();
   }
 
   /**
@@ -145,6 +185,12 @@ 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
@@ -154,15 +200,16 @@ public final class PHPParser extends PHPParserSuperclass {
     if (errorMessage == null) {
       PHPeclipsePlugin.log(e);
       errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
-      errorStart = SimpleCharStream.getPosition();
-      errorEnd   = errorStart + 1;
+      errorStart = e.currentToken.sourceStart;
+      errorEnd   = e.currentToken.sourceEnd;
     }
     setMarker(e);
     errorMessage = null;
+  //  if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e);
   }
 
   /**
-   * Create marker for the parse error
+   * Create marker for the parse error.
    * @param e the ParseException
    */
   private static void setMarker(final ParseException e) {
@@ -194,12 +241,12 @@ public final class PHPParser extends PHPParserSuperclass {
                                final int indx,
                                final int brIndx) throws CoreException {
     String current;
-    StringBuffer lineNumberBuffer = new StringBuffer(10);
+    final StringBuffer lineNumberBuffer = new StringBuffer(10);
     char ch;
     current = output.substring(indx, brIndx);
 
     if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) {
-      int onLine = current.indexOf("on line <b>");
+      final int onLine = current.indexOf("on line <b>");
       if (onLine != -1) {
         lineNumberBuffer.delete(0, lineNumberBuffer.length());
         for (int i = onLine; i < current.length(); i++) {
@@ -209,9 +256,9 @@ public final class PHPParser extends PHPParserSuperclass {
           }
         }
 
-        int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
+        final int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
 
-        Hashtable attributes = new Hashtable();
+        final Hashtable attributes = new Hashtable();
 
         current = current.replaceAll("\n", "");
         current = current.replaceAll("<b>", "");
@@ -230,7 +277,7 @@ public final class PHPParser extends PHPParserSuperclass {
     }
   }
 
-  public final void parse(final String s) throws CoreException {
+  public final void parse(final String s) {
     final StringReader stream = new StringReader(s);
     if (jj_input_stream == null) {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
@@ -278,17 +325,16 @@ public final class PHPParser extends PHPParserSuperclass {
     pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
   }
 
-  /**
-   * Create a new task.
-   */
+  /** Create a new task. */
   public static final void createNewTask() {
     final int currentPosition = SimpleCharStream.getPosition();
-    final String  todo = SimpleCharStream.currentBuffer.substring(currentPosition+1,
+    final String  todo = SimpleCharStream.currentBuffer.substring(currentPosition-3,
                                                                   SimpleCharStream.currentBuffer.indexOf("\n",
                                                                                                          currentPosition)-1);
+    PHPeclipsePlugin.log(1,SimpleCharStream.currentBuffer.toString());
     try {
       setMarker(fileToParse,
-                "todo : " + todo,
+                todo,
                 SimpleCharStream.getBeginLine(),
                 TASK,
                 "Line "+SimpleCharStream.getBeginLine());
@@ -304,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
@@ -501,16 +559,16 @@ MORE :
   <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
 |
   <STRING_LITERAL: (<STRING_1> | <STRING_2> | <STRING_3>)>
-|   <STRING_1: "\"" ( ~["\"","\\"] | "\\" ( ["\"","\\"] ) )* "\"">
-|   <STRING_2: "'" ( ~["'","\\"] | "\\" ( ["'","\\"] ) )* "'">
-|   <STRING_3: "`" ( ~["`","\\"] | "\\" ( ["`","\\"] ) )* "`">
+|   <STRING_1: "\"" ( ~["\"","\\"] | "\\" ~[] )* "\"">
+|   <STRING_2: "'"  ( ~["'","\\"]  | "\\" ~[] )* "'">
+|   <STRING_3: "`"  ( ~["`","\\"]  | "\\" ~[] )* "`">
 }
 
 /* IDENTIFIERS */
 
 <PHPPARSING> TOKEN :
 {
-  < IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
+  <IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
 |
   < #LETTER:
       ["a"-"z"] | ["A"-"Z"]
@@ -578,6 +636,13 @@ MORE :
   <DOLLAR_ID: <DOLLAR> <IDENTIFIER>>
 }
 
+void phpTest() :
+{}
+{
+  Php()
+  <EOF>
+}
+
 void phpFile() :
 {}
 {
@@ -629,7 +694,7 @@ void PhpBlock() :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
 }
 
@@ -672,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>
@@ -684,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;
     }
   ]
@@ -717,21 +782,21 @@ void ClassBody(final ClassDeclaration classDeclaration) :
   try {
     <LBRACE>
   } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected";
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    processParseExceptionDebug(e);
   }
   ( ClassBodyDeclaration(classDeclaration) )*
   try {
     <RBRACE>
   } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', 'var', 'function' or '}' expected";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected";
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    processParseExceptionDebug(e);
   }
 }
 
@@ -744,12 +809,14 @@ void ClassBodyDeclaration(final ClassDeclaration classDeclaration) :
   final FieldDeclaration field;
 }
 {
-  method = MethodDeclaration() {classDeclaration.addMethod(method);}
+  method = MethodDeclaration() {method.analyzeCode();
+                                classDeclaration.addMethod(method);}
 | field = FieldDeclaration()   {classDeclaration.addField(field);}
 }
 
 /**
  * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ * it is only used by ClassBodyDeclaration()
  */
 FieldDeclaration FieldDeclaration() :
 {
@@ -759,12 +826,13 @@ FieldDeclaration FieldDeclaration() :
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  <VAR> variableDeclaration = VariableDeclarator()
+  <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
   {arrayList.add(variableDeclaration);
-   outlineInfo.addVariable(new String(variableDeclaration.name));}
-  ( <COMMA> variableDeclaration = VariableDeclarator()
+   outlineInfo.addVariable(new String(variableDeclaration.name()));}
+  (
+    <COMMA> variableDeclaration = VariableDeclaratorNoSuffix()
       {arrayList.add(variableDeclaration);
-       outlineInfo.addVariable(new String(variableDeclaration.name));}
+       outlineInfo.addVariable(new String(variableDeclaration.name()));}
   )*
   try {
     <SEMICOLON>
@@ -773,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()];
@@ -784,14 +852,60 @@ FieldDeclaration FieldDeclaration() :
                                currentSegment);}
 }
 
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ * It will be used by fields and formal parameters
+ */
+VariableDeclaration VariableDeclaratorNoSuffix() :
+{
+  final Token varName;
+  Expression initializer = null;
+}
+{
+  varName = <DOLLAR_ID>
+  {final int pos = SimpleCharStream.getPosition()-varName.image.length();}
+  [
+    <ASSIGN>
+    try {
+      initializer = VariableInitializer()
+    } catch (ParseException e) {
+      errorMessage = "Literal expression expected in variable initializer";
+      errorLevel   = ERROR;
+      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = SimpleCharStream.getPosition() + 1;
+      processParseExceptionDebug(e);
+    }
+  ]
+  {
+  if (initializer == null) {
+    return new VariableDeclaration(currentSegment,
+                                   new Variable(varName.image.substring(1),
+                                                varName.sourceStart,
+                                                varName.sourceEnd),
+                                   pos,
+                                   SimpleCharStream.getPosition());
+  }
+  return new VariableDeclaration(currentSegment,
+                                 new Variable(varName.image.substring(1),
+                                              varName.sourceStart,
+                                              varName.sourceEnd),
+                                 initializer,
+                                 VariableDeclaration.EQUAL,
+                                 pos);
+  }
+}
+
+/**
+ * this will be used by static statement
+ */
 VariableDeclaration VariableDeclarator() :
 {
-  final String varName;
+  final AbstractVariable variable;
   Expression initializer = null;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  varName = VariableDeclaratorId()
+  variable = VariableDeclaratorId()
   [
     <ASSIGN>
     try {
@@ -801,20 +915,21 @@ VariableDeclaration VariableDeclarator() :
       errorLevel   = ERROR;
       errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
       errorEnd   = SimpleCharStream.getPosition() + 1;
-      throw e;
+      processParseExceptionDebug(e);
     }
   ]
   {
   if (initializer == null) {
     return new VariableDeclaration(currentSegment,
-                                  varName.toCharArray(),
-                                  pos,
-                                  SimpleCharStream.getPosition());
+                                   variable,
+                                   pos,
+                                   SimpleCharStream.getPosition());
   }
     return new VariableDeclaration(currentSegment,
-                                    varName.toCharArray(),
-                                    initializer,
-                                    pos);
+                                   variable,
+                                   initializer,
+                                   VariableDeclaration.EQUAL,
+                                   pos);
   }
 }
 
@@ -822,27 +937,24 @@ VariableDeclaration VariableDeclarator() :
  * A Variable name.
  * @return the variable name (with suffix)
  */
-String VariableDeclaratorId() :
+AbstractVariable VariableDeclaratorId() :
 {
-  final String expr;
-  Expression expression = null;
+  final Variable var;
+  AbstractVariable expression = null;
   final int pos = SimpleCharStream.getPosition();
-  ConstantIdentifier ex;
 }
 {
   try {
-    expr = Variable()
-    ( LOOKAHEAD(2)
-      {ex = new ConstantIdentifier(expr.toCharArray(),
-                                   pos,
-                                   SimpleCharStream.getPosition());}
-      expression = VariableSuffix(ex)
+    var = Variable()
+    (
+      LOOKAHEAD(2)
+      expression = VariableSuffix(var)
     )*
     {
      if (expression == null) {
-       return expr;
+       return var;
      }
-     return expression.toStringExpression();
+     return expression;
     }
   } catch (ParseException e) {
     errorMessage = "'$' expected for variable identifier";
@@ -857,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() :
@@ -958,8 +1099,9 @@ final Expression expr,expr2;
 }
 {
   expr = Expression()
-  [<ARRAYASSIGN> expr2 = Expression()
-  {return new ArrayVariableDeclaration(expr,expr2);}
+  [
+    <ARRAYASSIGN> expr2 = Expression()
+    {return new ArrayVariableDeclaration(expr,expr2);}
   ]
   {return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
 }
@@ -970,13 +1112,17 @@ ArrayVariableDeclaration[] ArrayInitializer() :
   final ArrayList list = new ArrayList();
 }
 {
-  <LPAREN> [ expr = ArrayVariable()
-            {list.add(expr);}
-            ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
-            {list.add(expr);}
-            )*
-           ]
-           [<COMMA> {list.add(null);}]
+  <LPAREN>
+    [
+      expr = ArrayVariable()
+      {list.add(expr);}
+      ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
+      {list.add(expr);}
+      )*
+    ]
+    [
+      <COMMA> {list.add(null);}
+    ]
   <RPAREN>
   {
   final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
@@ -1037,15 +1183,16 @@ MethodDeclaration MethodDeclarator() :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   formalParameters = FormalParameters()
-  {return new MethodDeclaration(currentSegment,
-                                identifierChar,
-                                formalParameters,
-                                reference != null,
-                                pos,
-                                SimpleCharStream.getPosition());}
+  {MethodDeclaration method =  new MethodDeclaration(currentSegment,
+                                                     identifierChar,
+                                                     formalParameters,
+                                                     reference != null,
+                                                     pos,
+                                                     SimpleCharStream.getPosition());
+   return method;}
 }
 
 /**
@@ -1065,15 +1212,16 @@ Hashtable FormalParameters() :
     errorLevel   = ERROR;
     errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
-            [ var = FormalParameter()
-              {parameters.put(new String(var.name),var);}
-              (
-                <COMMA> var = FormalParameter()
-                {parameters.put(new String(var.name),var);}
-              )*
-            ]
+  [
+    var = FormalParameter()
+    {parameters.put(new String(var.name()),var);}
+    (
+      <COMMA> var = FormalParameter()
+      {parameters.put(new String(var.name()),var);}
+    )*
+  ]
   try {
     <RPAREN>
   } catch (ParseException e) {
@@ -1081,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;}
 }
@@ -1096,7 +1244,7 @@ VariableDeclaration FormalParameter() :
   Token token = null;
 }
 {
-  [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
+  [token = <BIT_AND>] variableDeclaration = VariableDeclaratorNoSuffix()
   {
     if (token != null) {
       variableDeclaration.setReference(true);
@@ -1105,99 +1253,105 @@ 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;
 }
 {
-  <BANG> expr = Expression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
-| expr = ExpressionNoBang() {return expr;}
+  LOOKAHEAD(1)
+  expr = ConditionalExpression()
+  [
+    assignOperator = AssignmentOperator()
+    try {
+      initializer = Expression()
+    } catch (ParseException e) {
+      if (errorMessage != null) {
+        throw e;
+      }
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+      errorLevel   = ERROR;
+      errorEnd   = SimpleCharStream.getPosition();
+      throw e;
+    }
+  ]
+  {
+    if (assignOperator != -1) {// todo : change this, very very bad :(
+        if (expr instanceof AbstractVariable) {
+          return new VariableDeclaration(currentSegment,
+                                         (AbstractVariable) expr,
+                                         initializer,
+                                         expr.sourceStart,
+                                         initializer.sourceEnd);
+        }
+        String varName = expr.toStringExpression().substring(1);
+        return new VariableDeclaration(currentSegment,
+                                       new Variable(varName,
+                                                    expr.sourceStart,
+                                                    expr.sourceEnd),
+                                       expr.sourceStart,
+                                       initializer.sourceEnd);
+    }
+    return expr;
+  }
+| expr = ExpressionWBang()       {return expr;}
 }
 
-Expression ExpressionNoBang() :
+Expression ExpressionWBang() :
 {
   final Expression expr;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  expr = PrintExpression()       {return expr;}
-| expr = ListExpression()        {return expr;}
-| LOOKAHEAD(varAssignation())
-  expr = varAssignation()        {return expr;}
-| expr = ConditionalExpression() {return expr;}
+  <BANG> expr = ExpressionWBang() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+| expr = ExpressionNoBang() {return expr;}
 }
 
-/**
- * A Variable assignation.
- * varName (an assign operator) any expression
- */
-VarAssignation varAssignation() :
+Expression ExpressionNoBang() :
 {
-  final String varName;
-  final Expression initializer;
-  final int assignOperator;
-  final int pos = SimpleCharStream.getPosition();
+  Expression expr;
 }
 {
-  varName = VariableDeclaratorId()
-  assignOperator = AssignmentOperator()
-    try {
-      initializer = Expression()
-    } catch (ParseException e) {
-      if (errorMessage != null) {
-        throw e;
-      }
-      errorMessage = "expression expected";
-      errorLevel   = ERROR;
-      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = SimpleCharStream.getPosition() + 1;
-      throw e;
-    }
-    {return new VarAssignation(varName.toCharArray(),
-                               initializer,
-                               assignOperator,
-                               pos,
-                               SimpleCharStream.getPosition());}
+  expr = ListExpression()    {return expr;}
+|
+  expr = PrintExpression()   {return expr;}
 }
 
+/**
+ * Any assignement operator.
+ * @return the assignement operator id
+ */
 int AssignmentOperator() :
 {}
 {
-  <ASSIGN>             {return VarAssignation.EQUAL;}
-| <STARASSIGN>         {return VarAssignation.STAR_EQUAL;}
-| <SLASHASSIGN>        {return VarAssignation.SLASH_EQUAL;}
-| <REMASSIGN>          {return VarAssignation.REM_EQUAL;}
-| <PLUSASSIGN>         {return VarAssignation.PLUS_EQUAL;}
-| <MINUSASSIGN>        {return VarAssignation.MINUS_EQUAL;}
-| <LSHIFTASSIGN>       {return VarAssignation.LSHIFT_EQUAL;}
-| <RSIGNEDSHIFTASSIGN> {return VarAssignation.RSIGNEDSHIFT_EQUAL;}
-| <ANDASSIGN>          {return VarAssignation.AND_EQUAL;}
-| <XORASSIGN>          {return VarAssignation.XOR_EQUAL;}
-| <ORASSIGN>           {return VarAssignation.OR_EQUAL;}
-| <DOTASSIGN>          {return VarAssignation.DOT_EQUAL;}
-| <TILDEEQUAL>         {return VarAssignation.TILDE_EQUAL;}
+  <ASSIGN>             {return VariableDeclaration.EQUAL;}
+| <STARASSIGN>         {return VariableDeclaration.STAR_EQUAL;}
+| <SLASHASSIGN>        {return VariableDeclaration.SLASH_EQUAL;}
+| <REMASSIGN>          {return VariableDeclaration.REM_EQUAL;}
+| <PLUSASSIGN>         {return VariableDeclaration.PLUS_EQUAL;}
+| <MINUSASSIGN>        {return VariableDeclaration.MINUS_EQUAL;}
+| <LSHIFTASSIGN>       {return VariableDeclaration.LSHIFT_EQUAL;}
+| <RSIGNEDSHIFTASSIGN> {return VariableDeclaration.RSIGNEDSHIFT_EQUAL;}
+| <ANDASSIGN>          {return VariableDeclaration.AND_EQUAL;}
+| <XORASSIGN>          {return VariableDeclaration.XOR_EQUAL;}
+| <ORASSIGN>           {return VariableDeclaration.OR_EQUAL;}
+| <DOTASSIGN>          {return VariableDeclaration.DOT_EQUAL;}
+| <TILDEEQUAL>         {return VariableDeclaration.TILDE_EQUAL;}
 }
 
 Expression ConditionalExpression() :
@@ -1227,7 +1381,8 @@ Expression ConditionalOrExpression() :
     (
         <OR_OR> {operator = OperatorIds.OR_OR;}
       | <_ORL>  {operator = OperatorIds.ORL;}
-    ) expr2 = ConditionalAndExpression()
+    )
+    expr2 = ConditionalAndExpression()
     {
       expr = new BinaryExpression(expr,expr2,operator);
     }
@@ -1295,6 +1450,7 @@ Expression AndExpression() :
 {
   expr = EqualityExpression()
   (
+    LOOKAHEAD(1)
     <BIT_AND> expr2 = EqualityExpression()
     {expr = new BinaryExpression(expr,expr2,OperatorIds.AND);}
   )*
@@ -1377,8 +1533,10 @@ Expression AdditiveExpression() :
 {
   expr = MultiplicativeExpression()
   (
-   ( <PLUS>  {operator = OperatorIds.PLUS;}
-   | <MINUS> {operator = OperatorIds.MINUS;} )
+    LOOKAHEAD(1)
+     ( <PLUS>  {operator = OperatorIds.PLUS;}
+     | <MINUS> {operator = OperatorIds.MINUS;}
+  )
    expr2 = MultiplicativeExpression()
   {expr = new BinaryExpression(expr,expr2,operator);}
    )*
@@ -1420,22 +1578,30 @@ 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 = AtUnaryExpression() {return expr;}
+|      */
+  expr = AtNotUnaryExpression() {return expr;}
 }
 
-Expression AtUnaryExpression() :
+/**
+ * An expression prefixed (or not) by one or more @ and !.
+ * @return the expression
+ */
+Expression AtNotUnaryExpression() :
 {
   final Expression expr;
   final int pos = SimpleCharStream.getPosition();
 }
 {
   <AT>
-  expr = AtUnaryExpression()
+  expr = AtNotUnaryExpression()
   {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
 |
+  <BANG>
+  expr = AtNotUnaryExpression()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+|
   expr = UnaryExpressionNoPrefix()
   {return expr;}
 }
@@ -1444,14 +1610,12 @@ Expression AtUnaryExpression() :
 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;}
@@ -1468,18 +1632,21 @@ final int operator;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  (  <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
-   | <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;})
-   expr = PrimaryExpression()
+  (
+      <PLUS_PLUS>   {operator = OperatorIds.PLUS_PLUS;}
+    |
+      <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+  )
+  expr = PrimaryExpression()
   {return new PrefixedUnaryExpression(expr,operator,pos);}
 }
 
 Expression UnaryExpressionNotPlusMinus() :
 {
   final Expression expr;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-//  <BANG> expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
   LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
   expr = CastExpression()         {return expr;}
 | expr = PostfixExpression()      {return expr;}
@@ -1501,57 +1668,74 @@ CastExpression CastExpression() :
 {
 final ConstantIdentifier type;
 final Expression expr;
-final int pos = SimpleCharStream.getPosition();
+final Token token,token1;
 }
 {
-  <LPAREN>
-  (type = Type()
-  | <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());})
+  token1 = <LPAREN>
+  (
+      type = Type()
+    |
+      token = <ARRAY> {type = new ConstantIdentifier(token);}
+  )
   <RPAREN> expr = UnaryExpression()
-  {return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
+  {return new CastExpression(type,expr,token1.sourceStart,expr.sourceEnd);}
 }
 
 Expression PostfixExpression() :
 {
   final Expression expr;
   int operator = -1;
-  final int pos = SimpleCharStream.getPosition();
+  Token token = null;
 }
 {
   expr = PrimaryExpression()
-  [ <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
-  | <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}]
+  [
+      token = <PLUS_PLUS>   {operator = OperatorIds.PLUS_PLUS;}
+    |
+      token = <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+  ]
   {
     if (operator == -1) {
       return expr;
     }
-    return new PostfixedUnaryExpression(expr,operator,pos);
+    return new PostfixedUnaryExpression(expr,operator,token.sourceEnd);
   }
 }
 
 Expression PrimaryExpression() :
 {
+  Expression expr = null;
+  Expression expr2;
+  int assignOperator = -1;
   final Token identifier;
-  Expression expr;
-  final int pos = SimpleCharStream.getPosition();
+  final String var;
+  final int pos;
 }
 {
-  LOOKAHEAD(2)
-  identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
-  {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
-                                                 pos,
-                                                 SimpleCharStream.getPosition()),
-                          expr,
-                          ClassAccess.STATIC);}
+  token = <IDENTIFIER>
+  {
+    expr = new ConstantIdentifier(token);
+  }
   (
-  LOOKAHEAD(PrimarySuffix())
-  expr = PrimarySuffix(expr))*
+    <STATICCLASSACCESS> expr2 = ClassIdentifier()
+    {expr = new ClassAccess(expr,
+                            expr2,
+                            ClassAccess.STATIC);}
+  )*
+  [ expr = Arguments(expr) ]
   {return expr;}
 |
-  expr = PrimaryPrefix()
-  (
-  LOOKAHEAD(PrimarySuffix())
-  expr = PrimarySuffix(expr))*
+  expr = VariableDeclaratorId()
+  [ expr = Arguments(expr) ]
+  {return expr;}
+|
+  token = <NEW>
+  expr = ClassIdentifier()
+  {expr = new PrefixedUnaryExpression(expr,
+                                      OperatorIds.NEW,
+                                      token.sourceStart);
+  }
+  [ expr = Arguments(expr) ]
   {return expr;}
 |
   expr = ArrayDeclarator()
@@ -1573,74 +1757,47 @@ ArrayInitializer ArrayDeclarator() :
   {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
 }
 
-Expression PrimaryPrefix() :
-{
-  final Expression expr;
-  final Token token;
-  final String var;
-  final int pos = SimpleCharStream.getPosition();
-}
-{
-  token = <IDENTIFIER>           {return new ConstantIdentifier(token.image.toCharArray(),
-                                                                pos,
-                                                                SimpleCharStream.getPosition());}
-| <NEW> expr = ClassIdentifier() {return new PrefixedUnaryExpression(expr,
-                                                                     OperatorIds.NEW,
-                                                                     pos);}
-| var = VariableDeclaratorId()  {return new VariableDeclaration(currentSegment,
-                                                                var.toCharArray(),
-                                                                pos,
-                                                                SimpleCharStream.getPosition());}
-}
-
 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());}
-| 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 PrimarySuffix(final Expression prefix) :
-{
-  final AbstractSuffixExpression expr;
-}
-{
-  expr = Arguments(prefix)      {return expr;}
-| expr = VariableSuffix(prefix) {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;
 }
@@ -1656,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
@@ -1675,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) :
@@ -1743,6 +1893,7 @@ final ArrayList list = new ArrayList();
 
 /**
  * A Statement without break.
+ * @return a statement
  */
 Statement StatementNoBreak() :
 {
@@ -1751,34 +1902,11 @@ Statement StatementNoBreak() :
 }
 {
   LOOKAHEAD(2)
-  statement = Expression()
-  try {
-    <SEMICOLON>
-  } catch (ParseException e) {
-    if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
-      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
-      errorLevel   = ERROR;
-      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = SimpleCharStream.getPosition() + 1;
-      throw e;
-    }
-  }
-  {return statement;}
-| LOOKAHEAD(2)
-  statement = LabeledStatement() {return statement;}
-| statement = Block()            {return statement;}
-| statement = EmptyStatement()   {return statement;}
-| statement = StatementExpression()
-  try {
-    <SEMICOLON>
-  } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
-    errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
-    throw e;
-  }
-  {return statement;}
+  statement = expressionStatement()     {return statement;}
+| LOOKAHEAD(1)
+  statement = LabeledStatement()        {return statement;}
+| statement = Block()                   {return statement;}
+| statement = EmptyStatement()          {return statement;}
 | statement = SwitchStatement()         {return statement;}
 | statement = IfStatement()             {return statement;}
 | statement = WhileStatement()          {return statement;}
@@ -1798,6 +1926,31 @@ Statement StatementNoBreak() :
 | statement = defineStatement()         {currentSegment.add((Outlineable)statement);return statement;}
 }
 
+/**
+ * A statement expression.
+ * expression ;
+ * @return an expression
+ */
+Statement expressionStatement() :
+{
+  final Statement statement;
+}
+{
+  statement = Expression()
+  try {
+    <SEMICOLON>
+  } catch (ParseException e) {
+    if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+      errorLevel   = ERROR;
+      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = SimpleCharStream.getPosition() + 1;
+      throw e;
+    }
+  }
+  {return statement;}
+}
+
 Define defineStatement() :
 {
   final int start = SimpleCharStream.getPosition();
@@ -1812,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()
@@ -1830,13 +1983,10 @@ Define defineStatement() :
     errorLevel   = ERROR;
     errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd     = SimpleCharStream.getPosition() + 1;
-    processParseException(e);
+    processParseExceptionDebug(e);
   }
   try {
-    (   defineValue = PrintExpression()
-      | LOOKAHEAD(varAssignation())
-        defineValue = varAssignation()
-      | defineValue = ConditionalExpression())
+    defineValue = Expression()
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
     errorLevel   = ERROR;
@@ -1851,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,
@@ -1956,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();
@@ -2000,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());}
 }
 
 /**
@@ -2049,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);
@@ -2088,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;
@@ -2163,20 +2315,12 @@ Statement BlockStatement() :
   final Statement statement;
 }
 {
-  try {
   statement = Statement()         {if (phpDocument == currentSegment) pushOnAstNodes(statement);
                                    return statement;}
-  } catch (ParseException e) {
-    if (errorMessage != null) throw e;
-    errorMessage = "statement expected";
-    errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
-  }
 | statement = ClassDeclaration()  {return statement;}
 | statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
                                    currentSegment.add((MethodDeclaration) statement);
+                                   ((MethodDeclaration) statement).analyzeCode();
                                    return statement;}
 }
 
@@ -2191,9 +2335,13 @@ Statement BlockStatementNoBreak() :
   statement = StatementNoBreak()  {return statement;}
 | statement = ClassDeclaration()  {return statement;}
 | statement = MethodDeclaration() {currentSegment.add((MethodDeclaration) statement);
+                                   ((MethodDeclaration) statement).analyzeCode();
                                    return statement;}
 }
 
+/**
+ * used only by ForInit()
+ */
 VariableDeclaration[] LocalVariableDeclaration() :
 {
   final ArrayList list = new ArrayList();
@@ -2209,25 +2357,29 @@ VariableDeclaration[] LocalVariableDeclaration() :
   return vars;}
 }
 
+/**
+ * used only by LocalVariableDeclaration().
+ */
 VariableDeclaration LocalVariableDeclarator() :
 {
-  final String varName;
+  final Variable varName;
   Expression initializer = null;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  varName = VariableDeclaratorId() [ <ASSIGN> initializer = Expression() ]
+  varName = Variable() [ <ASSIGN> initializer = Expression() ]
   {
    if (initializer == null) {
     return new VariableDeclaration(currentSegment,
-                                  varName.toCharArray(),
-                                  pos,
-                                  SimpleCharStream.getPosition());
+                                   varName,
+                                   pos,
+                                   SimpleCharStream.getPosition());
    }
     return new VariableDeclaration(currentSegment,
-                                    varName.toCharArray(),
-                                    initializer,
-                                    pos);
+                                   varName,
+                                   initializer,
+                                   VariableDeclaration.EQUAL,
+                                   pos);
   }
 }
 
@@ -2241,6 +2393,9 @@ EmptyStatement EmptyStatement() :
    return new EmptyStatement(pos-1,pos);}
 }
 
+/**
+ * used only by StatementExpressionList() which is used only by ForInit() and ForStatement()
+ */
 Expression StatementExpression() :
 {
   final Expression expr,expr2;
@@ -2256,8 +2411,6 @@ Expression StatementExpression() :
   | <MINUS_MINUS> {return new PostfixedUnaryExpression(expr,
                                                 OperatorIds.MINUS_MINUS,
                                                 SimpleCharStream.getPosition());}
-  | operator = AssignmentOperator() expr2 = Expression()
-    {return new BinaryExpression(expr,expr2,operator);}
   ]
   {return expr;}
 }
@@ -2483,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 {
@@ -2493,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;}
 }