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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 0d76a4c..9ad3eff 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -1,3 +1,4 @@
+
 options {
   LOOKAHEAD = 1;
   CHOICE_AMBIGUITY_CHECK = 2;
@@ -17,6 +18,7 @@ options {
   BUILD_TOKEN_MANAGER = true;
   SANITY_CHECK = true;
   FORCE_LA_CHECK = false;
+  COMMON_TOKEN_ACTION = true;
 }
 
 PARSER_BEGIN(PHPParser)
@@ -29,7 +31,6 @@ import org.eclipse.ui.texteditor.MarkerUtilities;
 import org.eclipse.jface.preference.IPreferenceStore;
 
 import java.util.Hashtable;
-import java.util.Enumeration;
 import java.util.ArrayList;
 import java.io.StringReader;
 import java.io.*;
@@ -39,7 +40,9 @@ import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 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.
@@ -50,8 +53,9 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
  */
 public final class PHPParser extends PHPParserSuperclass {
 
-  /** The file that is parsed. */
-  private static IFile fileToParse;
+//todo : fix the variables names bug
+//todo : handle tilde operator
+
 
   /** The current segment. */
   private static OutlineableWithChildren currentSegment;
@@ -60,9 +64,6 @@ public final class PHPParser extends PHPParserSuperclass {
   private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
   static PHPOutlineInfo outlineInfo;
 
-  public static MethodDeclaration currentFunction;
-  private static boolean assigning;
-
   /** The error level of the current ParseException. */
   private static int errorLevel = ERROR;
   /** The message of the current ParseException. If it's null it's because the parse exception wasn't handled */
@@ -71,6 +72,8 @@ public final class PHPParser extends PHPParserSuperclass {
   private static int errorStart = -1;
   private static int errorEnd = -1;
   private static PHPDocument phpDocument;
+
+  private static final String SYNTAX_ERROR_CHAR = "syntax error";
   /**
    * The point where html starts.
    * It will be used by the token manager to create HTMLCode objects
@@ -84,8 +87,10 @@ public final class PHPParser extends PHPParserSuperclass {
   /** The cursor in expression stack. */
   private static int nodePtr;
 
+  public static final boolean PARSER_DEBUG = true;
+
   public final void setFileToParse(final IFile fileToParse) {
-    this.fileToParse = fileToParse;
+    PHPParser.fileToParse = fileToParse;
   }
 
   public PHPParser() {
@@ -93,7 +98,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();
   }
 
   /**
@@ -109,12 +154,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;
@@ -122,44 +167,10 @@ public final class PHPParser extends PHPParserSuperclass {
     }
   }
 
-  public static final void phpParserTester(final String strEval) throws CoreException, ParseException {
-    PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
-    final StringReader stream = new StringReader(strEval);
-    if (jj_input_stream == null) {
-      jj_input_stream = new SimpleCharStream(stream, 1, 1);
-    }
-    ReInit(new StringReader(strEval));
-    init();
-    phpTest();
-  }
-
-  public static final void htmlParserTester(final File fileName) throws CoreException, ParseException {
-    try {
-      final Reader stream = new FileReader(fileName);
-      if (jj_input_stream == null) {
-        jj_input_stream = new SimpleCharStream(stream, 1, 1);
-      }
-      ReInit(stream);
-      init();
-      phpFile();
-    } catch (FileNotFoundException e) {
-      e.printStackTrace();  //To change body of catch statement use Options | File Templates.
-    }
-  }
-
-  public static final void htmlParserTester(final String strEval) throws CoreException, ParseException {
-    final StringReader stream = new StringReader(strEval);
-    if (jj_input_stream == null) {
-      jj_input_stream = new SimpleCharStream(stream, 1, 1);
-    }
-    ReInit(stream);
-    init();
-    phpFile();
-  }
-
   public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
-    currentSegment = new PHPDocument(parent);
-    outlineInfo = new PHPOutlineInfo(parent);
+    phpDocument = new PHPDocument(parent,"_root".toCharArray());
+    currentSegment = phpDocument;
+    outlineInfo = new PHPOutlineInfo(parent, currentSegment);
     final StringReader stream = new StringReader(s);
     if (jj_input_stream == null) {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
@@ -168,9 +179,11 @@ public final class PHPParser extends PHPParserSuperclass {
     init();
     try {
       parse();
-      phpDocument = new PHPDocument(null);
-      phpDocument.nodes = nodes;
-      PHPeclipsePlugin.log(1,phpDocument.toString());
+      phpDocument.nodes = new AstNode[nodes.length];
+      System.arraycopy(nodes,0,phpDocument.nodes,0,nodes.length);
+      if (PHPeclipsePlugin.DEBUG) {
+        PHPeclipsePlugin.log(1,phpDocument.toString());
+      }
     } catch (ParseException e) {
       processParseException(e);
     }
@@ -178,6 +191,19 @@ public final class PHPParser extends PHPParserSuperclass {
   }
 
   /**
+   * This function will throw the exception if we are in debug mode
+   * and process it if we are in production mode.
+   * this should be fast since the PARSER_DEBUG is static final so the difference will be at compile time
+   * @param e the exception
+   * @throws ParseException the thrown exception
+   */
+  private static void processParseExceptionDebug(final ParseException e) throws ParseException {
+    if (PARSER_DEBUG) {
+      throw e;
+    }
+    processParseException(e);
+  }
+  /**
    * This method will process the parse exception.
    * If the error message is null, the parse exception wasn't catched and a trace is written in the log
    * @param e the ParseException
@@ -186,15 +212,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 = jj_input_stream.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) {
@@ -202,17 +229,17 @@ public final class PHPParser extends PHPParserSuperclass {
       if (errorStart == -1) {
         setMarker(fileToParse,
                   errorMessage,
-                  jj_input_stream.tokenBegin,
-                  jj_input_stream.tokenBegin + e.currentToken.image.length(),
+                  e.currentToken.sourceStart,
+                  e.currentToken.sourceEnd,
                   errorLevel,
-                  "Line " + e.currentToken.beginLine);
+                  "Line " + e.currentToken.beginLine+", "+e.currentToken.sourceStart+":"+e.currentToken.sourceEnd);
       } else {
         setMarker(fileToParse,
                   errorMessage,
                   errorStart,
                   errorEnd,
                   errorLevel,
-                  "Line " + e.currentToken.beginLine);
+                  "Line " + e.currentToken.beginLine+", "+errorStart+":"+errorEnd);
         errorStart = -1;
         errorEnd = -1;
       }
@@ -221,42 +248,17 @@ public final class PHPParser extends PHPParserSuperclass {
     }
   }
 
-  /**
-   * Create markers according to the external parser output
-   */
-  private static void createMarkers(final String output, final IFile file) throws CoreException {
-    // delete all markers
-    file.deleteMarkers(IMarker.PROBLEM, false, 0);
-
-    int indx = 0;
-    int brIndx;
-    boolean flag = true;
-    while ((brIndx = output.indexOf("<br />", indx)) != -1) {
-      // newer php error output (tested with 4.2.3)
-      scanLine(output, file, indx, brIndx);
-      indx = brIndx + 6;
-      flag = false;
-    }
-    if (flag) {
-      while ((brIndx = output.indexOf("<br>", indx)) != -1) {
-        // older php error output (tested with 4.2.3)
-        scanLine(output, file, indx, brIndx);
-        indx = brIndx + 4;
-      }
-    }
-  }
-
   private static void scanLine(final String output,
                                final IFile file,
                                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++) {
@@ -266,9 +268,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>", "");
@@ -287,7 +289,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);
@@ -327,14 +329,35 @@ public final class PHPParser extends PHPParserSuperclass {
    * Put a new html block in the stack.
    */
   public static final void createNewHTMLCode() {
-    final int currentPosition = SimpleCharStream.getPosition();
-    if (currentPosition == htmlStart) {
+    final int currentPosition = token.sourceStart;
+    if (currentPosition == htmlStart ||
+          currentPosition < htmlStart ||
+          currentPosition > SimpleCharStream.currentBuffer.length()) {
       return;
     }
-    final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition).toCharArray();
+    final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,
+                                                                  currentPosition).toCharArray();
     pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
   }
 
+  /** Create a new task. */
+  public static final void createNewTask(final int todoStart) {
+    final String  todo = SimpleCharStream.currentBuffer.substring(todoStart,
+                                                                  SimpleCharStream.currentBuffer.indexOf("\n",
+                                                                                                         todoStart)-1);
+    if (!PARSER_DEBUG) {
+      try {
+        setMarker(fileToParse,
+                  todo,
+                  SimpleCharStream.getBeginLine(),
+                  TASK,
+                  "Line "+SimpleCharStream.getBeginLine());
+      } catch (CoreException e) {
+        PHPeclipsePlugin.log(e);
+      }
+    }
+  }
+
   private static final void parse() throws ParseException {
 	  phpFile();
   }
@@ -342,16 +365,28 @@ 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
-| <PHPSTARTLONG  : "<?php"> {PHPParser.createNewHTMLCode();} : PHPPARSING
-| <PHPECHOSTART  : "<?=">   {PHPParser.createNewHTMLCode();} : PHPPARSING
+  <PHPSTARTSHORT : "<?">    : PHPPARSING
+| <PHPSTARTLONG  : "<?php"> : PHPPARSING
+| <PHPECHOSTART  : "<?=">   : PHPPARSING
 }
 
-<PHPPARSING> TOKEN :
+<PHPPARSING, IN_SINGLE_LINE_COMMENT,IN_VARIABLE> TOKEN :
 {
-  <PHPEND :"?>"> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT
+  <PHPEND :"?>"> : DEFAULT
 }
 
 /* Skip any character if we are not in php mode */
@@ -371,38 +406,47 @@ PARSER_END(PHPParser)
 | "\f"
 }
 
+<IN_VARIABLE> SPECIAL_TOKEN :
+{
+  " " : PHPPARSING
+| "\t" : PHPPARSING
+| "\n" : PHPPARSING
+| "\r" : PHPPARSING
+| "\f" : PHPPARSING
+}
 /* COMMENTS */
 <PHPPARSING> SPECIAL_TOKEN :
 {
   "//" : IN_SINGLE_LINE_COMMENT
-|
-  "#"  : IN_SINGLE_LINE_COMMENT
-|
-  <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT
-|
-  "/*" : IN_MULTI_LINE_COMMENT
+| "#"  : IN_SINGLE_LINE_COMMENT
+| <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT
+| "/*" : IN_MULTI_LINE_COMMENT
 }
 
 <IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
 {
   <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : PHPPARSING
+| < ~[] >
 }
 
-<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
+<IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT> SPECIAL_TOKEN :
 {
-  <SINGLE_LINE_COMMENT_PHPEND : "?>" > : DEFAULT
+ "todo"
 }
 
-<IN_FORMAL_COMMENT>
-SPECIAL_TOKEN :
+void todo() :
+{Token todoToken;}
 {
-  <FORMAL_COMMENT: "*/" > : PHPPARSING
+  todoToken = "TODO" {createNewTask(todoToken.sourceStart);}
+}
+<IN_FORMAL_COMMENT> SPECIAL_TOKEN :
+{
+  "*/" : PHPPARSING
 }
 
-<IN_MULTI_LINE_COMMENT>
-SPECIAL_TOKEN :
+<IN_MULTI_LINE_COMMENT> SPECIAL_TOKEN :
 {
-  <MULTI_LINE_COMMENT: "*/" > : PHPPARSING
+  "*/" : PHPPARSING
 }
 
 <IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT>
@@ -435,10 +479,15 @@ MORE :
 | <INCLUDE_ONCE       : "include_once">
 | <REQUIRE_ONCE       : "require_once">
 | <GLOBAL             : "global">
+| <DEFINE             : "define">
 | <STATIC             : "static">
-| <CLASSACCESS        : "->">
-| <STATICCLASSACCESS  : "::">
-| <ARRAYASSIGN        : "=>">
+}
+
+<PHPPARSING,IN_VARIABLE> TOKEN :
+{
+  <CLASSACCESS        : "->"> : PHPPARSING
+| <STATICCLASSACCESS  : "::"> : PHPPARSING
+| <ARRAYASSIGN        : "=>"> : PHPPARSING
 }
 
 /* RESERVED WORDS AND LITERALS */
@@ -485,36 +534,35 @@ MORE :
 }
 
 //Misc token
