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 11e4e8a..daf63e2 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -50,9 +50,6 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
  */
 public final class PHPParser extends PHPParserSuperclass {
 
-  /** The file that is parsed. */
-  private static IFile fileToParse;
-
   /** The current segment. */
   private static OutlineableWithChildren currentSegment;
 
@@ -83,8 +80,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() {
@@ -92,7 +91,7 @@ public final class PHPParser extends PHPParserSuperclass {
 
   public PHPParser(final IFile fileToParse) {
     this(new StringReader(""));
-    this.fileToParse = fileToParse;
+    PHPParser.fileToParse = fileToParse;
   }
 
   /**
@@ -108,12 +107,12 @@ public final class PHPParser extends PHPParserSuperclass {
    * Add an php node on the stack.
    * @param node the node that will be added to the stack
    */
-  private static final void pushOnAstNodes(AstNode node) {
+  private static final void pushOnAstNodes(final AstNode node) {
     try {
       nodes[++nodePtr] = node;
     } catch (IndexOutOfBoundsException e) {
-      int oldStackLength = nodes.length;
-      AstNode[] oldStack = nodes;
+      final int oldStackLength = nodes.length;
+      final AstNode[] oldStack = nodes;
       nodes = new AstNode[oldStackLength + AstStackIncrement];
       System.arraycopy(oldStack, 0, nodes, 0, oldStackLength);
       nodePtr = oldStackLength;
@@ -150,6 +149,10 @@ public final class PHPParser extends PHPParserSuperclass {
    * @param e the ParseException
    */
   private static void processParseException(final ParseException e) {
+    if (PARSER_DEBUG) {
+      e.printStackTrace();
+      return;
+    }
     if (errorMessage == null) {
       PHPeclipsePlugin.log(e);
       errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
@@ -158,10 +161,11 @@ public final class PHPParser extends PHPParserSuperclass {
     }
     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) {
@@ -193,12 +197,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++) {
@@ -208,9 +212,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>", "");
@@ -277,17 +281,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());
@@ -500,16 +503,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"]
@@ -636,7 +639,7 @@ PHPEchoBlock phpEchoBlock() :
 {
   final Expression expr;
   final int pos = SimpleCharStream.getPosition();
-  PHPEchoBlock echoBlock;
+  final PHPEchoBlock echoBlock;
 }
 {
   <PHPECHOSTART> expr = Expression() [ <SEMICOLON> ] <PHPEND>
@@ -655,8 +658,7 @@ void Php() :
 ClassDeclaration ClassDeclaration() :
 {
   final ClassDeclaration classDeclaration;
-  final Token className;
-  Token superclassName = null;
+  final Token className,superclassName;
   final int pos;
   char[] classNameImage = SYNTAX_ERROR_CHAR;
   char[] superclassNameImage = null;
@@ -711,58 +713,61 @@ ClassDeclaration ClassDeclaration() :
    return classDeclaration;}
 }
 
-void ClassBody(ClassDeclaration classDeclaration) :
+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;
+    processParseException(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;
+    processParseException(e);
   }
 }
 
 /**
  * A class can contain only methods and fields.
  */
-void ClassBodyDeclaration(ClassDeclaration classDeclaration) :
+void ClassBodyDeclaration(final ClassDeclaration classDeclaration) :
 {
-  MethodDeclaration method;
-  FieldDeclaration field;
+  final MethodDeclaration method;
+  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() :
 {
   VariableDeclaration variableDeclaration;
-  VariableDeclaration[] list;
+  final VariableDeclaration[] list;
   final ArrayList arrayList = new ArrayList();
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  <VAR> variableDeclaration = VariableDeclarator()
+  <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
   {arrayList.add(variableDeclaration);
    outlineInfo.addVariable(new String(variableDeclaration.name));}
-  ( <COMMA> variableDeclaration = VariableDeclarator()
+  (
+    <COMMA> variableDeclaration = VariableDeclaratorNoSuffix()
       {arrayList.add(variableDeclaration);
        outlineInfo.addVariable(new String(variableDeclaration.name));}
   )*
@@ -784,6 +789,44 @@ FieldDeclaration FieldDeclaration() :
                                currentSegment);}
 }
 
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ */
+VariableDeclaration VariableDeclaratorNoSuffix() :
+{
+  final Token varName;
+  Expression initializer = null;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  varName = <DOLLAR_ID>
+  [
+    <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;
+      processParseException(e);
+    }
+  ]
+  {
+  if (initializer == null) {
+    return new VariableDeclaration(currentSegment,
+                                   varName.image.substring(1).toCharArray(),
+                                   pos,
+                                   SimpleCharStream.getPosition());
+  }
+  return new VariableDeclaration(currentSegment,
+                                 varName.image.substring(1).toCharArray(),
+                                 initializer,
+                                 VariableDeclaration.EQUAL,
+                                 pos);
+  }
+}
+
 VariableDeclaration VariableDeclarator() :
 {
   final String varName;
@@ -801,7 +844,7 @@ VariableDeclaration VariableDeclarator() :
       errorLevel   = ERROR;
       errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
       errorEnd   = SimpleCharStream.getPosition() + 1;
-      throw e;
+      processParseException(e);
     }
   ]
   {
@@ -814,6 +857,7 @@ VariableDeclaration VariableDeclarator() :
     return new VariableDeclaration(currentSegment,
                                     varName.toCharArray(),
                                     initializer,
+                                    VariableDeclaration.EQUAL,
                                     pos);
   }
 }
@@ -824,24 +868,24 @@ VariableDeclaration VariableDeclarator() :
  */
 String VariableDeclaratorId() :
 {
-  String expr;
+  final String var;
   Expression expression = null;
-  final StringBuffer buff = new StringBuffer();
   final int pos = SimpleCharStream.getPosition();
   ConstantIdentifier ex;
 }
 {
   try {
-    expr = Variable()
-    ( LOOKAHEAD(2)
-      {ex = new ConstantIdentifier(expr.toCharArray(),
+    var = Variable()
+    (
+      LOOKAHEAD(2)
+      {ex = new ConstantIdentifier(var.toCharArray(),
                                    pos,
                                    SimpleCharStream.getPosition());}
       expression = VariableSuffix(ex)
     )*
     {
      if (expression == null) {
-       return expr;
+       return var;
      }
      return expression.toStringExpression();
     }
@@ -889,7 +933,7 @@ String Variable():
 String VariableName():
 {
   final StringBuffer buff;
-  String expr = null;
+  final String expr;
   Expression expression = null;
   final Token token;
 }
@@ -955,12 +999,13 @@ Expression VariableInitializer() :
 
 ArrayVariableDeclaration ArrayVariable() :
 {
-Expression expr,expr2;
+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());}
 }
@@ -971,16 +1016,20 @@ 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>
   {
-  ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+  final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
   list.toArray(vars);
   return vars;}
 }
@@ -1041,12 +1090,13 @@ MethodDeclaration MethodDeclarator() :
     processParseException(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;}
 }
 
 /**
@@ -1068,13 +1118,14 @@ Hashtable FormalParameters() :
     errorEnd   = SimpleCharStream.getPosition() + 1;
     processParseException(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) {
@@ -1097,7 +1148,7 @@ VariableDeclaration FormalParameter() :
   Token token = null;
 }
 {
-  [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
+  [token = <BIT_AND>] variableDeclaration = VariableDeclaratorNoSuffix()
   {
     if (token != null) {
       variableDeclaration.setReference(true);
@@ -1131,75 +1182,86 @@ ConstantIdentifier Type() :
 Expression Expression() :
 {
   final Expression expr;
-  Token bangToken = null;
+  Expression initializer = null;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  <BANG> expr = Expression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
-| expr = ExpressionNoBang() {return expr;}
+  expr = ConditionalExpression() {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() :
 {
-  String varName;
-  final Expression initializer;
-  final int assignOperator;
+  Expression expr = null;
+  int assignOperator = -1;
+  String var;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  varName = VariableDeclaratorId()
-  assignOperator = AssignmentOperator()
+  expr = PrintExpression()   {return expr;}
+| expr = ListExpression()    {return expr;}
+|
+  var = VariableDeclaratorId()
+  [
+    assignOperator = AssignmentOperator()
     try {
-      initializer = Expression()
+      expr = Expression()
     } catch (ParseException e) {
       if (errorMessage != null) {
         throw e;
       }
-      errorMessage = "expression expected";
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
       errorLevel   = ERROR;
-      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = SimpleCharStream.getPosition() + 1;
+      errorEnd   = SimpleCharStream.getPosition();
       throw e;
     }
-    {return new VarAssignation(varName.toCharArray(),
-                               initializer,
-                               assignOperator,
-                               pos,
-                               SimpleCharStream.getPosition());}
+  ]
+  {
+    if (assignOperator == -1) {
+      return new VariableDeclaration(currentSegment,
+                                     var.toCharArray(),
+                                     pos,
+                                     SimpleCharStream.getPosition());
+    }
+    return new VariableDeclaration(currentSegment,
+                                   var.toCharArray(),
+                                   expr,
+                                   assignOperator,
+                                   pos);
+    }
+  {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() :
@@ -1229,7 +1291,8 @@ Expression ConditionalOrExpression() :
     (
         <OR_OR> {operator = OperatorIds.OR_OR;}
       | <_ORL>  {operator = OperatorIds.ORL;}
-    ) expr2 = ConditionalAndExpression()
+    )
+    expr2 = ConditionalAndExpression()
     {
       expr = new BinaryExpression(expr,expr2,operator);
     }
@@ -1297,6 +1360,7 @@ Expression AndExpression() :
 {
   expr = EqualityExpression()
   (
+    LOOKAHEAD(1)
     <BIT_AND> expr2 = EqualityExpression()
     {expr = new BinaryExpression(expr,expr2,OperatorIds.AND);}
   )*
@@ -1379,6 +1443,7 @@ Expression AdditiveExpression() :
 {
   expr = MultiplicativeExpression()
   (
+  LOOKAHEAD(1)
    ( <PLUS>  {operator = OperatorIds.PLUS;}
    | <MINUS> {operator = OperatorIds.MINUS;} )
    expr2 = MultiplicativeExpression()
@@ -1418,7 +1483,7 @@ Expression MultiplicativeExpression() :
  */
 Expression UnaryExpression() :
 {
-  Expression expr;
+  final Expression expr;
   final int pos = SimpleCharStream.getPosition();
 }
 {
@@ -1430,7 +1495,7 @@ Expression UnaryExpression() :
 
 Expression AtUnaryExpression() :
 {
-  Expression expr;
+  final Expression expr;
   final int pos = SimpleCharStream.getPosition();
 }
 {
@@ -1445,14 +1510,17 @@ Expression AtUnaryExpression() :
 
 Expression UnaryExpressionNoPrefix() :
 {
-  Expression expr;
-  int operator;
+  final Expression expr;
+  final int operator;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  (  <PLUS>  {operator = OperatorIds.PLUS;}
-   | <MINUS> {operator = OperatorIds.MINUS;})
-   expr = UnaryExpression()
+  (
+      <PLUS>  {operator = OperatorIds.PLUS;}
+    |
+      <MINUS> {operator = OperatorIds.MINUS;}
+  )
+  expr = UnaryExpression()
   {return new PrefixedUnaryExpression(expr,operator,pos);}
 |
   expr = PreIncDecExpression()
@@ -1470,19 +1538,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() :
 {
-  Expression expr;
+  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;}
@@ -1508,22 +1578,28 @@ final int pos = SimpleCharStream.getPosition();
 }
 {
   <LPAREN>
-  (type = Type()
-  | <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());})
+  (
+      type = Type()
+    |
+      <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());}
+  )
   <RPAREN> expr = UnaryExpression()
   {return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
 }
 
 Expression PostfixExpression() :
 {
-  Expression expr;
+  final Expression expr;
   int operator = -1;
   final int pos = SimpleCharStream.getPosition();
 }
 {
   expr = PrimaryExpression()
-  [ <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
-  | <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}]
+  [
+      <PLUS_PLUS>   {operator = OperatorIds.PLUS_PLUS;}
+    |
+      <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+  ]
   {
     if (operator == -1) {
       return expr;
@@ -1534,33 +1610,44 @@ Expression PostfixExpression() :
 
 Expression PrimaryExpression() :
 {
-  final Token identifier;
   Expression expr;
+  int assignOperator = -1;
+  final Token identifier;
+  final String var;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  LOOKAHEAD(2)
-  identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
-  {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
-                                                 pos,
-                                                 SimpleCharStream.getPosition()),
-                          expr,
-                          ClassAccess.STATIC);}
-  (
-  LOOKAHEAD(PrimarySuffix())
-  expr = PrimarySuffix(expr))*
+  identifier = <IDENTIFIER>
+  {expr = new ConstantIdentifier(token.image.toCharArray(),
+                                 pos,
+                                 SimpleCharStream.getPosition());}
+  (expr = PrimarySuffix(expr))*
   {return expr;}
 |
-  expr = PrimaryPrefix()
-  (
-  LOOKAHEAD(PrimarySuffix())
-  expr = PrimarySuffix(expr))*
+  expr = ArrayDeclarator()
   {return expr;}
 |
-  expr = ArrayDeclarator()
+  <NEW> expr = ClassIdentifier()
+  {expr = new PrefixedUnaryExpression(expr,OperatorIds.NEW,pos);}
+  [expr = Arguments(expr)]
   {return expr;}
 }
 
+AbstractSuffixExpression PrimarySuffix(final Expression prefix) :
+{
+  final AbstractSuffixExpression suffix;
+  final Expression expr;
+}
+{
+  suffix = Arguments(prefix)      {return suffix;}
+| suffix = VariableSuffix(prefix) {return suffix;}
+| <STATICCLASSACCESS> expr = ClassIdentifier()
+  {suffix = new ClassAccess(prefix,
+                            expr,
+                            ClassAccess.STATIC);
+   return suffix;}
+}
+
 /**
  * An array declarator.
  * array(vars)
@@ -1576,26 +1663,6 @@ 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;
@@ -1622,26 +1689,19 @@ ConstantIdentifier ClassIdentifier():
   final String 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());}
 }
 
-AbstractSuffixExpression PrimarySuffix(Expression prefix) :
-{
-  final AbstractSuffixExpression expr;
-}
-{
-  expr = Arguments(prefix)      {return expr;}
-| expr = VariableSuffix(prefix) {return expr;}
-}
-
-AbstractSuffixExpression VariableSuffix(Expression prefix) :
+AbstractSuffixExpression VariableSuffix(final Expression prefix) :
 {
   String expr = null;
   final int pos = SimpleCharStream.getPosition();
@@ -1695,7 +1755,7 @@ Literal Literal() :
                                     return new NullLiteral(pos-4,pos);}
 }
 
-FunctionCall Arguments(Expression func) :
+FunctionCall Arguments(final Expression func) :
 {
 Expression[] args = null;
 }
@@ -1739,7 +1799,7 @@ final ArrayList list = new ArrayList();
       }
    )*
    {
-   Expression[] arguments = new Expression[list.size()];
+   final Expression[] arguments = new Expression[list.size()];
    list.toArray(arguments);
    return arguments;}
 }
@@ -1767,11 +1827,11 @@ Statement StatementNoBreak() :
     }
   }
   {return statement;}
-| LOOKAHEAD(2)
+| LOOKAHEAD(1)
   statement = LabeledStatement() {return statement;}
 | statement = Block()            {return statement;}
 | statement = EmptyStatement()   {return statement;}
-| statement = StatementExpression()
+/*| statement = StatementExpression()
   try {
     <SEMICOLON>
   } catch (ParseException e) {
@@ -1781,7 +1841,7 @@ Statement StatementNoBreak() :
     errorEnd     = SimpleCharStream.getPosition() + 1;
     throw e;
   }
-  {return statement;}
+  {return statement;}      */
 | statement = SwitchStatement()         {return statement;}
 | statement = IfStatement()             {return statement;}
 | statement = WhileStatement()          {return statement;}
@@ -1836,10 +1896,7 @@ Define defineStatement() :
     processParseException(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;
@@ -1881,8 +1938,8 @@ Statement Statement() :
 HTMLBlock htmlBlock() :
 {
   final int startIndex = nodePtr;
-  AstNode[] blockNodes;
-  int nbNodes;
+  final AstNode[] blockNodes;
+  final int nbNodes;
 }
 {
   <PHPEND> (phpEchoBlock())*
@@ -1960,8 +2017,8 @@ PrintExpression PrintExpression() :
 ListExpression ListExpression() :
 {
   String expr = null;
-  Expression expression = null;
-  ArrayList list = new ArrayList();
+  final Expression expression;
+  final ArrayList list = new ArrayList();
   final int pos = SimpleCharStream.getPosition();
 }
 {
@@ -1990,8 +2047,7 @@ ListExpression ListExpression() :
       errorEnd     = SimpleCharStream.getPosition() + 1;
       throw e;
     }
-    expr = VariableDeclaratorId()
-    {list.add(expr);}
+    [expr = VariableDeclaratorId() {list.add(expr);}]
   )*
   try {
     <RPAREN>
@@ -2004,7 +2060,7 @@ ListExpression ListExpression() :
   }
   [ <ASSIGN> expression = Expression()
     {
-    String[] strings = new String[list.size()];
+    final String[] strings = new String[list.size()];
     list.toArray(strings);
     return new ListExpression(strings,
                               expression,
@@ -2012,7 +2068,7 @@ ListExpression ListExpression() :
                               SimpleCharStream.getPosition());}
   ]
   {
-    String[] strings = new String[list.size()];
+    final String[] strings = new String[list.size()];
     list.toArray(strings);
     return new ListExpression(strings,pos,SimpleCharStream.getPosition());}
 }
@@ -2045,7 +2101,7 @@ EchoStatement EchoStatement() :
       throw e;
     }
   }
-  {Expression[] exprs = new Expression[expressions.size()];
+  {final Expression[] exprs = new Expression[expressions.size()];
    expressions.toArray(exprs);
    return new EchoStatement(exprs,pos);}
 }
@@ -2054,8 +2110,8 @@ GlobalStatement GlobalStatement() :
 {
    final int pos = SimpleCharStream.getPosition();
    String expr;
-   ArrayList vars = new ArrayList();
-   GlobalStatement global;
+   final ArrayList vars = new ArrayList();
+   final GlobalStatement global;
 }
 {
   <GLOBAL>
@@ -2068,7 +2124,7 @@ GlobalStatement GlobalStatement() :
   try {
     <SEMICOLON>
     {
-    String[] strings = new String[vars.size()];
+    final String[] strings = new String[vars.size()];
     vars.toArray(strings);
     global = new GlobalStatement(currentSegment,
                                  strings,
@@ -2097,7 +2153,7 @@ StaticStatement StaticStatement() :
   try {
     <SEMICOLON>
     {
-    String[] strings = new String[vars.size()];
+    final String[] strings = new String[vars.size()];
     vars.toArray(strings);
     return new StaticStatement(strings,
                                 pos,
@@ -2157,7 +2213,7 @@ Block Block() :
     throw e;
   }
   {
-  Statement[] statements = new Statement[list.size()];
+  final Statement[] statements = new Statement[list.size()];
   list.toArray(statements);
   return new Block(statements,pos,SimpleCharStream.getPosition());}
 }
@@ -2167,20 +2223,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;}
 }
 
@@ -2195,6 +2243,7 @@ Statement BlockStatementNoBreak() :
   statement = StatementNoBreak()  {return statement;}
 | statement = ClassDeclaration()  {return statement;}
 | statement = MethodDeclaration() {currentSegment.add((MethodDeclaration) statement);
+                                   ((MethodDeclaration) statement).analyzeCode();
                                    return statement;}
 }
 
@@ -2208,7 +2257,7 @@ VariableDeclaration[] LocalVariableDeclaration() :
   {list.add(var);}
   ( <COMMA> var = LocalVariableDeclarator() {list.add(var);})*
   {
-    VariableDeclaration[] vars = new VariableDeclaration[list.size()];
+    final VariableDeclaration[] vars = new VariableDeclaration[list.size()];
     list.toArray(vars);
   return vars;}
 }
@@ -2231,6 +2280,7 @@ VariableDeclaration LocalVariableDeclarator() :
     return new VariableDeclaration(currentSegment,
                                     varName.toCharArray(),
                                     initializer,
+                                    VariableDeclaration.EQUAL,
                                     pos);
   }
 }
@@ -2247,8 +2297,8 @@ EmptyStatement EmptyStatement() :
 
 Expression StatementExpression() :
 {
-  Expression expr,expr2;
-  int operator;
+  final Expression expr,expr2;
+  final int operator;
 }
 {
   expr = PreIncDecExpression() {return expr;}
@@ -2260,8 +2310,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;}
 }
@@ -2319,7 +2367,7 @@ AbstractCase[] switchStatementBrace() :
   try {
     <RBRACE>
     {
-    AbstractCase[] abcase = new AbstractCase[cases.size()];
+    final AbstractCase[] abcase = new AbstractCase[cases.size()];
     cases.toArray(abcase);
     return abcase;}
   } catch (ParseException e) {
@@ -2365,7 +2413,7 @@ AbstractCase[] switchStatementColon(final int start, final int end) :
   try {
     <SEMICOLON>
     {
-    AbstractCase[] abcase = new AbstractCase[cases.size()];
+    final AbstractCase[] abcase = new AbstractCase[cases.size()];
     cases.toArray(abcase);
     return abcase;}
   } catch (ParseException e) {
@@ -2390,7 +2438,7 @@ AbstractCase switchLabel0() :
   | statement = htmlBlock()             {stmts.add(statement);})*
   [ statement = BreakStatement()        {stmts.add(statement);}]
   {
-  Statement[] stmtsArray = new Statement[stmts.size()];
+  final Statement[] stmtsArray = new Statement[stmts.size()];
   stmts.toArray(stmtsArray);
   if (expr == null) {//it's a default
     return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition());
@@ -2466,8 +2514,8 @@ Break BreakStatement() :
 IfStatement IfStatement() :
 {
   final int pos = SimpleCharStream.getPosition();
-  Expression condition;
-  IfStatement ifStatement;
+  final Expression condition;
+  final IfStatement ifStatement;
 }
 {
   <IF> condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2)
@@ -2502,18 +2550,18 @@ Expression Condition(final String keyword) :
   {return condition;}
 }
 
-IfStatement IfStatement0(Expression condition, final int start,final int end) :
+IfStatement IfStatement0(final Expression condition, final int start,final int end) :
 {
   Statement statement;
-  Statement stmt;
+  final Statement stmt;
   final Statement[] statementsArray;
   ElseIf elseifStatement;
   Else elseStatement = null;
-  ArrayList stmts;
+  final ArrayList stmts;
   final ArrayList elseIfList = new ArrayList();
-  ElseIf[] elseIfs;
+  final ElseIf[] elseIfs;
   int pos = SimpleCharStream.getPosition();
-  int endStatements;
+  final int endStatements;
 }
 {
   <COLON>
@@ -2607,7 +2655,7 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) :
 
 ElseIf ElseIfStatementColon() :
 {
-  Expression condition;
+  final Expression condition;
   Statement statement;
   final ArrayList list = new ArrayList();
   final int pos = SimpleCharStream.getPosition();
@@ -2617,7 +2665,7 @@ ElseIf ElseIfStatementColon() :
   <COLON> (  statement = Statement() {list.add(statement);}
            | statement = htmlBlock() {list.add(statement);})*
   {
-  Statement[] stmtsArray = new Statement[list.size()];
+  final Statement[] stmtsArray = new Statement[list.size()];
   list.toArray(stmtsArray);
   return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());}
 }