-<PHPPARSING> TOKEN :
+<PHPPARSING,IN_VARIABLE> TOKEN :
 {
-  <AT                 : "@">
-| <DOLLAR             : "$">
-| <BANG               : "!">
-| <TILDE              : "~">
-| <HOOK               : "?">
-| <COLON              : ":">
+  <AT                 : "@"> : PHPPARSING
+| <BANG               : "!"> : PHPPARSING
+| <TILDE              : "~"> : PHPPARSING
+| <HOOK               : "?"> : PHPPARSING
+| <COLON              : ":"> : PHPPARSING
 }
 
 /* OPERATORS */
-<PHPPARSING> TOKEN :
-{
-  <OR_OR              : "||">
-| <AND_AND            : "&&">
-| <INCR               : "++">
-| <DECR               : "--">
-| <PLUS               : "+">
-| <MINUS              : "-">
-| <STAR               : "*">
-| <SLASH              : "/">
-| <BIT_AND            : "&">
-| <BIT_OR             : "|">
-| <XOR                : "^">
-| <REMAINDER          : "%">
-| <LSHIFT             : "<<">
-| <RSIGNEDSHIFT       : ">>">
-| <RUNSIGNEDSHIFT     : ">>>">
-| <_ORL               : "OR">
-| <_ANDL              : "AND">
+<PHPPARSING,IN_VARIABLE> TOKEN :
+{
+  <OR_OR              : "||"> : PHPPARSING
+| <AND_AND            : "&&"> : PHPPARSING
+| <PLUS_PLUS          : "++"> : PHPPARSING
+| <MINUS_MINUS        : "--"> : PHPPARSING
+| <PLUS               : "+"> : PHPPARSING
+| <MINUS              : "-"> : PHPPARSING
+| <STAR               : "*"> : PHPPARSING
+| <SLASH              : "/"> : PHPPARSING
+| <BIT_AND            : "&"> : PHPPARSING
+| <BIT_OR             : "|"> : PHPPARSING
+| <XOR                : "^"> : PHPPARSING
+| <REMAINDER          : "%">  : PHPPARSING
+| <LSHIFT             : "<<"> : PHPPARSING
+| <RSIGNEDSHIFT       : ">>"> : PHPPARSING
+| <RUNSIGNEDSHIFT     : ">>>"> : PHPPARSING
+| <_ORL               : "OR"> : PHPPARSING
+| <_ANDL              : "AND"> : PHPPARSING
 }
 
 /* LITERALS */
@@ -542,39 +590,20 @@ 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 :
+
+<PHPPARSING,IN_VARIABLE> TOKEN : {<DOLLAR : "$"> : IN_VARIABLE}
+
+
+<PHPPARSING, IN_VARIABLE> TOKEN :
 {
-  < IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
+  <IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
 |
   < #LETTER:
       ["a"-"z"] | ["A"-"Z"]
@@ -591,55 +620,50 @@ MORE :
 
 /* SEPARATORS */
 
-<PHPPARSING> TOKEN :
+<PHPPARSING,IN_VARIABLE> TOKEN :
 {
-  <LPAREN    : "(">
-| <RPAREN    : ")">
-| <LBRACE    : "{">
-| <RBRACE    : "}">
-| <LBRACKET  : "[">
-| <RBRACKET  : "]">
-| <SEMICOLON : ";">
-| <COMMA     : ",">
-| <DOT       : ".">
+  <LPAREN    : "("> : PHPPARSING
+| <RPAREN    : ")"> : PHPPARSING
+| <LBRACE    : "{"> : PHPPARSING
+| <RBRACE    : "}"> : PHPPARSING
+| <LBRACKET  : "["> : PHPPARSING
+| <RBRACKET  : "]"> : PHPPARSING
+| <SEMICOLON : ";"> : PHPPARSING
+| <COMMA     : ","> : PHPPARSING
+| <DOT       : "."> : PHPPARSING
 }
 
 
 /* COMPARATOR */
-<PHPPARSING> TOKEN :
+<PHPPARSING,IN_VARIABLE> TOKEN :
 {
-  <GT                 : ">">
-| <LT                 : "<">
-| <EQUAL_EQUAL        : "==">
-| <LE                 : "<=">
-| <GE                 : ">=">
-| <NOT_EQUAL          : "!=">
-| <DIF                : "<>">
-| <BANGDOUBLEEQUAL    : "!==">
-| <TRIPLEEQUAL        : "===">
+  <GT                 : ">"> : PHPPARSING
+| <LT                 : "<"> : PHPPARSING
+| <EQUAL_EQUAL        : "=="> : PHPPARSING
+| <LE                 : "<="> : PHPPARSING
+| <GE                 : ">="> : PHPPARSING
+| <NOT_EQUAL          : "!="> : PHPPARSING
+| <DIF                : "<>"> : PHPPARSING
+| <BANGDOUBLEEQUAL    : "!=="> : PHPPARSING
+| <TRIPLEEQUAL        : "==="> : PHPPARSING
 }
 
 /* ASSIGNATION */
-<PHPPARSING> TOKEN :
-{
-  <ASSIGN             : "=">
-| <PLUSASSIGN         : "+=">
-| <MINUSASSIGN        : "-=">
-| <STARASSIGN         : "*=">
-| <SLASHASSIGN        : "/=">
-| <ANDASSIGN          : "&=">
-| <ORASSIGN           : "|=">
-| <XORASSIGN          : "^=">
-| <DOTASSIGN          : ".=">
-| <REMASSIGN          : "%=">
-| <TILDEEQUAL         : "~=">
-| <LSHIFTASSIGN       : "<<=">
-| <RSIGNEDSHIFTASSIGN : ">>=">
-}
-
-<PHPPARSING> TOKEN :
-{
-  < DOLLAR_ID: <DOLLAR> <IDENTIFIER>  >
+<PHPPARSING,IN_VARIABLE> TOKEN :
+{
+  <ASSIGN             : "="> : PHPPARSING
+| <PLUSASSIGN         : "+="> : PHPPARSING
+| <MINUSASSIGN        : "-="> : PHPPARSING
+| <STARASSIGN         : "*="> : PHPPARSING
+| <SLASHASSIGN        : "/="> : PHPPARSING
+| <ANDASSIGN          : "&="> : PHPPARSING
+| <ORASSIGN           : "|="> : PHPPARSING
+| <XORASSIGN          : "^="> : PHPPARSING
+| <DOTASSIGN          : ".="> : PHPPARSING
+| <REMASSIGN          : "%="> : PHPPARSING
+| <TILDEEQUAL         : "~="> : PHPPARSING
+| <LSHIFTASSIGN       : "<<="> : PHPPARSING
+| <RSIGNEDSHIFTASSIGN : ">>="> : PHPPARSING
 }
 
 void phpTest() :
@@ -647,7 +671,6 @@ void phpTest() :
 {
   Php()
   <EOF>
-  {PHPParser.createNewHTMLCode();}
 }
 
 void phpFile() :
@@ -655,11 +678,11 @@ void phpFile() :
 {
   try {
     (PhpBlock())*
-    <EOF>
+    {PHPParser.createNewHTMLCode();}
   } catch (TokenMgrError e) {
     PHPeclipsePlugin.log(e);
-    errorStart   = SimpleCharStream.getPosition();
-    errorEnd     = errorStart + 1;
+    errorStart   = SimpleCharStream.beginOffset;
+    errorEnd     = SimpleCharStream.endOffset;
     errorMessage = e.getMessage();
     errorLevel   = ERROR;
     throw generateParseException();
@@ -673,46 +696,53 @@ void phpFile() :
  */
 void PhpBlock() :
 {
-  final int start = jj_input_stream.getPosition();
+  final PHPEchoBlock phpEchoBlock;
+  final Token token,phpEnd;
 }
 {
-  phpEchoBlock()
+  phpEchoBlock = phpEchoBlock()
+  {pushOnAstNodes(phpEchoBlock);}
 |
-  [ <PHPSTARTLONG>
-    | <PHPSTARTSHORT>
+  [   <PHPSTARTLONG>
+    | token = <PHPSTARTSHORT>
     {try {
       setMarker(fileToParse,
                 "You should use '<?php' instead of '<?' it will avoid some problems with XML",
-                start,
-                jj_input_stream.getPosition(),
+                token.sourceStart,
+                token.sourceEnd,
                 INFO,
                 "Line " + token.beginLine);
     } catch (CoreException e) {
       PHPeclipsePlugin.log(e);
     }}
   ]
+  {PHPParser.createNewHTMLCode();}
   Php()
   try {
-    <PHPEND>
+    phpEnd = <PHPEND>
+   {htmlStart = phpEnd.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "'?>' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
+    processParseExceptionDebug(e);
   }
 }
 
 PHPEchoBlock phpEchoBlock() :
 {
   final Expression expr;
-  final int pos = SimpleCharStream.getPosition();
-  PHPEchoBlock echoBlock;
+  final PHPEchoBlock echoBlock;
+  final Token token, token2;
 }
 {
-  <PHPECHOSTART> expr = Expression() [ <SEMICOLON> ] <PHPEND>
+  token = <PHPECHOSTART> {PHPParser.createNewHTMLCode();}
+  expr = Expression() [ <SEMICOLON> ] token2 = <PHPEND>
   {
-  echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
+  htmlStart = token2.sourceEnd;
+
+  echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd);
   pushOnAstNodes(echoBlock);
   return echoBlock;}
 }
@@ -726,162 +756,246 @@ void Php() :
 ClassDeclaration ClassDeclaration() :
 {
   final ClassDeclaration classDeclaration;
-  final Token className;
-  Token superclassName = null;
-  final int pos;
+  Token className = null;
+  final Token superclassName, token, extendsToken;
+  String classNameImage = SYNTAX_ERROR_CHAR;
+  String superclassNameImage = null;
+  final int classEnd;
 }
 {
-  <CLASS>
+  token = <CLASS>
   try {
-    {pos = jj_input_stream.getPosition();}
     className = <IDENTIFIER>
+    {classNameImage = className.image;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
     errorLevel   = ERROR;
-    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart   = token.sourceEnd+1;
+    errorEnd     = token.sourceEnd+1;
+    processParseExceptionDebug(e);
   }
   [
-    <EXTENDS>
+    extendsToken = <EXTENDS>
     try {
       superclassName = <IDENTIFIER>
+      {superclassNameImage = superclassName.image;}
     } catch (ParseException e) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
       errorLevel   = ERROR;
-      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = jj_input_stream.getPosition() + 1;
-      throw e;
+      errorStart = extendsToken.sourceEnd+1;
+      errorEnd   = extendsToken.sourceEnd+1;
+      processParseExceptionDebug(e);
+      superclassNameImage = SYNTAX_ERROR_CHAR;
     }
   ]
   {
-    if (superclassName == null) {
+    int start, end;
+    if (className == null) {
+      start = token.sourceStart;
+      end = token.sourceEnd;
+    } else {
+      start = className.sourceStart;
+      end = className.sourceEnd;
+    }
+    if (superclassNameImage == null) {
+
       classDeclaration = new ClassDeclaration(currentSegment,
-                                              className.image.toCharArray(),
-                                              pos,
-                                              0);
+                                              classNameImage,
+                                              start,
+                                              end);
     } else {
       classDeclaration = new ClassDeclaration(currentSegment,
-                                              className.image.toCharArray(),
-                                              superclassName.image.toCharArray(),
-                                              pos,
-                                              0);
+                                              classNameImage,
+                                              superclassNameImage,
+                                              start,
+                                              end);
     }
       currentSegment.add(classDeclaration);
       currentSegment = classDeclaration;
   }
-  ClassBody(classDeclaration)
+  classEnd = ClassBody(classDeclaration)
   {currentSegment = (OutlineableWithChildren) currentSegment.getParent();
-   classDeclaration.sourceEnd = SimpleCharStream.getPosition();
+   classDeclaration.sourceEnd = classEnd;
    pushOnAstNodes(classDeclaration);
    return classDeclaration;}
 }
 
-void ClassBody(ClassDeclaration classDeclaration) :
-{}
+int ClassBody(final ClassDeclaration classDeclaration) :
+{
+Token token;
+}
 {
   try {
     <LBRACE>
   } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected";
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
+    processParseExceptionDebug(e);
   }
   ( ClassBodyDeclaration(classDeclaration) )*
   try {
-    <RBRACE>
+    token = <RBRACE>
+    {return token.sourceEnd;}
   } 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 = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
+    processParseExceptionDebug(e);
+    return PHPParser.token.sourceEnd;
   }
 }
 
 /**
  * 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);}
-| field = FieldDeclaration()   {classDeclaration.addVariable(field);}
+  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();
+  final Token token;
+  Token token2 = null;
+  int pos;
 }
 {
-  <VAR> variableDeclaration = VariableDeclarator()
-  {arrayList.add(variableDeclaration);
-   outlineInfo.addVariable(new String(variableDeclaration.name));
-   currentSegment.add(variableDeclaration);}
-  ( <COMMA> variableDeclaration = VariableDeclarator()
-      {arrayList.add(variableDeclaration);
-       outlineInfo.addVariable(new String(variableDeclaration.name));
-       currentSegment.add(variableDeclaration);}
+  token = <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
+  {
+    arrayList.add(variableDeclaration);
+    outlineInfo.addVariable(variableDeclaration.name());
+    pos = variableDeclaration.sourceEnd;
+  }
+  (
+    <COMMA> variableDeclaration = VariableDeclaratorNoSuffix()
+      {
+        arrayList.add(variableDeclaration);
+        outlineInfo.addVariable(variableDeclaration.name());
+        pos = variableDeclaration.sourceEnd;
+      }
   )*
   try {
-    <SEMICOLON>
+    token2 = <SEMICOLON>
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart   = pos+1;
+    errorEnd     = pos+1;
+    processParseExceptionDebug(e);
   }
 
   {list = new VariableDeclaration[arrayList.size()];
    arrayList.toArray(list);
+   int end;
+   if (token2 == null) {
+     end = list[list.length-1].sourceEnd;
+   } else {
+     end = token2.sourceEnd;
+   }
    return new FieldDeclaration(list,
-                               pos,
-                               SimpleCharStream.getPosition());}
+                               token.sourceStart,
+                               end,
+                               currentSegment);}
 }
 
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ * It will be used by fields and formal parameters
+ */
+VariableDeclaration VariableDeclaratorNoSuffix() :
+{
+  final Token dollar, token, lbrace,rbrace;
+  Expression expr, initializer = null;
+  Token assignToken;
+  Variable variable;
+}
+{
+  dollar = <DOLLAR>
+  (
+     token = <IDENTIFIER>
+     {variable = new Variable(token.image,dollar.sourceStart,token.sourceEnd);}
+   |
+     lbrace = <LBRACE> expr = Expression() rbrace = <RBRACE>
+     {variable = new Variable(expr,dollar.sourceStart,rbrace.sourceEnd);}
+  )
+  [
+    assignToken = <ASSIGN>
+    try {
+      initializer = VariableInitializer()
+    } catch (ParseException e) {
+      errorMessage = "Literal expression expected in variable initializer";
+      errorLevel   = ERROR;
+      errorStart = assignToken.sourceEnd +1;
+      errorEnd   = assignToken.sourceEnd +1;
+      processParseExceptionDebug(e);
+    }
+  ]
+  {
+  if (initializer == null) {
+    return new VariableDeclaration(currentSegment,
+                                   variable,
+                                   variable.sourceStart,
+                                   variable.sourceEnd);
+  }
+  return new VariableDeclaration(currentSegment,
+                                 variable,
+                                 initializer,
+                                 VariableDeclaration.EQUAL,
+                                 variable.sourceStart);
+  }
+}
+
+/**
+ * this will be used by static statement
+ */
 VariableDeclaration VariableDeclarator() :
 {
-  final String varName;
+  final AbstractVariable variable;
   Expression initializer = null;
-  final int pos = jj_input_stream.getPosition();
+  final Token token;
 }
 {
-  varName = VariableDeclaratorId()
+  variable = VariableDeclaratorId()
   [
-    <ASSIGN>
+    token = <ASSIGN>
     try {
       initializer = VariableInitializer()
     } catch (ParseException e) {
       errorMessage = "Literal expression expected in variable initializer";
       errorLevel   = ERROR;
-      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = jj_input_stream.getPosition() + 1;
-      throw e;
+      errorStart = token.sourceEnd+1;
+      errorEnd   = token.sourceEnd+1;
+      processParseExceptionDebug(e);
     }
   ]
   {
   if (initializer == null) {
     return new VariableDeclaration(currentSegment,
-                                  varName.toCharArray(),
-                                  pos,
-                                  jj_input_stream.getPosition());
+                                   variable,
+                                   variable.sourceStart,
+                                   variable.sourceEnd);
   }
     return new VariableDeclaration(currentSegment,
-                                    varName.toCharArray(),
-                                    initializer,
-                                    pos);
+                                   variable,
+                                   initializer,
+                                   VariableDeclaration.EQUAL,
+                                   variable.sourceStart);
   }
 }
 
@@ -889,133 +1003,102 @@ VariableDeclaration VariableDeclarator() :
  * A Variable name.
  * @return the variable name (with suffix)
  */
-String VariableDeclaratorId() :
+AbstractVariable VariableDeclaratorId() :
 {
-  String expr;
-  Expression expression;
-  final StringBuffer buff = new StringBuffer();
-  final int pos = SimpleCharStream.getPosition();
-  ConstantIdentifier ex;
+  final Variable var;
+  AbstractVariable expression = null;
 }
 {
   try {
-    expr = Variable()   {buff.append(expr);}
-    ( LOOKAHEAD(2)
-      {ex = new ConstantIdentifier(expr.toCharArray(),
-                                   pos,
-                                   SimpleCharStream.getPosition());}
-      expression = VariableSuffix(ex)
-      {buff.append(expression.toStringExpression());}
+    var = Variable()
+    (
+      LOOKAHEAD(2)
+      expression = VariableSuffix(var)
     )*
-    {return buff.toString();}
+    {
+     if (expression == null) {
+       return var;
+     }
+     return expression;
+    }
   } catch (ParseException e) {
     errorMessage = "'$' expected for variable identifier";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
     throw e;
   }
 }
 
-String Variable():
+Variable Variable() :
 {
-  final StringBuffer buff;
-  Expression expression = null;
+  Variable variable = null;
   final Token token;
-  final String expr;
 }
 {
-  token = <DOLLAR_ID> [<LBRACE> expression = Expression() <RBRACE>]
+  token = <DOLLAR> variable = Var(token)
   {
-    if (expression == null && !assigning) {
-      return token.image.substring(1);
-    }
-    buff = new StringBuffer(token.image);
-    buff.append('{');
-    buff.append(expression.toStringExpression());
-    buff.append('}');
-    return buff.toString();
+    return new Variable(variable,token.sourceStart,variable.sourceEnd);
   }
-|
-  <DOLLAR> expr = VariableName()
-  {return expr;}
 }
 
-String VariableName():
+Variable Var(final Token dollar) :
 {
-  final StringBuffer buff;
-  String expr = null;
-  Expression expression = null;
-  final Token token;
+  Variable variable = null;
+  final Token token,token2;
+  ConstantIdentifier constant;
+  Expression expression;
 }
 {
-  <LBRACE> expression = Expression() <RBRACE>
-  {buff = new StringBuffer('{');
-   buff.append(expression.toStringExpression());
-   buff.append('}');
-   return buff.toString();}
+  token = <DOLLAR> variable = Var(token)
+  {return new Variable(variable,dollar.sourceStart,variable.sourceEnd);}
 |
-  token = <IDENTIFIER> [<LBRACE> expression = Expression() <RBRACE>]
+  token = <LBRACE> expression = Expression() token2 = <RBRACE>
   {
-    if (expression == null) {
-      return token.image;
-    }
-    buff = new StringBuffer(token.image);
-    buff.append('{');
-    buff.append(expression.toStringExpression());
-    buff.append('}');
-    return buff.toString();
+   return new Variable(expression,
+                       dollar.sourceStart,
+                       token2.sourceEnd);
   }
 |
-  <DOLLAR> expr = VariableName()
-  {
-    buff = new StringBuffer('$');
-    buff.append(expr);
-    return buff.toString();
-  }
-|
-  token = <DOLLAR_ID> {return token.image;}
+  token = <IDENTIFIER>
+  {return new Variable(token.image,dollar.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() :
 {
-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());}
 }
@@ -1026,16 +1109,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;}
 }
@@ -1048,36 +1135,27 @@ MethodDeclaration MethodDeclaration() :
 {
   final MethodDeclaration functionDeclaration;
   final Block block;
+  final OutlineableWithChildren seg = currentSegment;
+  final Token token;
 }
 {
-  <FUNCTION>
+  token = <FUNCTION>
   try {
-    functionDeclaration = MethodDeclarator()
-    {outlineInfo.addVariable(new String(functionDeclaration.name));}
+    functionDeclaration = MethodDeclarator(token.sourceStart)
+    {outlineInfo.addVariable(functionDeclaration.name);}
   } catch (ParseException e) {
     if (errorMessage != null)  throw e;
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
     throw e;
   }
-  {
-    if (currentSegment != null) {
-      currentSegment.add(functionDeclaration);
-      currentSegment = functionDeclaration;
-    }
-    currentFunction = functionDeclaration;
-  }
+  {currentSegment = functionDeclaration;}
   block = Block()
-  {
-    functionDeclaration.statements = block.statements;
-    currentFunction = null;
-    if (currentSegment != null) {
-      currentSegment = (OutlineableWithChildren) currentSegment.getParent();
-    }
-    return functionDeclaration;
-  }
+  {functionDeclaration.statements = block.statements;
+   currentSegment = seg;
+   return functionDeclaration;}
 }
 
 /**
@@ -1085,60 +1163,96 @@ MethodDeclaration MethodDeclaration() :
  * [&] IDENTIFIER(parameters ...).
  * @return a function description for the outline
  */
-MethodDeclaration MethodDeclarator() :
+MethodDeclaration MethodDeclarator(final int start) :
 {
-  final Token identifier;
+  Token identifier = null;
   Token reference = null;
-  final Hashtable formalParameters;
-  final int pos = SimpleCharStream.getPosition();
+  final Hashtable formalParameters = new Hashtable();
+  String identifierChar = SYNTAX_ERROR_CHAR;
+  int end = start;
 }
 {
-  [reference = <BIT_AND>] identifier = <IDENTIFIER>
-  formalParameters = FormalParameters()
-  {return new MethodDeclaration(currentSegment,
-                                 identifier.image.toCharArray(),
-                                 formalParameters,
-                                 reference != null,
-                                 pos,
-                                 SimpleCharStream.getPosition());}
+  [reference = <BIT_AND> {end = reference.sourceEnd;}]
+  try {
+    identifier = <IDENTIFIER>
+    {
+      identifierChar = identifier.image;
+      end = identifier.sourceEnd;
+    }
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+    errorLevel   = ERROR;
+    errorStart = e.currentToken.sourceEnd;
+    errorEnd   = e.currentToken.next.sourceStart;
+    processParseExceptionDebug(e);
+  }
+  end = FormalParameters(formalParameters)
+  {
+  int nameStart, nameEnd;
+  if (identifier == null) {
+    if (reference == null) {
+      nameStart = start + 9;
+      nameEnd = start + 10;
+    } else {
+      nameStart = reference.sourceEnd + 1;
+      nameEnd = reference.sourceEnd + 2;
+    }
+  } else {
+      nameStart = identifier.sourceStart;
+      nameEnd = identifier.sourceEnd;
+  }
+  return new MethodDeclaration(currentSegment,
+                               identifierChar,
+                               formalParameters,
+                               reference != null,
+                               nameStart,
+                               nameEnd,
+                               start,
+                               end);
+  }
 }
 
 /**
  * FormalParameters follows method identifier.
  * (FormalParameter())
  */
-Hashtable FormalParameters() :
+int FormalParameters(final Hashtable parameters) :
 {
   VariableDeclaration var;
-  final Hashtable parameters = new Hashtable();
+  final Token token;
+  Token tok = PHPParser.token;
+  int end = tok.sourceEnd;
 }
 {
   try {
-  <LPAREN>
+  tok = <LPAREN>
+  {end = tok.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = e.currentToken.next.sourceStart;
+    errorEnd   = e.currentToken.next.sourceEnd;
+    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(var.name(),var);end = var.sourceEnd;}
+    (
+      <COMMA> var = FormalParameter()
+      {parameters.put(var.name(),var);end = var.sourceEnd;}
+    )*
+  ]
   try {
-    <RPAREN>
+    token = <RPAREN>
+    {end = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "')' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = e.currentToken.next.sourceStart;
+    errorEnd   = e.currentToken.next.sourceEnd;
+    processParseExceptionDebug(e);
   }
- {return parameters;}
+ {return end;}
 }
 
 /**
@@ -1151,7 +1265,7 @@ VariableDeclaration FormalParameter() :
   Token token = null;
 }
 {
-  [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
+  [token = <BIT_AND>] variableDeclaration = VariableDeclaratorNoSuffix()
   {
     if (token != null) {
       variableDeclaration.setReference(true);
@@ -1160,98 +1274,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;
+  int assignOperator = -1;
 }
 {
-  expr = PrintExpression()       {return expr;}
-| expr = ListExpression()        {return expr;}
-| LOOKAHEAD(varAssignation())
-  expr = varAssignation()        {return expr;}
-| expr = ConditionalExpression() {return expr;}
-}
-
-/**
- * A Variable assignation.
- * varName (an assign operator) any expression
- */
-VarAssignation varAssignation() :
-{
-  String varName;
-  final Expression expression;
-  final int assignOperator;
-  final int pos = SimpleCharStream.getPosition();
-}
-{
-  varName = VariableDeclaratorId()
-  assignOperator = AssignmentOperator()
+  LOOKAHEAD(1)
+  expr = ConditionalExpression()
+  [
+    assignOperator = AssignmentOperator()
     try {
-      expression = Expression()
+      initializer = Expression()
     } catch (ParseException e) {
       if (errorMessage != null) {
         throw e;
       }
-      errorMessage = "expression expected";
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
       errorLevel   = ERROR;
-      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = jj_input_stream.getPosition() + 1;
+      errorEnd   = SimpleCharStream.getPosition();
       throw e;
     }
-    {return new VarAssignation(varName.toCharArray(),
-                               expression,
-                               assignOperator,
-                               pos,
-                               SimpleCharStream.getPosition());}
+  ]
+  {
+    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 ExpressionWBang() :
+{
+  final Expression expr;
+  final Token token;
+}
+{
+  token = <BANG> expr = ExpressionWBang()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
+| expr = ExpressionNoBang() {return expr;}
+}
+
+Expression ExpressionNoBang() :
+{
+  Expression expr;
+}
+{
+  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() :
@@ -1281,7 +1402,8 @@ Expression ConditionalOrExpression() :
     (
         <OR_OR> {operator = OperatorIds.OR_OR;}
       | <_ORL>  {operator = OperatorIds.ORL;}
-    ) expr2 = ConditionalAndExpression()
+    )
+    expr2 = ConditionalAndExpression()
     {
       expr = new BinaryExpression(expr,expr2,operator);
     }
@@ -1349,6 +1471,7 @@ Expression AndExpression() :
 {
   expr = EqualityExpression()
   (
+    LOOKAHEAD(1)
     <BIT_AND> expr2 = EqualityExpression()
     {expr = new BinaryExpression(expr,expr2,OperatorIds.AND);}
   )*
@@ -1359,15 +1482,16 @@ Expression EqualityExpression() :
 {
   Expression expr,expr2;
   int operator;
+  Token token;
 }
 {
   expr = RelationalExpression()
   (
-  (   <EQUAL_EQUAL>      {operator = OperatorIds.EQUAL_EQUAL;}
-    | <DIF>              {operator = OperatorIds.DIF;}
-    | <NOT_EQUAL>        {operator = OperatorIds.DIF;}
-    | <BANGDOUBLEEQUAL>  {operator = OperatorIds.BANG_EQUAL_EQUAL;}
-    | <TRIPLEEQUAL>      {operator = OperatorIds.EQUAL_EQUAL_EQUAL;}
+  (   token = <EQUAL_EQUAL>      {operator = OperatorIds.EQUAL_EQUAL;}
+    | token = <DIF>              {operator = OperatorIds.DIF;}
+    | token = <NOT_EQUAL>        {operator = OperatorIds.DIF;}
+    | token = <BANGDOUBLEEQUAL>  {operator = OperatorIds.BANG_EQUAL_EQUAL;}
+    | token = <TRIPLEEQUAL>      {operator = OperatorIds.EQUAL_EQUAL_EQUAL;}
   )
   try {
     expr2 = RelationalExpression()
@@ -1377,9 +1501,10 @@ Expression EqualityExpression() :
     }
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = token.sourceEnd +1;
+    errorEnd   = token.sourceEnd +1;
+    expr2 = new ConstantIdentifier(SYNTAX_ERROR_CHAR,token.sourceEnd +1,token.sourceEnd +1);
+    processParseExceptionDebug(e);
   }
   {
     expr = new BinaryExpression(expr,expr2,operator);
@@ -1431,8 +1556,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);}
    )*
@@ -1451,8 +1578,8 @@ Expression MultiplicativeExpression() :
     if (errorMessage != null) throw e;
     errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart = PHPParser.token.sourceStart;
+    errorEnd   = PHPParser.token.sourceEnd;
     throw e;
   }
   (
@@ -1470,42 +1597,72 @@ Expression MultiplicativeExpression() :
  */
 Expression UnaryExpression() :
 {
-  Expression expr;
-  final int pos = SimpleCharStream.getPosition();
+  final Expression expr;
 }
 {
-  <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 = AtNotTildeUnaryExpression() {return expr;}
 }
 
-Expression AtUnaryExpression() :
+Expression AtNotTildeUnaryExpression() :
 {
-  Expression expr;
-  final int pos = SimpleCharStream.getPosition();
+  final Expression expr;
+  final Token token;
 }
 {
-  <AT>
-  expr = AtUnaryExpression()
-  {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
+  token = <AT>
+  expr = AtNotTildeUnaryExpression()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
+|
+  token = <TILDE>
+  expr = AtNotTildeUnaryExpression()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.TWIDDLE,token.sourceStart);}
+|
+  token = <BANG>
+  expr = AtNotUnaryExpression()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
 |
   expr = UnaryExpressionNoPrefix()
   {return expr;}
 }
 
+/**
+ * An expression prefixed (or not) by one or more @ and !.
+ * @return the expression
+ */
+Expression AtNotUnaryExpression() :
+{
+  final Expression expr;
+  final Token token;
+}
+{
+  token = <AT>
+  expr = AtNotUnaryExpression()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
+|
+  token = <BANG>
+  expr = AtNotUnaryExpression()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
+|
+  expr = UnaryExpressionNoPrefix()
+  {return expr;}
+}
 
 Expression UnaryExpressionNoPrefix() :
 {
-  Expression expr;
-  int operator;
-  final int pos = SimpleCharStream.getPosition();
+  final Expression expr;
+  final Token token;
 }
 {
-  (  <PLUS>  {operator = OperatorIds.PLUS;}
-   | <MINUS> {operator = OperatorIds.MINUS;})
-   expr = UnaryExpression()
-  {return new PrefixedUnaryExpression(expr,operator,pos);}
+  token = <PLUS> expr = AtNotTildeUnaryExpression()   {return new PrefixedUnaryExpression(expr,
+                                                                                     OperatorIds.PLUS,
+                                                                                     token.sourceStart);}
+|
+  token = <MINUS> expr = AtNotTildeUnaryExpression()  {return new PrefixedUnaryExpression(expr,
+                                                                                     OperatorIds.MINUS,
+                                                                                     token.sourceStart);}
 |
   expr = PreIncDecExpression()
   {return expr;}
@@ -1519,23 +1676,24 @@ Expression PreIncDecExpression() :
 {
 final Expression expr;
 final int operator;
-  final int pos = SimpleCharStream.getPosition();
+final Token token;
 }
 {
-  (  <INCR> {operator = OperatorIds.PLUS_PLUS;}
-   | <DECR> {operator = OperatorIds.MINUS_MINUS;})
-   expr = PrimaryExpression()
-  {return new PrefixedUnaryExpression(expr,operator,pos);}
+  (
+      token = <PLUS_PLUS>   {operator = OperatorIds.PLUS_PLUS;}
+    |
+      token = <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+  )
+  expr = PrimaryExpression()
+  {return new PrefixedUnaryExpression(expr,operator,token.sourceStart);}
 }
 
 Expression UnaryExpressionNotPlusMinus() :
 {
-  Expression expr;
-  final int pos = SimpleCharStream.getPosition();
+  final Expression expr;
 }
 {
-  <BANG> expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
-| LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
+  LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
   expr = CastExpression()         {return expr;}
 | expr = PostfixExpression()      {return expr;}
 | expr = Literal()                {return expr;}
@@ -1545,9 +1703,9 @@ Expression UnaryExpressionNotPlusMinus() :
   } catch (ParseException e) {
     errorMessage = "')' expected";
     errorLevel   = ERROR;
-    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart   = expr.sourceEnd +1;
+    errorEnd     = expr.sourceEnd +1;
+    processParseExceptionDebug(e);
   }
   {return expr;}
 }
@@ -1556,203 +1714,234 @@ 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() :
 {
-  Expression expr;
+  final Expression expr;
   int operator = -1;
-  final int pos = SimpleCharStream.getPosition();
+  Token token = null;
 }
 {
   expr = PrimaryExpression()
-  [ <INCR> {operator = OperatorIds.PLUS_PLUS;}
-  | <DECR> {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() :
 {
-  final Token identifier;
   Expression expr;
-  final int pos = SimpleCharStream.getPosition();
+  Token token = null;
 }
 {
-  LOOKAHEAD(2)
-  identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
-  {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
-                                                 pos,
-                                                 SimpleCharStream.getPosition()),
-                          expr,
-                          ClassAccess.STATIC);}
-  (expr = PrimarySuffix(expr))*
-  {return expr;}
-|
-  expr = PrimaryPrefix()
-  (expr = PrimarySuffix(expr))*
+  [token = <BIT_AND>] expr = refPrimaryExpression(token)
   {return expr;}
 |
   expr = ArrayDeclarator()
   {return expr;}
 }
 
-ArrayInitializer ArrayDeclarator() :
-{
-  final ArrayVariableDeclaration[] vars;
-  final int pos = SimpleCharStream.getPosition();
-}
-{
-  <ARRAY> vars = ArrayInitializer()
-  {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 ConstantIdentifier(var.toCharArray(),
-                                                               pos,
-                                                               SimpleCharStream.getPosition());}
-}
-
-PrefixedUnaryExpression classInstantiation() :
+Expression refPrimaryExpression(final Token reference) :
 {
   Expression expr;
-  final StringBuffer buff;
-  final int pos = SimpleCharStream.getPosition();
+  Expression expr2 = null;
+  final Token identifier;
 }
 {
-  <NEW> expr = ClassIdentifier()
-  [
-    {buff = new StringBuffer(expr.toStringExpression());}
-    expr = PrimaryExpression()
-    {buff.append(expr.toStringExpression());
-    expr = new ConstantIdentifier(buff.toString().toCharArray(),
-                                  pos,
-                                  SimpleCharStream.getPosition());}
-  ]
-  {return new PrefixedUnaryExpression(expr,
-                                      OperatorIds.NEW,
-                                      pos);}
+  identifier = <IDENTIFIER>
+  {
+    expr = new ConstantIdentifier(identifier);
+  }
+  (
+    <STATICCLASSACCESS> expr2 = ClassIdentifier()
+    {expr = new ClassAccess(expr,
+                            expr2,
+                            ClassAccess.STATIC);}
+  )*
+  [ expr2 = Arguments(expr) ]
+  {
+    if (expr2 == null) {
+      if (reference != null) {
+        ParseException e = generateParseException();
+        errorMessage = "you cannot use a constant by reference";
+        errorLevel   = ERROR;
+        errorStart   = reference.sourceStart;
+        errorEnd     = reference.sourceEnd;
+        processParseExceptionDebug(e);
+      }
+      return expr;
+    }
+    return expr2;
+  }
+|
+  expr = VariableDeclaratorId()  //todo use the reference parameter ...
+  [ expr = Arguments(expr) ]
+  {return expr;}
+|
+  token = <NEW>
+  expr = ClassIdentifier()
+  {
+    int start;
+    if (reference == null) {
+      start = token.sourceStart;
+    } else {
+      start = reference.sourceStart;
+    }
+    expr = new ClassInstantiation(expr,
+                                  reference != null,
+                                  start);
+  }
+  [ expr = Arguments(expr) ]
+  {return expr;}
 }
 
-ConstantIdentifier ClassIdentifier():
+/**
+ * An array declarator.
+ * array(vars)
+ * @return an array
+ */
+ArrayInitializer ArrayDeclarator() :
 {
-  final String expr;
+  final ArrayVariableDeclaration[] vars;
   final Token token;
-  final int pos = SimpleCharStream.getPosition();
 }
 {
-  token = <IDENTIFIER>          {return new ConstantIdentifier(token.image.toCharArray(),
-                                                               pos,
-                                                               SimpleCharStream.getPosition());}
-| expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(),
-                                                               pos,
-                                                               SimpleCharStream.getPosition());}
+  token = <ARRAY> vars = ArrayInitializer()
+  {return new ArrayInitializer(vars,
+                               token.sourceStart,
+                               PHPParser.token.sourceEnd);}
 }
 
-AbstractSuffixExpression PrimarySuffix(Expression prefix) :
+Expression ClassIdentifier():
 {
-  final AbstractSuffixExpression expr;
+  final Expression expr;
+  final Token token;
 }
 {
-  expr = Arguments(prefix)      {return expr;}
-| expr = VariableSuffix(prefix) {return expr;}
+  token = <IDENTIFIER>          {return new ConstantIdentifier(token);}
+| expr = Type()                 {return expr;}
+| expr = VariableDeclaratorId() {return expr;}
 }
 
-AbstractSuffixExpression VariableSuffix(Expression prefix) :
+/**
+ * Used by Variabledeclaratorid and primarysuffix
+ */
+AbstractVariable VariableSuffix(final AbstractVariable prefix) :
 {
-  String expr = null;
-  final int pos = SimpleCharStream.getPosition();
   Expression expression = null;
+  final Token classAccessToken,lbrace,rbrace;
+  Token token;
+  int pos;
 }
 {
-  <CLASSACCESS>
+  classAccessToken = <CLASSACCESS>
   try {
-    expr = VariableName()
+    (
+      lbrace = <LBRACE> expression = Expression() rbrace = <RBRACE>
+                {
+                 expression = new Variable(expression,
+                                           lbrace.sourceStart,
+                                           rbrace.sourceEnd);
+                }
+      |
+        token = <IDENTIFIER>
+        {expression = new Variable(token.image,token.sourceStart,token.sourceEnd);}
+      |
+        expression = Variable()
+    )
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = classAccessToken.sourceEnd +1;
+    errorEnd   = classAccessToken.sourceEnd +1;
+    processParseExceptionDebug(e);
   }
   {return new ClassAccess(prefix,
-                          new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+                          expression,
                           ClassAccess.NORMAL);}
 |
-  <LBRACKET> [ expression = Expression() | expression = Type() ]  //Not good
+  token = <LBRACKET> {pos = token.sourceEnd+1;}
+  [  expression = Expression() {pos = expression.sourceEnd+1;}
+   | expression = Type()       {pos = expression.sourceEnd+1;}]  //Not good
   try {
-    <RBRACKET>
+    token = <RBRACKET>
+    {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "']' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
+  }
+  {return new ArrayDeclarator(prefix,expression,pos);}
+|
+  token = <LBRACE> {pos = token.sourceEnd+1;}
+  [  expression = Expression() {pos = expression.sourceEnd+1;}
+   | expression = Type()       {pos = expression.sourceEnd+1;}]  //Not good
+  try {
+    token = <RBRACE>
+    {pos = token.sourceEnd;}
+  } catch (ParseException e) {
+    errorMessage = "']' expected";
+    errorLevel   = ERROR;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
-  {return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
+  {return new ArrayDeclarator(prefix,expression,pos);}//todo : check braces here
 }
 
 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(Expression func) :
+FunctionCall Arguments(final Expression func) :
 {
 Expression[] args = null;
+final Token token;
 }
 {
   <LPAREN> [ args = ArgumentList() ]
   try {
-    <RPAREN>
+    token = <RPAREN>
+    {return new FunctionCall(func,args,token.sourceEnd);}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = args[args.length-1].sourceEnd+1;
+    errorEnd   = args[args.length-1].sourceEnd+1;
+    processParseExceptionDebug(e);
   }
-  {return new FunctionCall(func,args,SimpleCharStream.getPosition());}
+  {return new FunctionCall(func,args,args[args.length-1].sourceEnd);}
 }
 
 /**
@@ -1764,30 +1953,34 @@ Expression[] ArgumentList() :
 {
 Expression arg;
 final ArrayList list = new ArrayList();
+int pos;
+Token token;
 }
 {
   arg = Expression()
-  {list.add(arg);}
-  ( <COMMA>
+  {list.add(arg);pos = arg.sourceEnd;}
+  ( token = <COMMA> {pos = token.sourceEnd;}
       try {
         arg = Expression()
-        {list.add(arg);}
+        {list.add(arg);
+         pos = arg.sourceEnd;}
       } catch (ParseException e) {
         errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list";
         errorLevel   = ERROR;
-        errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-        errorEnd     = jj_input_stream.getPosition() + 1;
-        throw e;
+        errorStart   = pos+1;
+        errorEnd     = pos+1;
+        processParseException(e);
       }
    )*
    {
-   Expression[] arguments = new Expression[list.size()];
+   final Expression[] arguments = new Expression[list.size()];
    list.toArray(arguments);
    return arguments;}
 }
 
 /**
  * A Statement without break.
+ * @return a statement
  */
 Statement StatementNoBreak() :
 {
@@ -1796,34 +1989,11 @@ Statement StatementNoBreak() :
 }
 {
   LOOKAHEAD(2)
-  statement = Expression()
-  try {
-    <SEMICOLON>
-  } catch (ParseException e) {
-    if (e.currentToken.next.kind != 4) {
-      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
-      errorLevel   = ERROR;
-      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = jj_input_stream.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   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = jj_input_stream.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;}
@@ -1836,10 +2006,107 @@ Statement StatementNoBreak() :
 | [token=<AT>] statement = IncludeStatement()
   {if (token != null) {
     ((InclusionStatement)statement).silent = true;
+    statement.sourceStart = token.sourceStart;
   }
   return statement;}
 | statement = StaticStatement()         {return statement;}
 | statement = GlobalStatement()         {return statement;}
+| statement = defineStatement()         {currentSegment.add((Outlineable)statement);return statement;}
+}
+
+/**
+ * A statement expression.
+ * expression ;
+ * @return an expression
+ */
+Statement expressionStatement() :
+{
+  final Statement statement;
+  final Token token;
+}
+{
+  statement = Expression()
+  try {
+    token = <SEMICOLON>
+    {statement.sourceEnd = token.sourceEnd;}
+  } catch (ParseException e) {
+    if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+      errorLevel   = ERROR;
+      errorStart = statement.sourceEnd+1;
+      errorEnd   = statement.sourceEnd+1;
+      processParseExceptionDebug(e);
+    }
+  }
+  {return statement;}
+}
+
+Define defineStatement() :
+{
+  Expression defineName,defineValue;
+  final Token defineToken;
+  Token token;
+  int pos;
+}
+{
+  defineToken = <DEFINE> {pos = defineToken.sourceEnd+1;}
+  try {
+    token = <LPAREN>
+    {pos = token.sourceEnd+1;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
+    errorLevel   = ERROR;
+    errorStart   = pos;
+    errorEnd     = pos;
+    processParseExceptionDebug(e);
+  }
+  try {
+    defineName = Expression()
+    {pos = defineName.sourceEnd+1;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+    errorLevel   = ERROR;
+    errorStart   = pos;
+    errorEnd     = pos;
+    processParseExceptionDebug(e);
+    defineName = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
+  }
+  try {
+    token = <COMMA>
+    {pos = defineName.sourceEnd+1;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
+    errorLevel   = ERROR;
+    errorStart   = pos;
+    errorEnd     = pos;
+    processParseExceptionDebug(e);
+  }
+  try {
+    defineValue = Expression()
+    {pos = defineValue.sourceEnd+1;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+    errorLevel   = ERROR;
+    errorStart   = pos;
+    errorEnd     = pos;
+    processParseExceptionDebug(e);
+    defineValue = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
+  }
+  try {
+    token = <RPAREN>
+    {pos = token.sourceEnd+1;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
+    errorLevel   = ERROR;
+    errorStart   = pos;
+    errorEnd     = pos;
+    processParseExceptionDebug(e);
+  }
+  {return new Define(currentSegment,
+                     defineName,
+                     defineValue,
+                     defineToken.sourceStart,
+                     pos);}
 }
 
 /**
@@ -1860,25 +2127,33 @@ Statement Statement() :
 HTMLBlock htmlBlock() :
 {
   final int startIndex = nodePtr;
-  AstNode[] blockNodes;
-  int nbNodes;
+  final AstNode[] blockNodes;
+  final int nbNodes;
+  final Token phpEnd;
 }
 {
-  <PHPEND> (phpEchoBlock())*
+  phpEnd = <PHPEND>
+  {htmlStart = phpEnd.sourceEnd;}
+  (phpEchoBlock())*
   try {
     (<PHPSTARTLONG> | <PHPSTARTSHORT>)
+    {PHPParser.createNewHTMLCode();}
   } catch (ParseException e) {
-    errorMessage = "End of file unexpected, '<?php' expected";
+    errorMessage = "unexpected end of file , '<?php' expected";
     errorLevel   = ERROR;
-    errorStart   = jj_input_stream.getPosition();
-    errorEnd     = jj_input_stream.getPosition();
+    errorStart   = SimpleCharStream.getPosition();
+    errorEnd     = SimpleCharStream.getPosition();
     throw e;
   }
   {
-  nbNodes = nodePtr-startIndex - 1;
+  nbNodes    = nodePtr - startIndex;
+  if (nbNodes == 0) {
+    return null;
+  }
   blockNodes = new AstNode[nbNodes];
-  System.arraycopy(nodes,startIndex,blockNodes,0,nbNodes);
-  return new HTMLBlock(nodes);}
+  System.arraycopy(nodes,startIndex+1,blockNodes,0,nbNodes);
+  nodePtr = startIndex;
+  return new HTMLBlock(blockNodes);}
 }
 
 /**
@@ -1886,113 +2161,123 @@ HTMLBlock htmlBlock() :
  */
 InclusionStatement IncludeStatement() :
 {
-  final Expression expr;
+  Expression expr;
   final int keyword;
-  final int pos = jj_input_stream.getPosition();
   final InclusionStatement inclusionStatement;
+  final Token token, token2;
+  int pos;
 }
 {
-      (  <REQUIRE>      {keyword = InclusionStatement.REQUIRE;}
-       | <REQUIRE_ONCE> {keyword = InclusionStatement.REQUIRE_ONCE;}
-       | <INCLUDE>      {keyword = InclusionStatement.INCLUDE;}
-       | <INCLUDE_ONCE> {keyword = InclusionStatement.INCLUDE_ONCE;})
+      (  token = <REQUIRE>      {keyword = InclusionStatement.REQUIRE;pos=token.sourceEnd;}
+       | token = <REQUIRE_ONCE> {keyword = InclusionStatement.REQUIRE_ONCE;pos=token.sourceEnd;}
+       | token = <INCLUDE>      {keyword = InclusionStatement.INCLUDE;pos=token.sourceEnd;}
+       | token = <INCLUDE_ONCE> {keyword = InclusionStatement.INCLUDE_ONCE;pos=token.sourceEnd;})
   try {
     expr = Expression()
+    {pos = expr.sourceEnd;}
   } catch (ParseException e) {
     if (errorMessage != null) {
       throw e;
     }
     errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected";
     errorLevel   = ERROR;
-    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = jj_input_stream.getPosition() + 1;
-    throw e;
-  }
-  {inclusionStatement = new InclusionStatement(currentSegment,
-                                               keyword,
-                                               expr,
-                                               pos);
-   currentSegment.add(inclusionStatement);
+    errorStart   = e.currentToken.next.sourceStart;
+    errorEnd     = e.currentToken.next.sourceEnd;
+    expr = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos);
+    processParseExceptionDebug(e);
   }
   try {
-    <SEMICOLON>
+    token2 = <SEMICOLON>
+    {pos=token2.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
     errorLevel   = ERROR;
-    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart   = e.currentToken.next.sourceStart;
+    errorEnd     = e.currentToken.next.sourceEnd;
+    processParseExceptionDebug(e);
+  }
+  {
+   inclusionStatement = new InclusionStatement(currentSegment,
+                                               keyword,
+                                               expr,
+                                               token.sourceStart,
+                                               pos);
+   currentSegment.add(inclusionStatement);
+   return inclusionStatement;
   }
-  {return inclusionStatement;}
 }
 
 PrintExpression PrintExpression() :
 {
   final Expression expr;
-  final int pos = SimpleCharStream.getPosition();
+  final Token printToken;
 }
 {
-  <PRINT> expr = Expression() {return new PrintExpression(expr,pos,SimpleCharStream.getPosition());}
+  token = <PRINT> expr = Expression()
+  {return new PrintExpression(expr,token.sourceStart,expr.sourceEnd);}
 }
 
 ListExpression ListExpression() :
 {
-  String expr = null;
-  Expression expression = null;
-  ArrayList list = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
+  Expression expr = null;
+  final Expression expression;
+  final ArrayList list = new ArrayList();
+  int pos;
+  final Token listToken, rParen;
+  Token token;
 }
 {
-  <LIST>
+  listToken = <LIST> {pos = listToken.sourceEnd;}
   try {
-    <LPAREN>
+    token = <LPAREN> {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
     errorLevel   = ERROR;
-    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart   = listToken.sourceEnd+1;
+    errorEnd     = listToken.sourceEnd+1;
+    processParseExceptionDebug(e);
   }
   [
     expr = VariableDeclaratorId()
-    {list.add(expr);}
+    {list.add(expr);pos = expr.sourceEnd;}
   ]
   {if (expr == null) list.add(null);}
   (
     try {
-      <COMMA>
+      token = <COMMA>
+      {pos = token.sourceEnd;}
     } catch (ParseException e) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
       errorLevel   = ERROR;
-      errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd     = jj_input_stream.getPosition() + 1;
-      throw e;
+      errorStart   = pos+1;
+      errorEnd     = pos+1;
+      processParseExceptionDebug(e);
     }
-    expr = VariableDeclaratorId()
-    {list.add(expr);}
+    [expr = VariableDeclaratorId() {list.add(expr);pos = expr.sourceEnd;}]
   )*
   try {
-    <RPAREN>
+    rParen = <RPAREN>
+    {pos = rParen.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos+1;
+    errorEnd   = pos+1;
+      processParseExceptionDebug(e);
   }
   [ <ASSIGN> expression = Expression()
     {
-    String[] strings = new String[list.size()];
-    list.toArray(strings);
-    return new ListExpression(strings,
+    final AbstractVariable[] vars = new AbstractVariable[list.size()];
+    list.toArray(vars);
+    return new ListExpression(vars,
                               expression,
-                              pos,
-                              SimpleCharStream.getPosition());}
+                              listToken.sourceStart,
+                              expression.sourceEnd);}
   ]
   {
-    String[] strings = new String[list.size()];
-    list.toArray(strings);
-    return new ListExpression(strings,pos,SimpleCharStream.getPosition());}
+    final AbstractVariable[] vars = new AbstractVariable[list.size()];
+    list.toArray(vars);
+    return new ListExpression(vars,listToken.sourceStart,pos);}
 }
 
 /**
@@ -2003,102 +2288,112 @@ EchoStatement EchoStatement() :
 {
   final ArrayList expressions = new ArrayList();
   Expression expr;
-  final int pos = SimpleCharStream.getPosition();
+  Token token;
+  Token token2 = null;
 }
 {
-  <ECHO> expr = Expression()
+  token = <ECHO> expr = Expression()
   {expressions.add(expr);}
   (
     <COMMA> expr = Expression()
     {expressions.add(expr);}
   )*
   try {
-    <SEMICOLON>
-    {
-    Expression[] exprs = new Expression[expressions.size()];
-    expressions.toArray(exprs);
-    return new EchoStatement(exprs,pos);}
+    token2 = <SEMICOLON>
   } catch (ParseException e) {
     if (e.currentToken.next.kind != 4) {
       errorMessage = "';' expected after 'echo' statement";
       errorLevel   = ERROR;
-      errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd     = jj_input_stream.getPosition() + 1;
-      throw e;
+      errorStart   = e.currentToken.sourceEnd;
+      errorEnd     = e.currentToken.sourceEnd;
+      processParseExceptionDebug(e);
     }
   }
+  {
+   final Expression[] exprs = new Expression[expressions.size()];
+   expressions.toArray(exprs);
+   if (token2 == null) {
+     return new EchoStatement(exprs,token.sourceStart, exprs[exprs.length-1].sourceEnd);
+   }
+   return new EchoStatement(exprs,token.sourceStart, token2.sourceEnd);
+   }
 }
 
 GlobalStatement GlobalStatement() :
 {
-   final int pos = jj_input_stream.getPosition();
-   String expr;
-   ArrayList vars = new ArrayList();
-   GlobalStatement global;
+   Variable expr;
+   final ArrayList vars = new ArrayList();
+   final GlobalStatement global;
+   final Token token, token2;
+   int pos;
 }
 {
-  <GLOBAL>
-    expr = VariableDeclaratorId()
-    {vars.add(expr);}
+  token = <GLOBAL>
+    expr = Variable()
+    {vars.add(expr);pos = expr.sourceEnd+1;}
   (<COMMA>
-    expr = VariableDeclaratorId()
-    {vars.add(expr);}
+    expr = Variable()
+    {vars.add(expr);pos = expr.sourceEnd+1;}
   )*
   try {
-    <SEMICOLON>
-    {
-    String[] strings = new String[vars.size()];
-    vars.toArray(strings);
-    global = new GlobalStatement(currentSegment,
-                                 strings,
-                                 pos,
-                                 SimpleCharStream.getPosition());
-    currentSegment.add(global);
-    return global;}
+    token2 = <SEMICOLON>
+    {pos = token2.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
+    {
+    final Variable[] variables = new Variable[vars.size()];
+    vars.toArray(variables);
+    global = new GlobalStatement(currentSegment,
+                                 variables,
+                                 token.sourceStart,
+                                 pos);
+    currentSegment.add(global);
+    return global;}
 }
 
 StaticStatement StaticStatement() :
 {
-  final int pos = SimpleCharStream.getPosition();
   final ArrayList vars = new ArrayList();
   VariableDeclaration expr;
+  final Token token, token2;
+  int pos;
 }
 {
-  <STATIC> expr = VariableDeclarator() {vars.add(new String(expr.name));}
-  (<COMMA> expr = VariableDeclarator() {vars.add(new String(expr.name));})*
+  token = <STATIC> expr = VariableDeclarator() {vars.add(expr);pos = expr.sourceEnd+1;}
+  (
+    <COMMA> expr = VariableDeclarator() {vars.add(expr);pos = expr.sourceEnd+1;}
+  )*
   try {
-    <SEMICOLON>
-    {
-    String[] strings = new String[vars.size()];
-    vars.toArray(strings);
-    return new StaticStatement(strings,
-                                pos,
-                                SimpleCharStream.getPosition());}
+    token2 = <SEMICOLON>
+    {pos = token2.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseException(e);
   }
+    {
+    final VariableDeclaration[] variables = new VariableDeclaration[vars.size()];
+    vars.toArray(variables);
+    return new StaticStatement(variables,
+                               token.sourceStart,
+                               pos);}
 }
 
 LabeledStatement LabeledStatement() :
 {
-  final int pos = SimpleCharStream.getPosition();
   final Token label;
   final Statement statement;
 }
 {
   label = <IDENTIFIER> <COLON> statement = Statement()
-  {return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());}
+  {return new LabeledStatement(label.image,statement,label.sourceStart,statement.sourceEnd);}
 }
 
 /**
@@ -2110,35 +2405,46 @@ LabeledStatement LabeledStatement() :
  */
 Block Block() :
 {
-  final int pos = SimpleCharStream.getPosition();
   final ArrayList list = new ArrayList();
   Statement statement;
+  final Token token, token2;
+  int pos,start;
 }
 {
   try {
-    <LBRACE>
+    token = <LBRACE>
+    {pos = token.sourceEnd+1;start=token.sourceStart;}
   } catch (ParseException e) {
     errorMessage = "'{' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
-  }
-  ( statement = BlockStatement() {list.add(statement);}
-  | statement = htmlBlock()      {list.add(statement);})*
+    pos = PHPParser.token.sourceEnd+1;
+    start=pos;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
+  }
+  ( statement = BlockStatement() {list.add(statement);pos = statement.sourceEnd+1;}
+  | statement = htmlBlock()      {if (statement != null) {
+                                    list.add(statement);
+                                    pos = statement.sourceEnd+1;
+                                  }
+                                  pos = PHPParser.token.sourceEnd+1;
+                                 }
+  )*
   try {
-    <RBRACE>
+    token2 = <RBRACE>
+    {pos = token2.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   {
-  Statement[] statements = new Statement[list.size()];
+  final Statement[] statements = new Statement[list.size()];
   list.toArray(statements);
-  return new Block(statements,pos,SimpleCharStream.getPosition());}
+  return new Block(statements,start,pos);}
 }
 
 Statement BlockStatement() :
@@ -2146,9 +2452,21 @@ Statement BlockStatement() :
   final Statement statement;
 }
 {
-  statement = Statement()         {return statement;}
+  try {
+    statement = Statement()         {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+                                     return statement;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.image +"', a statement was expected";
+    errorLevel   = ERROR;
+    errorStart = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    throw e;
+  }
 | statement = ClassDeclaration()  {return statement;}
-| statement = MethodDeclaration() {return statement;}
+| statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+                                   currentSegment.add((MethodDeclaration) statement);
+                                   ((MethodDeclaration) statement).analyzeCode();
+                                   return statement;}
 }
 
 /**
@@ -2161,141 +2479,162 @@ Statement BlockStatementNoBreak() :
 {
   statement = StatementNoBreak()  {return statement;}
 | statement = ClassDeclaration()  {return statement;}
-| statement = MethodDeclaration() {return statement;}
+| statement = MethodDeclaration() {currentSegment.add((MethodDeclaration) statement);
+                                   ((MethodDeclaration) statement).analyzeCode();
+                                   return statement;}
 }
 
-VariableDeclaration[] LocalVariableDeclaration() :
+/**
+ * used only by ForInit()
+ */
+Expression[] LocalVariableDeclaration() :
 {
   final ArrayList list = new ArrayList();
-  VariableDeclaration var;
+  Expression var;
 }
 {
-  var = LocalVariableDeclarator()
+  var = Expression()
   {list.add(var);}
-  ( <COMMA> var = LocalVariableDeclarator() {list.add(var);})*
+  ( <COMMA> var = Expression() {list.add(var);})*
   {
-    VariableDeclaration[] vars = new VariableDeclaration[list.size()];
+    final Expression[] vars = new Expression[list.size()];
     list.toArray(vars);
-  return vars;}
+    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,
-                                  jj_input_stream.getPosition());
+                                   varName,
+                                   varName.sourceStart,
+                                   varName.sourceEnd);
    }
     return new VariableDeclaration(currentSegment,
-                                    varName.toCharArray(),
-                                    initializer,
-                                    pos);
+                                   varName,
+                                   initializer,
+                                   VariableDeclaration.EQUAL,
+                                   varName.sourceStart);
   }
 }
 
 EmptyStatement EmptyStatement() :
 {
-  final int pos;
+  final Token token;
 }
 {
-  <SEMICOLON>
-  {pos = SimpleCharStream.getPosition();
-   return new EmptyStatement(pos-1,pos);}
+  token = <SEMICOLON>
+  {return new EmptyStatement(token.sourceStart,token.sourceEnd);}
 }
 
-Statement StatementExpression() :
+/**
+ * used only by StatementExpressionList() which is used only by ForInit() and ForStatement()
+ */
+Expression StatementExpression() :
 {
-  Expression expr,expr2;
-  int operator;
+  final Expression expr;
+  final Token operator;
 }
 {
   expr = PreIncDecExpression() {return expr;}
 |
   expr = PrimaryExpression()
-  [ <INCR> {return new PostfixedUnaryExpression(expr,
-                                                OperatorIds.PLUS_PLUS,
-                                                SimpleCharStream.getPosition());}
-  | <DECR> {return new PostfixedUnaryExpression(expr,
-                                                OperatorIds.MINUS_MINUS,
-                                                SimpleCharStream.getPosition());}
-  | operator = AssignmentOperator() expr2 = Expression()
-    {return new BinaryExpression(expr,expr2,operator);}
+  [ operator = <PLUS_PLUS> {return new PostfixedUnaryExpression(expr,
+                                                                OperatorIds.PLUS_PLUS,
+                                                                operator.sourceEnd);}
+  | operator = <MINUS_MINUS> {return new PostfixedUnaryExpression(expr,
+                                                                  OperatorIds.MINUS_MINUS,
+                                                                  operator.sourceEnd);}
   ]
   {return expr;}
 }
 
 SwitchStatement SwitchStatement() :
 {
-  final Expression variable;
+  Expression variable;
   final AbstractCase[] cases;
-  final int pos = SimpleCharStream.getPosition();
+  final Token switchToken,lparenToken,rparenToken;
+  int pos;
 }
 {
-  <SWITCH>
+  switchToken = <SWITCH> {pos = switchToken.sourceEnd+1;}
   try {
-    <LPAREN>
+    lparenToken = <LPAREN>
+    {pos = lparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "'(' expected after 'switch'";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
-    variable = Expression()
+    variable = Expression() {pos = variable.sourceEnd+1;}
   } catch (ParseException e) {
     if (errorMessage != null) {
       throw e;
     }
     errorMessage = "expression expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
+    variable = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos);
   }
   try {
-    <RPAREN>
+    rparenToken = <RPAREN> {pos = rparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "')' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
-  (cases = switchStatementBrace() | cases = switchStatementColon(pos, pos + 6))
-  {return new SwitchStatement(variable,cases,pos,SimpleCharStream.getPosition());}
+  (  cases = switchStatementBrace()
+   | cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd))
+  {return new SwitchStatement(variable,
+                              cases,
+                              switchToken.sourceStart,
+                              PHPParser.token.sourceEnd);}
 }
 
 AbstractCase[] switchStatementBrace() :
 {
   AbstractCase cas;
   final ArrayList cases = new ArrayList();
+  Token token;
+  int pos;
 }
 {
-  <LBRACE>
- ( cas = switchLabel0() {cases.add(cas);})*
+  token = <LBRACE> {pos = token.sourceEnd;}
+ ( cas = switchLabel0() {cases.add(cas);pos = cas.sourceEnd;})*
   try {
-    <RBRACE>
-    {
-    AbstractCase[] abcase = new AbstractCase[cases.size()];
-    cases.toArray(abcase);
-    return abcase;}
+    token = <RBRACE>
+    {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "'}' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos+1;
+    errorEnd   = pos+1;
+    processParseExceptionDebug(e);
+  }
+  {
+    final AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    return abcase;
   }
 }
+
 /**
  * A Switch statement with : ... endswitch;
  * @param start the begin offset of the switch
@@ -2305,9 +2644,11 @@ AbstractCase[] switchStatementColon(final int start, final int end) :
 {
   AbstractCase cas;
   final ArrayList cases = new ArrayList();
+  Token token;
+  int pos;
 }
 {
-  <COLON>
+  token = <COLON> {pos = token.sourceEnd;}
   {try {
   setMarker(fileToParse,
             "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;",
@@ -2318,28 +2659,29 @@ AbstractCase[] switchStatementColon(final int start, final int end) :
   } catch (CoreException e) {
     PHPeclipsePlugin.log(e);
   }}
-  ( cas = switchLabel0() {cases.add(cas);})*
+  ( cas = switchLabel0() {cases.add(cas);pos = cas.sourceEnd;})*
   try {
-    <ENDSWITCH>
+    token = <ENDSWITCH> {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "'endswitch' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos+1;
+    errorEnd   = pos+1;
+    processParseExceptionDebug(e);
   }
   try {
-    <SEMICOLON>
-    {
-    AbstractCase[] abcase = new AbstractCase[cases.size()];
-    cases.toArray(abcase);
-    return abcase;}
+    token = <SEMICOLON> {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'endswitch' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos+1;
+    errorEnd   = pos+1;
+    processParseExceptionDebug(e);
+  }
+  {
+    final AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    return abcase;
   }
 }
 
@@ -2348,20 +2690,27 @@ AbstractCase switchLabel0() :
   final Expression expr;
   Statement statement;
   final ArrayList stmts = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
+  final Token token = PHPParser.token;
 }
 {
   expr = SwitchLabel()
   ( statement = BlockStatementNoBreak() {stmts.add(statement);}
-  | statement = htmlBlock()             {stmts.add(statement);})*
-  [ statement = BreakStatement()        {stmts.add(statement);}]
+  | statement = htmlBlock()             {if (statement != null) {stmts.add(statement);}}
+  | statement = BreakStatement()        {stmts.add(statement);})*
+  //[ statement = BreakStatement()        {stmts.add(statement);}]
   {
-  Statement[] stmtsArray = new Statement[stmts.size()];
-  stmts.toArray(stmtsArray);
-  if (expr == null) {//it's a default
-    return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition());
+    final int listSize = stmts.size();
+    final Statement[] stmtsArray = new Statement[listSize];
+    stmts.toArray(stmtsArray);
+    if (expr == null) {//it's a default
+      return new DefaultCase(stmtsArray,token.sourceStart,stmtsArray[listSize-1].sourceEnd);
+    }
+    if (listSize != 0) {
+      return new Case(expr,stmtsArray,expr.sourceStart,stmtsArray[listSize-1].sourceEnd);
+    } else {
+      return new Case(expr,stmtsArray,expr.sourceStart,expr.sourceEnd);
+    }
   }
-  return new Case(expr,stmtsArray,pos,SimpleCharStream.getPosition());}
 }
 
 /**
@@ -2382,19 +2731,19 @@ Expression SwitchLabel() :
     if (errorMessage != null) throw e;
     errorMessage = "expression expected after 'case' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart = token.sourceEnd +1;
+    errorEnd   = token.sourceEnd +1;
     throw e;
   }
   try {
-    <COLON>
+    token = <COLON>
     {return expr;}
   } catch (ParseException e) {
     errorMessage = "':' expected after case expression";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = expr.sourceEnd+1;
+    errorEnd   = expr.sourceEnd+1;
+    processParseExceptionDebug(e);
   }
 |
   token = <_DEFAULT>
@@ -2404,39 +2753,43 @@ Expression SwitchLabel() :
   } catch (ParseException e) {
     errorMessage = "':' expected after 'default' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = token.sourceEnd+1;
+    errorEnd   = token.sourceEnd+1;
+    processParseExceptionDebug(e);
   }
 }
 
 Break BreakStatement() :
 {
   Expression expression = null;
-  final int start = SimpleCharStream.getPosition();
+  final Token token, token2;
+  int pos;
 }
 {
-  <BREAK> [ expression = Expression() ]
+  token = <BREAK> {pos = token.sourceEnd+1;}
+  [ expression = Expression() {pos = expression.sourceEnd+1;}]
   try {
-    <SEMICOLON>
+    token2 = <SEMICOLON>
+    {pos = token2.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'break' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
-  {return new Break(expression, start, SimpleCharStream.getPosition());}
+  {return new Break(expression, token.sourceStart, pos);}
 }
 
 IfStatement IfStatement() :
 {
-  final int pos = jj_input_stream.getPosition();
-  Expression condition;
-  IfStatement ifStatement;
+  final Expression condition;
+  final IfStatement ifStatement;
+  Token token;
 }
 {
-  <IF> condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2)
+  token = <IF> condition = Condition("if")
+  ifStatement = IfStatement0(condition,token.sourceStart,token.sourceEnd)
   {return ifStatement;}
 }
 
@@ -2451,41 +2804,41 @@ Expression Condition(final String keyword) :
   } catch (ParseException e) {
     errorMessage = "'(' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length();
-    errorEnd   = errorStart +1;
-    processParseException(e);
+    errorStart = PHPParser.token.sourceEnd + 1;
+    errorEnd   = PHPParser.token.sourceEnd + 1;
+    processParseExceptionDebug(e);
   }
   condition = Expression()
   try {
      <RPAREN>
-     {return condition;}
   } catch (ParseException e) {
     errorMessage = "')' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = condition.sourceEnd+1;
+    errorEnd   = condition.sourceEnd+1;
+    processParseExceptionDebug(e);
   }
+  {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>
   {stmts = new ArrayList();}
   (  statement = Statement() {stmts.add(statement);}
-   | statement = htmlBlock() {stmts.add(statement);})*
+   | statement = htmlBlock() {if (statement != null) {stmts.add(statement);}})*
    {endStatements = SimpleCharStream.getPosition();}
    (elseifStatement = ElseIfStatementColon() {elseIfList.add(elseifStatement);})*
    [elseStatement = ElseStatementColon()]
@@ -2505,8 +2858,8 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) :
   } catch (ParseException e) {
     errorMessage = "'endif' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
     throw e;
   }
   try {
@@ -2514,8 +2867,8 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) :
   } catch (ParseException e) {
     errorMessage = "';' expected after 'endif' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
     throw e;
   }
     {
@@ -2533,10 +2886,10 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) :
       stmts.toArray(statementsArray);
       return new IfStatement(condition,
                              new Block(statementsArray,pos,endStatements),
-                              elseIfs,
-                              elseStatement,
-                              pos,
-                              SimpleCharStream.getPosition());
+                             elseIfs,
+                             elseStatement,
+                             pos,
+                             SimpleCharStream.getPosition());
     }
     }
 
@@ -2555,8 +2908,8 @@ IfStatement IfStatement0(Expression condition, final int start,final int end) :
       }
       errorMessage = "unexpected token '"+e.currentToken.next.image+"', a statement was expected";
       errorLevel   = ERROR;
-      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = jj_input_stream.getPosition() + 1;
+      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = SimpleCharStream.getPosition() + 1;
       throw e;
     }
   ]
@@ -2573,62 +2926,64 @@ 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();
+  final Token elseifToken;
 }
 {
-  <ELSEIF> condition = Condition("elseif")
+  elseifToken = <ELSEIF> condition = Condition("elseif")
   <COLON> (  statement = Statement() {list.add(statement);}
-           | statement = htmlBlock() {list.add(statement);})*
+           | statement = htmlBlock() {if (statement != null) {list.add(statement);}})*
   {
-  Statement[] stmtsArray = new Statement[list.size()];
+  final int sizeList = list.size();
+  final Statement[] stmtsArray = new Statement[sizeList];
   list.toArray(stmtsArray);
-  return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());}
+  return new ElseIf(condition,stmtsArray ,
+                    elseifToken.sourceStart,
+                    stmtsArray[sizeList-1].sourceEnd);}
 }
 
 Else ElseStatementColon() :
 {
   Statement statement;
   final ArrayList list = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
+  final Token elseToken;
 }
 {
-  <ELSE> <COLON> (  statement = Statement() {list.add(statement);}
-                  | statement = htmlBlock() {list.add(statement);})*
+  elseToken = <ELSE> <COLON> (  statement = Statement() {list.add(statement);}
+                  | statement = htmlBlock() {if (statement != null) {list.add(statement);}})*
   {
-  Statement[] stmtsArray = new Statement[list.size()];
+  final int sizeList = list.size();
+  final Statement[] stmtsArray = new Statement[sizeList];
   list.toArray(stmtsArray);
-  return new Else(stmtsArray,pos,SimpleCharStream.getPosition());}
+  return new Else(stmtsArray,elseToken.sourceStart,stmtsArray[sizeList-1].sourceEnd);}
 }
 
 ElseIf ElseIfStatement() :
 {
-  Expression condition;
-  Statement statement;
-  final ArrayList list = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
+  final Expression condition;
+  //final Statement statement;
+  final Token elseifToken;
+  final Statement[] statement = new Statement[1];
 }
 {
-  <ELSEIF> condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/}
+  elseifToken = <ELSEIF> condition = Condition("elseif") statement[0] = Statement()
   {
-  Statement[] stmtsArray = new Statement[list.size()];
-  list.toArray(stmtsArray);
-  return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());}
+  return new ElseIf(condition,statement,elseifToken.sourceStart,statement[0].sourceEnd);}
 }
 
 WhileStatement WhileStatement() :
 {
   final Expression condition;
   final Statement action;
-  final int pos = SimpleCharStream.getPosition();
+  final Token whileToken;
 }
 {
-  <WHILE>
+  whileToken = <WHILE>
     condition = Condition("while")
-    action    = WhileStatement0(pos,pos + 5)
-    {return new WhileStatement(condition,action,pos,SimpleCharStream.getPosition());}
+    action    = WhileStatement0(whileToken.sourceStart,whileToken.sourceEnd)
+    {return new WhileStatement(condition,action,whileToken.sourceStart,action.sourceEnd);}
 }
 
 Statement WhileStatement0(final int start, final int end) :
@@ -2654,21 +3009,21 @@ Statement WhileStatement0(final int start, final int end) :
   } catch (ParseException e) {
     errorMessage = "'endwhile' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
     throw e;
   }
   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) {
     errorMessage = "';' expected after 'endwhile' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
+    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = SimpleCharStream.getPosition() + 1;
     throw e;
   }
 |
@@ -2680,104 +3035,125 @@ DoStatement DoStatement() :
 {
   final Statement action;
   final Expression condition;
-  final int pos = SimpleCharStream.getPosition();
+  final Token token;
+  Token token2 = null;
 }
 {
-  <DO> action = Statement() <WHILE> condition = Condition("while")
+  token = <DO> action = Statement() <WHILE> condition = Condition("while")
   try {
-    <SEMICOLON>
-    {return new DoStatement(condition,action,pos,SimpleCharStream.getPosition());}
+    token2 = <SEMICOLON>
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = condition.sourceEnd+1;
+    errorEnd   = condition.sourceEnd+1;
+    processParseExceptionDebug(e);
+  }
+  {
+    if (token2 == null) {
+      return new DoStatement(condition,action,token.sourceStart,condition.sourceEnd);
+    }
+    return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd);
   }
 }
 
 ForeachStatement ForeachStatement() :
 {
-  Statement statement;
-  Expression expression;
-  final int pos = SimpleCharStream.getPosition();
-  ArrayVariableDeclaration variable;
+  Statement statement = null;
+  Expression expression = null;
+  ArrayVariableDeclaration variable = null;
+  Token foreachToken;
+  Token lparenToken = null;
+  Token asToken = null;
+  Token rparenToken = null;
+  int pos;
 }
 {
-  <FOREACH>
-    try {
-    <LPAREN>
+  foreachToken = <FOREACH>
+  try {
+    lparenToken = <LPAREN>
+    {pos = lparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "'(' expected after 'foreach' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = foreachToken.sourceEnd+1;
+    errorEnd   = foreachToken.sourceEnd+1;
+    processParseExceptionDebug(e);
+    {pos = foreachToken.sourceEnd+1;}
   }
   try {
     expression = Expression()
+    {pos = expression.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "variable expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
-    <AS>
+    asToken = <AS>
+    {pos = asToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "'as' expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
     variable = ArrayVariable()
+    {pos = variable.sourceEnd+1;}
   } catch (ParseException e) {
+    if (errorMessage != null) throw e;
     errorMessage = "variable expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
-    <RPAREN>
+    rparenToken = <RPAREN>
+    {pos = rparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "')' expected after 'foreach' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
     statement = Statement()
+    {pos = rparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     if (errorMessage != null) throw e;
     errorMessage = "statement expected";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   {return new ForeachStatement(expression,
                                variable,
                                statement,
-                               pos,
-                               SimpleCharStream.getPosition());}
+                               foreachToken.sourceStart,
+                               statement.sourceEnd);}
 
 }
 
+/**
+ * a for declaration.
+ * @return a node representing the for statement
+ */
 ForStatement ForStatement() :
 {
-final Token token;
-final int pos = SimpleCharStream.getPosition();
-Statement[] initializations = null;
+final Token token,tokenEndFor,token2,tokenColon;
+int pos;
+Expression[] initializations = null;
 Expression condition = null;
-Statement[] increments = null;
+Expression[] increments = null;
 Statement action;
 final ArrayList list = new ArrayList();
-final int startBlock, endBlock;
 }
 {
   token = <FOR>
@@ -2786,119 +3162,161 @@ final int startBlock, endBlock;
   } catch (ParseException e) {
     errorMessage = "'(' expected after 'for' keyword";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    errorStart = token.sourceEnd;
+    errorEnd   = token.sourceEnd +1;
+    processParseExceptionDebug(e);
   }
      [ initializations = ForInit() ] <SEMICOLON>
      [ condition = Expression() ] <SEMICOLON>
      [ increments = StatementExpressionList() ] <RPAREN>
     (
       action = Statement()
-      {return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());}
+      {return new ForStatement(initializations,
+                               condition,
+                               increments,
+                               action,
+                               token.sourceStart,
+                               action.sourceEnd);}
     |
-      <COLON>
-      {startBlock = SimpleCharStream.getPosition();}
-      (action = Statement() {list.add(action);})*
+      tokenColon = <COLON> {pos = tokenColon.sourceEnd+1;}
+      (action = Statement() {list.add(action);pos = action.sourceEnd+1;})*
       {
         try {
         setMarker(fileToParse,
                   "Ugly syntax detected, you should for () {...} instead of for (): ... endfor;",
-                  pos,
-                  pos+token.image.length(),
+                  token.sourceStart,
+                  token.sourceEnd,
                   INFO,
                   "Line " + token.beginLine);
         } catch (CoreException e) {
           PHPeclipsePlugin.log(e);
         }
       }
-      {endBlock = SimpleCharStream.getPosition();}
       try {
-        <ENDFOR>
+        tokenEndFor = <ENDFOR>
+        {pos = tokenEndFor.sourceEnd+1;}
       } catch (ParseException e) {
         errorMessage = "'endfor' expected";
         errorLevel   = ERROR;
-        errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-        errorEnd   = jj_input_stream.getPosition() + 1;
-        throw e;
+        errorStart = pos;
+        errorEnd   = pos;
+        processParseExceptionDebug(e);
       }
       try {
-        <SEMICOLON>
-        {
-        Statement[] stmtsArray = new Statement[list.size()];
-        list.toArray(stmtsArray);
-        return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());}
+        token2 = <SEMICOLON>
+        {pos = token2.sourceEnd+1;}
       } catch (ParseException e) {
         errorMessage = "';' expected after 'endfor' keyword";
         errorLevel   = ERROR;
-        errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-        errorEnd   = jj_input_stream.getPosition() + 1;
-        throw e;
+        errorStart = pos;
+        errorEnd   = pos;
+        processParseExceptionDebug(e);
       }
+      {
+      final Statement[] stmtsArray = new Statement[list.size()];
+      list.toArray(stmtsArray);
+      return new ForStatement(initializations,
+                              condition,
+                              increments,
+                              new Block(stmtsArray,
+                                        stmtsArray[0].sourceStart,
+                                        stmtsArray[stmtsArray.length-1].sourceEnd),
+                              token.sourceStart,
+                              pos);}
     )
 }
 
-Statement[] ForInit() :
+Expression[] ForInit() :
 {
-  Statement[] statements;
+  final Expression[] exprs;
 }
 {
   LOOKAHEAD(LocalVariableDeclaration())
-  statements = LocalVariableDeclaration()
-  {return statements;}
+  exprs = LocalVariableDeclaration()
+  {return exprs;}
 |
-  statements = StatementExpressionList()
-  {return statements;}
+  exprs = StatementExpressionList()
+  {return exprs;}
 }
 
-Statement[] StatementExpressionList() :
+Expression[] StatementExpressionList() :
 {
   final ArrayList list = new ArrayList();
-  Statement expr;
+  final Expression expr;
 }
 {
-  expr = StatementExpression()   {list.add(expr);}
-  (<COMMA> StatementExpression() {list.add(expr);})*
+  expr = Expression()   {list.add(expr);}
+  (<COMMA> Expression() {list.add(expr);})*
   {
-  Statement[] stmtsArray = new Statement[list.size()];
-  list.toArray(stmtsArray);
-  return stmtsArray;}
+    final Expression[] exprsArray = new Expression[list.size()];
+    list.toArray(exprsArray);
+    return exprsArray;
+  }
 }
 
 Continue ContinueStatement() :
 {
   Expression expr = null;
-  final int pos = SimpleCharStream.getPosition();
+  final Token token;
+  Token token2 = null;
 }
 {
-  <CONTINUE> [ expr = Expression() ]
+  token = <CONTINUE> [ expr = Expression() ]
   try {
-    <SEMICOLON>
-    {return new Continue(expr,pos,SimpleCharStream.getPosition());}
+    token2 = <SEMICOLON>
   } catch (ParseException e) {
     errorMessage = "';' expected after 'continue' statement";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    if (expr == null) {
+      errorStart = token.sourceEnd+1;
+      errorEnd   = token.sourceEnd+1;
+    } else {
+      errorStart = expr.sourceEnd+1;
+      errorEnd   = expr.sourceEnd+1;
+    }
+    processParseExceptionDebug(e);
+  }
+  {
+    if (token2 == null) {
+      if (expr == null) {
+        return new Continue(expr,token.sourceStart,token.sourceEnd);
+      }
+      return new Continue(expr,token.sourceStart,expr.sourceEnd);
+    }
+    return new Continue(expr,token.sourceStart,token2.sourceEnd);
   }
 }
 
 ReturnStatement ReturnStatement() :
 {
   Expression expr = null;
-  final int pos = SimpleCharStream.getPosition();
+  final Token token;
+  Token token2 = null;
 }
 {
-  <RETURN> [ expr = Expression() ]
+  token = <RETURN> [ expr = Expression() ]
   try {
-    <SEMICOLON>
-    {return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());}
+    token2 = <SEMICOLON>
   } catch (ParseException e) {
     errorMessage = "';' expected after 'return' statement";
     errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+    if (expr == null) {
+      errorStart = token.sourceEnd+1;
+      errorEnd   = token.sourceEnd+1;
+    } else {
+      errorStart = expr.sourceEnd+1;
+      errorEnd   = expr.sourceEnd+1;
+    }
+    processParseExceptionDebug(e);
   }
-}
\ No newline at end of file
+  {
+    if (token2 == null) {
+      if (expr == null) {
+        return new ReturnStatement(expr,token.sourceStart,token.sourceEnd);
+      }
+      return new ReturnStatement(expr,token.sourceStart,expr.sourceEnd);
+    }
+    return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd);
+  }
+}
+