@@ -2632,22 +2680,22 @@ Else ElseStatementColon() :
   <ELSE> <COLON> (  statement = Statement() {list.add(statement);}
                   | statement = htmlBlock() {list.add(statement);})*
   {
-  Statement[] stmtsArray = new Statement[list.size()];
+  final Statement[] stmtsArray = new Statement[list.size()];
   list.toArray(stmtsArray);
   return new Else(stmtsArray,pos,SimpleCharStream.getPosition());}
 }
 
 ElseIf ElseIfStatement() :
 {
-  Expression condition;
-  Statement statement;
+  final Expression condition;
+  final Statement statement;
   final ArrayList list = new ArrayList();
   final int pos = SimpleCharStream.getPosition();
 }
 {
   <ELSEIF> condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/}
   {
-  Statement[] stmtsArray = new Statement[list.size()];
+  final Statement[] stmtsArray = new Statement[list.size()];
   list.toArray(stmtsArray);
   return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());}
 }
@@ -2695,7 +2743,7 @@ Statement WhileStatement0(final int start, final int end) :
   try {
     <SEMICOLON>
     {
-    Statement[] stmtsArray = new Statement[stmts.size()];
+    final Statement[] stmtsArray = new Statement[stmts.size()];
     stmts.toArray(stmtsArray);
     return new Block(stmtsArray,pos,SimpleCharStream.getPosition());}
   } catch (ParseException e) {
@@ -2859,7 +2907,7 @@ final int startBlock, endBlock;
       try {
         <SEMICOLON>
         {
-        Statement[] stmtsArray = new Statement[list.size()];
+        final Statement[] stmtsArray = new Statement[list.size()];
         list.toArray(stmtsArray);
         return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());}
       } catch (ParseException e) {
@@ -2874,7 +2922,7 @@ final int startBlock, endBlock;
 
 Expression[] ForInit() :
 {
-  Expression[] exprs;
+  final Expression[] exprs;
 }
 {
   LOOKAHEAD(LocalVariableDeclaration())
@@ -2888,13 +2936,13 @@ Expression[] ForInit() :
 Expression[] StatementExpressionList() :
 {
   final ArrayList list = new ArrayList();
-  Expression expr;
+  final Expression expr;
 }
 {
   expr = StatementExpression()   {list.add(expr);}
   (<COMMA> StatementExpression() {list.add(expr);})*
   {
-  Expression[] exprsArray = new Expression[list.size()];
+  final Expression[] exprsArray = new Expression[list.size()];
   list.toArray(exprsArray);
   return exprsArray;}
 }