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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 35b3173..14f1716 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,15 +31,18 @@ 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.*;
 import java.text.MessageFormat;
 
 import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpdt.internal.compiler.parser.*;
 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.
@@ -48,19 +53,17 @@ import net.sourceforge.phpdt.internal.compiler.ast.*;
  */
 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 PHPSegmentWithChildren currentSegment;
+  private static OutlineableWithChildren currentSegment;
 
   private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$
   private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
   static PHPOutlineInfo outlineInfo;
 
-  private static PHPFunctionDeclaration 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 */
@@ -68,16 +71,26 @@ 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
+   */
+  public static int htmlStart;
 
   //ast stack
   private final static int AstStackIncrement = 100;
   /** The stack of node. */
-  private static AstNode[] astStack;
+  private static AstNode[] nodes;
   /** The cursor in expression stack. */
-	private static int expressionPtr;
+  private static int nodePtr;
+
+  public static final boolean PARSER_DEBUG = false;
 
   public final void setFileToParse(final IFile fileToParse) {
-    this.fileToParse = fileToParse;
+    PHPParser.fileToParse = fileToParse;
   }
 
   public PHPParser() {
@@ -85,55 +98,92 @@ 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 CoreException, ParseException {
-    PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
+  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));
-    astStack = new AstNode[AstStackIncrement];
+    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 CoreException, ParseException {
-    try {
-      final Reader stream = new FileReader(fileName);
-      if (jj_input_stream == null) {
-        jj_input_stream = new SimpleCharStream(stream, 1, 1);
-      }
-      ReInit(stream);
-      astStack = new AstNode[AstStackIncrement];
-      phpFile();
-    } catch (FileNotFoundException e) {
-      e.printStackTrace();  //To change body of catch statement use Options | File Templates.
+  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 CoreException, ParseException {
+  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);
-    astStack = new AstNode[AstStackIncrement];
+    init();
+    phpDocument = new PHPDocument(null,"_root".toCharArray());
+    currentSegment = phpDocument;
+    outlineInfo = new PHPOutlineInfo(null, currentSegment);
     phpFile();
   }
 
+  /**
+   * Reinitialize the parser.
+   */
+  private static final void init() {
+    nodes = new AstNode[AstStackIncrement];
+    nodePtr = -1;
+    htmlStart = 0;
+  }
+
+  /**
+   * Add an php node on the stack.
+   * @param node the node that will be added to the stack
+   */
+  private static final void pushOnAstNodes(final AstNode node) {
+    try {
+      nodes[++nodePtr] = node;
+    } catch (IndexOutOfBoundsException e) {
+      final int oldStackLength = nodes.length;
+      final AstNode[] oldStack = nodes;
+      nodes = new AstNode[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, nodes, 0, oldStackLength);
+      nodePtr = oldStackLength;
+      nodes[nodePtr] = node;
+    }
+  }
+
   public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
-    outlineInfo = new PHPOutlineInfo(parent);
-    currentSegment = outlineInfo.getDeclarations();
+    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);
     }
     ReInit(stream);
-    astStack = new AstNode[AstStackIncrement];
+    init();
     try {
       parse();
+      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);
     }
@@ -141,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
@@ -149,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) {
@@ -165,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;
       }
@@ -184,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++) {
@@ -229,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>", "");
@@ -250,13 +289,13 @@ 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);
     }
     ReInit(stream);
-    astStack = new AstNode[AstStackIncrement];
+    init();
     try {
       parse();
     } catch (ParseException e) {
@@ -286,6 +325,39 @@ public final class PHPParser extends PHPParserSuperclass {
     }
   }
 
+  /**
+   * Put a new html block in the stack.
+   */
+  public static final void createNewHTMLCode() {
+    final int currentPosition = token.sourceStart;
+    if (currentPosition == htmlStart ||
+          currentPosition < htmlStart ||
+          currentPosition > SimpleCharStream.currentBuffer.length()) {
+      return;
+    }
+    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();
   }
@@ -293,14 +365,26 @@ 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 : "<?">   : PHPPARSING
-| <PHPSTARTLONG : "<?php"> : PHPPARSING
-| <PHPECHOSTART : "<?=">   : PHPPARSING
+  <PHPSTARTSHORT : "<?">    : PHPPARSING
+| <PHPSTARTLONG  : "<?php"> : PHPPARSING
+| <PHPECHOSTART  : "<?=">   : PHPPARSING
 }
 
-<PHPPARSING> TOKEN :
+<PHPPARSING, IN_SINGLE_LINE_COMMENT,IN_VARIABLE> TOKEN :
 {
   <PHPEND :"?>"> : DEFAULT
 }
@@ -322,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>
@@ -386,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 */
@@ -435,71 +533,137 @@ MORE :
 | <INTEGER : "integer">
 }
 
-<PHPPARSING> TOKEN :
+//Misc token
+<PHPPARSING,IN_VARIABLE> TOKEN :
 {
-  <_ORL  : "OR">
-| <_ANDL : "AND">
+  <AT                 : "@"> : PHPPARSING
+| <BANG               : "!"> : PHPPARSING
+| <TILDE              : "~"> : PHPPARSING
+| <HOOK               : "?"> : PHPPARSING
+| <COLON              : ":"> : PHPPARSING
+}
+
+/* OPERATORS */
+<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 */
 <PHPPARSING> TOKEN :
 {
-  < INTEGER_LITERAL:
+  <INTEGER_LITERAL:
         <DECIMAL_LITERAL> (["l","L"])?
       | <HEX_LITERAL> (["l","L"])?
       | <OCTAL_LITERAL> (["l","L"])?
   >
 |
-  < #DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* >
+  <#DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* >
 |
-  < #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ >
+  <#HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ >
 |
-  < #OCTAL_LITERAL: "0" (["0"-"7"])* >
+  <#OCTAL_LITERAL: "0" (["0"-"7"])* >
 |
-  < FLOATING_POINT_LITERAL:
+  <FLOATING_POINT_LITERAL:
         (["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)? (["f","F","d","D"])?
       | "." (["0"-"9"])+ (<EXPONENT>)? (["f","F","d","D"])?
       | (["0"-"9"])+ <EXPONENT> (["f","F","d","D"])?
       | (["0"-"9"])+ (<EXPONENT>)? ["f","F","d","D"]
   >
 |
-  < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
+  <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
 |
-  < STRING_LITERAL: (<STRING_1> | <STRING_2> | <STRING_3>)>
-|    < STRING_1:
-      "\""
-      (
-          ~["\"","{","}"]
-        | "\\\""
-        | "\\"
-        | "{" ~["\""] "}"
-      )*
-      "\""
-    >
-|    < STRING_2:
-      "'"
-      (
-         ~["'"]
-       | "\\'"
-      )*
+  <STRING_LITERAL: (<STRING_2> | <STRING_3>)>
+//|   <STRING_1: "\"" ( ~["\"","\\"] | "\\" ~[] )* "\"">
+|   <STRING_2: "'"  ( ~["'","\\"]  | "\\" ~[] )* "'">
+|   <STRING_3: "`"  ( ~["`","\\"]  | "\\" ~[] )* "`">
+}
 
-      "'"
-    >
-|   < STRING_3:
-      "`"
-      (
-        ~["`"]
-      | "\\`"
-      )*
-      "`"
-    >
+<IN_STRING,DOLLAR_IN_STRING> SKIP :
+{
+  <ESCAPED : ("\\" ~[])> : IN_STRING
+}
+
+<PHPPARSING> TOKEN :
+{
+  <DOUBLEQUOTE : "\""> : IN_STRING
+}
+
+
+<IN_STRING> TOKEN :
+{
+  <DOLLARS : "$"> : DOLLAR_IN_STRING
+}
+
+<IN_STRING,DOLLAR_IN_STRING> TOKEN :
+{
+  <DOUBLEQUOTE2 : "\""> : PHPPARSING
+}
+
+<DOLLAR_IN_STRING> TOKEN :
+{
+  <LBRACE1 : "{"> : DOLLAR_IN_STRING_EXPR
+}
+
+<IN_STRING> SPECIAL_TOKEN :
+{
+    <"{"> : SKIPSTRING
+}
+
+<SKIPSTRING> SPECIAL_TOKEN :
+{
+    <"}"> : IN_STRING
 }
 
+<SKIPSTRING> SKIP :
+{
+    <~[]>
+}
+
+<DOLLAR_IN_STRING_EXPR> TOKEN :
+{
+  <RBRACE1 : "}"> : DOLLAR_IN_STRING
+}
+
+<DOLLAR_IN_STRING_EXPR> TOKEN :
+{
+  <ID : (~["}"])*>
+}
+
+<IN_STRING> SKIP :
+{
+  <~[]>
+}
+
+<DOLLAR_IN_STRING_EXPR,IN_STRING> SKIP :
+{
+  <~[]>
+}
 /* IDENTIFIERS */
 
-<PHPPARSING> TOKEN :
+
+<PHPPARSING,IN_VARIABLE> TOKEN : {<DOLLAR : "$"> : IN_VARIABLE}
+
+
+<PHPPARSING, IN_VARIABLE, DOLLAR_IN_STRING> TOKEN :
 {
-  < IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
+  <IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
 |
   < #LETTER:
       ["a"-"z"] | ["A"-"Z"]
@@ -514,83 +678,56 @@ MORE :
   >
 }
 
+<DOLLAR_IN_STRING> SPECIAL_TOKEN :
+{
+ < ~[] > : IN_STRING
+}
 /* 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                 : "<">
-| <EQ                 : "==">
-| <LE                 : "<=">
-| <GE                 : ">=">
-| <NE                 : "!=">
-| <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         : "~=">
-}
-
-/* OPERATORS */
-<PHPPARSING> TOKEN :
-{
-  <AT                 : "@">
-| <DOLLAR             : "$">
-| <BANG               : "!">
-| <TILDE              : "~">
-| <HOOK               : "?">
-| <COLON              : ":">
-| <SC_OR              : "||">
-| <SC_AND             : "&&">
-| <INCR               : "++">
-| <DECR               : "--">
-| <PLUS               : "+">
-| <MINUS              : "-">
-| <STAR               : "*">
-| <SLASH              : "/">
-| <BIT_AND            : "&">
-| <BIT_OR             : "|">
-| <XOR                : "^">
-| <REM                : "%">
-| <LSHIFT             : "<<">
-| <RSIGNEDSHIFT       : ">>">
-| <RUNSIGNEDSHIFT     : ">>>">
-| <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() :
@@ -605,11 +742,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();
@@ -623,40 +760,55 @@ 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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
   }
 }
 
-void phpEchoBlock() :
-{}
+PHPEchoBlock phpEchoBlock() :
 {
-  <PHPECHOSTART> Expression() [ <SEMICOLON> ] <PHPEND>
+  final Expression expr;
+  final PHPEchoBlock echoBlock;
+  final Token token, token2;
+}
+{
+  token = <PHPECHOSTART> {PHPParser.createNewHTMLCode();}
+  expr = Expression() [ <SEMICOLON> ] token2 = <PHPEND>
+  {
+  htmlStart = token2.sourceEnd;
+
+  echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd);
+  pushOnAstNodes(echoBlock);
+  return echoBlock;}
 }
 
 void Php() :
@@ -665,350 +817,411 @@ void Php() :
   (BlockStatement())*
 }
 
-void ClassDeclaration() :
+ClassDeclaration ClassDeclaration() :
 {
-  final PHPClassDeclaration classDeclaration;
-  final Token className;
-  final int pos;
+  final ClassDeclaration classDeclaration;
+  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 {
-      <IDENTIFIER>
+      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 (currentSegment != null) {
-      classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos);
-      currentSegment.add(classDeclaration);
-      currentSegment = classDeclaration;
+    int start, end;
+    if (className == null) {
+      start = token.sourceStart;
+      end = token.sourceEnd;
+    } else {
+      start = className.sourceStart;
+      end = className.sourceEnd;
     }
-  }
-  ClassBody()
-  {
-    if (currentSegment != null) {
-      currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
+    if (superclassNameImage == null) {
+
+      classDeclaration = new ClassDeclaration(currentSegment,
+                                              classNameImage,
+                                              start,
+                                              end);
+    } else {
+      classDeclaration = new ClassDeclaration(currentSegment,
+                                              classNameImage,
+                                              superclassNameImage,
+                                              start,
+                                              end);
     }
+      currentSegment.add(classDeclaration);
+      currentSegment = classDeclaration;
   }
+  classEnd = ClassBody(classDeclaration)
+  {currentSegment = (OutlineableWithChildren) currentSegment.getParent();
+   classDeclaration.sourceEnd = classEnd;
+   pushOnAstNodes(classDeclaration);
+   return classDeclaration;}
 }
 
-void ClassBody() :
-{}
+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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
   }
-  ( ClassBodyDeclaration() )*
+  ( 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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
+    return PHPParser.token.sourceEnd;
   }
 }
 
 /**
  * A class can contain only methods and fields.
  */
-void ClassBodyDeclaration() :
-{}
+void ClassBodyDeclaration(final ClassDeclaration classDeclaration) :
+{
+  final MethodDeclaration method;
+  final FieldDeclaration field;
+}
 {
-  MethodDeclaration()
-| FieldDeclaration()
+  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()
  */
-void FieldDeclaration() :
+FieldDeclaration FieldDeclaration() :
 {
-  PHPVarDeclaration variableDeclaration;
+  VariableDeclaration variableDeclaration;
+  final VariableDeclaration[] list;
+  final ArrayList arrayList = new ArrayList();
+  final Token token;
+  Token token2 = null;
+  int pos;
 }
 {
-  <VAR> variableDeclaration = VariableDeclarator()
+  token = <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
   {
-    outlineInfo.addVariable(variableDeclaration.getVariable().getName());
-    if (currentSegment != null) {
-      currentSegment.add(variableDeclaration);
-    }
+    arrayList.add(variableDeclaration);
+    pos = variableDeclaration.sourceEnd;
   }
-  ( <COMMA>
-      variableDeclaration = VariableDeclarator()
+  (
+    <COMMA> variableDeclaration = VariableDeclaratorNoSuffix()
       {
-      if (currentSegment != null) {
-        currentSegment.add(variableDeclaration);
-      }
+        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,
+                               token.sourceStart,
+                               end,
+                               currentSegment);}
 }
 
-PHPVarDeclaration VariableDeclarator() :
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ * It will be used by fields and formal parameters
+ */
+VariableDeclaration VariableDeclaratorNoSuffix() :
 {
-  final String varName, varValue;
-  final int pos = jj_input_stream.getPosition();
+  final Token token, lbrace,rbrace;
+  Expression expr, initializer = null;
+  Token assignToken;
+  Variable variable;
 }
 {
-  varName = VariableDeclaratorId()
+  <DOLLAR>
+  (
+     token = <IDENTIFIER>
+     {variable = new Variable(token.image,token.sourceStart,token.sourceEnd);}
+   |
+     lbrace = <LBRACE> expr = Expression() rbrace = <RBRACE>
+     {variable = new Variable(expr,lbrace.sourceStart,rbrace.sourceEnd);}
+  )
   [
-    <ASSIGN>
+    assignToken = <ASSIGN>
     try {
-      varValue = VariableInitializer()
-      {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);}
+      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 = 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 AbstractVariable variable;
+  Expression initializer = null;
+  final Token token;
+}
+{
+  variable = VariableDeclaratorId()
+  [
+    token = <ASSIGN>
+    try {
+      initializer = VariableInitializer()
+    } catch (ParseException e) {
+      errorMessage = "Literal expression expected in variable initializer";
+      errorLevel   = ERROR;
+      errorStart = token.sourceEnd+1;
+      errorEnd   = token.sourceEnd+1;
+      processParseExceptionDebug(e);
     }
   ]
-  {return new PHPVarDeclaration(currentSegment,varName,pos);}
+  {
+  if (initializer == null) {
+    return new VariableDeclaration(currentSegment,
+                                   variable,
+                                   variable.sourceStart,
+                                   variable.sourceEnd);
+  }
+    return new VariableDeclaration(currentSegment,
+                                   variable,
+                                   initializer,
+                                   VariableDeclaration.EQUAL,
+                                   variable.sourceStart);
+  }
 }
 
-String VariableDeclaratorId() :
+/**
+ * A Variable name.
+ * @return the variable name (with suffix)
+ */
+AbstractVariable VariableDeclaratorId() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  final Variable var;
+  AbstractVariable expression = null;
 }
 {
   try {
-    expr = Variable()   {buff.append(expr);}
-    ( LOOKAHEAD(2)
-      expr = VariableSuffix() {buff.append(expr);}
+    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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
     throw e;
   }
 }
 
-String Variable():
+Variable Variable() :
 {
-  String expr = null;
+  Variable variable = null;
   final Token token;
 }
 {
-  token = <DOLLAR_ID> [<LBRACE> expr = Expression() <RBRACE>]
+  token = <DOLLAR> variable = Var()
   {
-    if (expr == null && !assigning) {
-      if (currentFunction != null) {
-        PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1));
-        if (var != null) {
-          var.getVariable().setUsed(true);
-        }
-      }
-      return token.image.substring(1);
-    }
-    return token + "{" + expr + "}";
+    return variable;
   }
-|
-  <DOLLAR> expr = VariableName()
-  {return expr;}
 }
 
-String VariableName():
+Variable Var() :
 {
-String expr = null;
-final Token token;
+  Variable variable = null;
+  final Token token,token2;
+  ConstantIdentifier constant;
+  Expression expression;
 }
 {
-  <LBRACE> expr = Expression() <RBRACE>
-  {return "{"+expr+"}";}
+  token = <DOLLAR> variable = Var()
+  {return new Variable(variable,variable.sourceStart,variable.sourceEnd);}
 |
-  token = <IDENTIFIER> [<LBRACE> expr = Expression() <RBRACE>]
+  token = <LBRACE> expression = Expression() token2 = <RBRACE>
   {
-    if (expr == null) {
-      if (currentFunction != null) {
-        PHPVarDeclaration var = currentFunction.getParameter(token.image);
-        if (var != null) {
-          var.getVariable().setUsed(true);
-        }
-      }
-      return token.image;
-    }
-    return token + "{" + expr + "}";
+   return new Variable(expression,
+                       token.sourceStart,
+                       token2.sourceEnd);
   }
 |
-  <DOLLAR> expr = VariableName()
-  {
-    if (currentFunction != null) {
-      PHPVarDeclaration var = currentFunction.getParameter(expr);
-      if (var != null) {
-        var.getVariable().setUsed(true);
-      }
-    }
-    return "$" + expr;
-  }
-|
-  token = <DOLLAR_ID>
-  {
-    if (currentFunction != null) {
-      PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1));
-      if (var != null) {
-        var.getVariable().setUsed(true);
-      }
-    }
-    return token.image + expr;
-  }
-/*|      pas besoin ?
-  token = <DOLLAR_ID> [expr = VariableName()]
+  token = <IDENTIFIER>
   {
-  if (expr == null) {
-    return token.image;
+   outlineInfo.addVariable("$" + token.image);
+   return new Variable(token.image,token.sourceStart,token.sourceEnd);
   }
-  return token.image + expr;
-  }*/
 }
 
-String VariableInitializer() :
+Expression VariableInitializer() :
 {
-  final String expr;
-  final Token token;
+  final Expression expr;
+  final Token token, token2;
 }
 {
   expr = Literal()
   {return expr;}
 |
-  <MINUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
-  {return "-" + token.image;}
+  token2 = <MINUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+  {return new PrefixedUnaryExpression(new NumberLiteral(token),
+                                      OperatorIds.MINUS,
+                                      token2.sourceStart);}
 |
-  <PLUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
-  {return "+" + token.image;}
+  token2 = <PLUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+  {return new PrefixedUnaryExpression(new NumberLiteral(token),
+                                      OperatorIds.PLUS,
+                                      token2.sourceStart);}
 |
   expr = ArrayDeclarator()
   {return expr;}
 |
   token = <IDENTIFIER>
-  {return token.image;}
+  {return new ConstantIdentifier(token);}
 }
 
-String ArrayVariable() :
+ArrayVariableDeclaration ArrayVariable() :
 {
-String expr;
-final StringBuffer buff = new StringBuffer();
+final Expression expr,expr2;
 }
 {
   expr = Expression()
-  {buff.append(expr);}
-   [<ARRAYASSIGN> expr = Expression()
-   {buff.append("=>").append(expr);}]
-  {return buff.toString();}
+  [
+    <ARRAYASSIGN> expr2 = Expression()
+    {return new ArrayVariableDeclaration(expr,expr2);}
+  ]
+  {return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
 }
 
-String ArrayInitializer() :
+ArrayVariableDeclaration[] ArrayInitializer() :
 {
-String expr;
-final StringBuffer buff = new StringBuffer("(");
+  ArrayVariableDeclaration expr;
+  final ArrayList list = new ArrayList();
 }
 {
-  <LPAREN> [ expr = ArrayVariable()
-            {buff.append(expr);}
-            ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
-            {buff.append(",").append(expr);}
-            )*
-           ]
-           [<COMMA> {buff.append(",");}]
+  <LPAREN>
+    [
+      expr = ArrayVariable()
+      {list.add(expr);}
+      ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
+      {list.add(expr);}
+      )*
+    ]
+    [
+      <COMMA> {list.add(null);}
+    ]
   <RPAREN>
   {
-    buff.append(")");
-    return buff.toString();
-  }
+  final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+  list.toArray(vars);
+  return vars;}
 }
 
 /**
  * A Method Declaration.
  * <b>function</b> MetodDeclarator() Block()
  */
-void MethodDeclaration() :
+MethodDeclaration MethodDeclaration() :
 {
-  final PHPFunctionDeclaration functionDeclaration;
-  Token functionToken;
+  final MethodDeclaration functionDeclaration;
+  final Block block;
+  final OutlineableWithChildren seg = currentSegment;
+  final Token token;
 }
 {
-  functionToken = <FUNCTION>
+  token = <FUNCTION>
   try {
-    functionDeclaration = MethodDeclarator()
-    {outlineInfo.addVariable(functionDeclaration.getName());}
+    functionDeclaration = MethodDeclarator(token.sourceStart)
+    {outlineInfo.addVariable(functionDeclaration.name);}
   } catch (ParseException e) {
-    if (errorMessage != null) {
-      throw 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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
     throw e;
   }
-  {
-    if (currentSegment != null) {
-      currentSegment.add(functionDeclaration);
-      currentSegment = functionDeclaration;
-    }
-    currentFunction = functionDeclaration;
-  }
-  Block()
-  {
-    Hashtable parameters = currentFunction.getParameters();
-    Enumeration vars = parameters.elements();
-    while (vars.hasMoreElements()) {
-      PHPVarDeclaration o = (PHPVarDeclaration) vars.nextElement();
-      if (!o.getVariable().isUsed()) {
-        try {
-          setMarker(fileToParse,
-                    "Parameter "+o.getVariable().getName()+" is never used in function",
-                    functionToken.beginLine,
-                    WARNING,
-                    "Line " + token.beginLine);
-        } catch (CoreException e) {
-          PHPeclipsePlugin.log(e);
-        }
-      }
-    }
-    currentFunction = null;
-    if (currentSegment != null) {
-      currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
-    }
-  }
+  {currentSegment = functionDeclaration;}
+  block = Block()
+  {functionDeclaration.statements = block.statements;
+   currentSegment = seg;
+   return functionDeclaration;}
 }
 
 /**
@@ -1016,20 +1229,52 @@ void MethodDeclaration() :
  * [&] IDENTIFIER(parameters ...).
  * @return a function description for the outline
  */
-PHPFunctionDeclaration MethodDeclarator() :
+MethodDeclaration MethodDeclarator(final int start) :
 {
-  final Token identifier;
-  final StringBuffer methodDeclaration = new StringBuffer();
-  final Hashtable formalParameters;
-  final int pos = jj_input_stream.getPosition();
+  Token identifier = null;
+  Token reference = null;
+  final ArrayList formalParameters = new ArrayList();
+  String identifierChar = SYNTAX_ERROR_CHAR;
+  int end = start;
 }
 {
-  [ <BIT_AND> {methodDeclaration.append("&");} ]
-  identifier = <IDENTIFIER>
-  formalParameters = FormalParameters()
+  [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)
   {
-    methodDeclaration.append(identifier);
-    return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,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);
   }
 }
 
@@ -1037,408 +1282,454 @@ PHPFunctionDeclaration MethodDeclarator() :
  * FormalParameters follows method identifier.
  * (FormalParameter())
  */
-Hashtable FormalParameters() :
+int FormalParameters(final ArrayList parameters) :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer("(");
-  PHPVarDeclaration var;
-  final Hashtable parameters = new Hashtable();
+  VariableDeclaration var;
+  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(var.getVariable().getName(),var);}
-              (
-                <COMMA> var = FormalParameter()
-                {parameters.put(var.getVariable().getName(),var);}
-              )*
-            ]
+  [
+    var = FormalParameter()
+    {parameters.add(var);end = var.sourceEnd;}
+    (
+      <COMMA> var = FormalParameter()
+      {parameters.add(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;}
 }
 
 /**
  * A formal parameter.
  * $varname[=value] (,$varname[=value])
  */
-PHPVarDeclaration FormalParameter() :
+VariableDeclaration FormalParameter() :
 {
-  final PHPVarDeclaration variableDeclaration;
+  final VariableDeclaration variableDeclaration;
   Token token = null;
 }
 {
-  [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
+  [token = <BIT_AND>] variableDeclaration = VariableDeclaratorNoSuffix()
   {
+    outlineInfo.addVariable("$"+variableDeclaration.name());
     if (token != null) {
-      variableDeclaration.getVariable().setReference(true);
+      variableDeclaration.setReference(true);
     }
-    return variableDeclaration;
-  }
-}
-
-String Type() :
-{}
-{
-  <STRING>  {return "string";}
-| <BOOL>    {return "bool";}
-| <BOOLEAN> {return "boolean";}
-| <REAL>    {return "real";}
-| <DOUBLE>  {return "double";}
-| <FLOAT>   {return "float";}
-| <INT>     {return "int";}
-| <INTEGER> {return "integer";}
-| <OBJECT>  {return "object";}
+    return variableDeclaration;}
 }
 
-String Expression() :
+ConstantIdentifier Type() :
+{final Token token;}
 {
-  final String expr;
-  final String assignOperator;
-  final String expr2;
-}
-{
-  expr = PrintExpression()       {return expr;}
-| expr = ListExpression()        {return expr;}
-| LOOKAHEAD(varAssignation())
-  expr = varAssignation()        {return expr;}
-| expr = ConditionalExpression() {return expr;}
+  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);}
 }
 
-/**
- * A Variable assignation.
- * varName (an assign operator) any expression
- */
-String varAssignation() :
+Expression Expression() :
 {
-  String varName,assignOperator,expr2;
-  PHPVarDeclaration variable;
-  final int pos = SimpleCharStream.getPosition();
+  final Expression expr;
+  Expression initializer = null;
+  int assignOperator = -1;
 }
 {
-  varName = VariableDeclaratorId()
-  assignOperator = AssignmentOperator()
+  LOOKAHEAD(1)
+  expr = ConditionalExpression()
+  [
+    assignOperator = AssignmentOperator()
     try {
-      expr2 = 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 varName + assignOperator + expr2;}
+  ]
+  {
+    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;}
 }
 
-String AssignmentOperator() :
+/**
+ * Any assignement operator.
+ * @return the assignement operator id
+ */
+int AssignmentOperator() :
 {}
 {
-  <ASSIGN>             {return "=";}
-| <STARASSIGN>         {return "*=";}
-| <SLASHASSIGN>        {return "/=";}
-| <REMASSIGN>          {return "%=";}
-| <PLUSASSIGN>         {return "+=";}
-| <MINUSASSIGN>        {return "-=";}
-| <LSHIFTASSIGN>       {return "<<=";}
-| <RSIGNEDSHIFTASSIGN> {return ">>=";}
-| <ANDASSIGN>          {return "&=";}
-| <XORASSIGN>          {return "|=";}
-| <ORASSIGN>           {return "|=";}
-| <DOTASSIGN>          {return ".=";}
-| <TILDEEQUAL>         {return "~=";}
+  <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;}
 }
 
-String ConditionalExpression() :
+Expression ConditionalExpression() :
 {
-  final String expr;
-  String expr2 = null;
-  String expr3 = null;
+  final Expression expr;
+  Expression expr2 = null;
+  Expression expr3 = null;
 }
 {
   expr = ConditionalOrExpression() [ <HOOK> expr2 = Expression() <COLON> expr3 = ConditionalExpression() ]
 {
   if (expr3 == null) {
     return expr;
-  } else {
-    return expr + "?" + expr2 + ":" + expr3;
   }
+  return new ConditionalExpression(expr,expr2,expr3);
 }
 }
 
-String ConditionalOrExpression() :
+Expression ConditionalOrExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = ConditionalAndExpression()
-  {buff.append(expr);}
   (
-    (operator = <SC_OR> | operator = <_ORL>) expr = ConditionalAndExpression()
+    (
+        <OR_OR> {operator = OperatorIds.OR_OR;}
+      | <_ORL>  {operator = OperatorIds.ORL;}
+    )
+    expr2 = ConditionalAndExpression()
     {
-      buff.append(operator.image);
-      buff.append(expr);
+      expr = new BinaryExpression(expr,expr2,operator);
     }
   )*
-  {
-    return buff.toString();
-  }
+  {return expr;}
 }
 
-String ConditionalAndExpression() :
+Expression ConditionalAndExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = ConcatExpression()
-  {buff.append(expr);}
   (
-  (operator = <SC_AND> | operator = <_ANDL>) expr = ConcatExpression()
-    {
-      buff.append(operator.image);
-      buff.append(expr);
-    }
+  (  <AND_AND> {operator = OperatorIds.AND_AND;}
+   | <_ANDL>   {operator = OperatorIds.ANDL;})
+   expr2 = ConcatExpression() {expr = new BinaryExpression(expr,expr2,operator);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String ConcatExpression() :
+Expression ConcatExpression() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
 }
 {
   expr = InclusiveOrExpression()
-  {buff.append(expr);}
   (
-  <DOT> expr = InclusiveOrExpression()
-  {buff.append(".").append(expr);}
+    <DOT> expr2 = InclusiveOrExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.DOT);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String InclusiveOrExpression() :
+Expression InclusiveOrExpression() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
 }
 {
   expr = ExclusiveOrExpression()
-  {buff.append(expr);}
-  (
-  <BIT_OR> expr = ExclusiveOrExpression()
-  {buff.append("|").append(expr);}
+  (<BIT_OR> expr2 = ExclusiveOrExpression()
+   {expr = new BinaryExpression(expr,expr2,OperatorIds.OR);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String ExclusiveOrExpression() :
+Expression ExclusiveOrExpression() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
 }
 {
   expr = AndExpression()
-  {
-    buff.append(expr);
-  }
   (
-    <XOR> expr = AndExpression()
-  {
-    buff.append("^");
-    buff.append(expr);
-  }
+    <XOR> expr2 = AndExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.XOR);}
   )*
-  {
-    return buff.toString();
-  }
+  {return expr;}
 }
 
-String AndExpression() :
+Expression AndExpression() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
 }
 {
   expr = EqualityExpression()
-  {
-    buff.append(expr);
-  }
   (
-    <BIT_AND> expr = EqualityExpression()
-  {
-    buff.append("&").append(expr);
-  }
+    LOOKAHEAD(1)
+    <BIT_AND> expr2 = EqualityExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.AND);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String EqualityExpression() :
+Expression EqualityExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
+  Token token;
 }
 {
   expr = RelationalExpression()
-  {buff.append(expr);}
   (
-  (   operator = <EQ>
-    | operator = <DIF>
-    | operator = <NE>
-    | operator = <BANGDOUBLEEQUAL>
-    | operator = <TRIPLEEQUAL>
+  (   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 {
-    expr = RelationalExpression()
+    expr2 = RelationalExpression()
   } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'";
+    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;
+    errorStart = token.sourceEnd +1;
+    errorEnd   = token.sourceEnd +1;
+    expr2 = new ConstantIdentifier(SYNTAX_ERROR_CHAR,token.sourceEnd +1,token.sourceEnd +1);
+    processParseExceptionDebug(e);
   }
   {
-    buff.append(operator.image);
-    buff.append(expr);
+    expr = new BinaryExpression(expr,expr2,operator);
   }
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String RelationalExpression() :
+Expression RelationalExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = ShiftExpression()
-  {buff.append(expr);}
   (
-  ( operator = <LT> | operator = <GT> | operator = <LE> | operator = <GE> ) expr = ShiftExpression()
-  {buff.append(operator.image).append(expr);}
+  ( <LT> {operator = OperatorIds.LESS;}
+  | <GT> {operator = OperatorIds.GREATER;}
+  | <LE> {operator = OperatorIds.LESS_EQUAL;}
+  | <GE> {operator = OperatorIds.GREATER_EQUAL;})
+   expr2 = ShiftExpression()
+  {expr = new BinaryExpression(expr,expr2,operator);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String ShiftExpression() :
+Expression ShiftExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = AdditiveExpression()
-  {buff.append(expr);}
   (
-  (operator = <LSHIFT> | operator = <RSIGNEDSHIFT> | operator = <RUNSIGNEDSHIFT> ) expr = AdditiveExpression()
-  {
-    buff.append(operator.image);
-    buff.append(expr);
-  }
+  ( <LSHIFT>         {operator = OperatorIds.LEFT_SHIFT;}
+  | <RSIGNEDSHIFT>   {operator = OperatorIds.RIGHT_SHIFT;}
+  | <RUNSIGNEDSHIFT> {operator = OperatorIds.UNSIGNED_RIGHT_SHIFT;})
+  expr2 = AdditiveExpression()
+  {expr = new BinaryExpression(expr,expr2,operator);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String AdditiveExpression() :
+Expression AdditiveExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = MultiplicativeExpression()
-  {buff.append(expr);}
   (
-   ( operator = <PLUS> | operator = <MINUS> ) expr = MultiplicativeExpression()
-  {
-    buff.append(operator.image);
-    buff.append(expr);
-  }
+    LOOKAHEAD(1)
+     ( <PLUS>  {operator = OperatorIds.PLUS;}
+     | <MINUS> {operator = OperatorIds.MINUS;}
+  )
+   expr2 = MultiplicativeExpression()
+  {expr = new BinaryExpression(expr,expr2,operator);}
    )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String MultiplicativeExpression() :
+Expression MultiplicativeExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();}
+  Expression expr,expr2;
+  int operator;
+}
 {
   try {
     expr = UnaryExpression()
   } catch (ParseException e) {
+    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;
   }
-  {buff.append(expr);}
   (
-    ( operator = <STAR> | operator = <SLASH> | operator = <REM> ) expr = UnaryExpression()
-    {
-      buff.append(operator.image);
-      buff.append(expr);
-    }
+   (  <STAR>      {operator = OperatorIds.MULTIPLY;}
+    | <SLASH>     {operator = OperatorIds.DIVIDE;}
+    | <REMAINDER> {operator = OperatorIds.REMAINDER;})
+    expr2 = UnaryExpression()
+    {expr = new BinaryExpression(expr,expr2,operator);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
 /**
  * An unary expression starting with @, & or nothing
  */
-String UnaryExpression() :
+Expression UnaryExpression() :
+{
+  final Expression expr;
+}
+{
+ /* <BIT_AND> expr = UnaryExpressionNoPrefix()             //why did I had that ?
+  {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
+|      */
+  expr = AtNotTildeUnaryExpression() {return expr;}
+}
+
+Expression AtNotTildeUnaryExpression() :
+{
+  final Expression expr;
+  final Token token;
+}
+{
+  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 String expr;
+  final Expression expr;
   final Token token;
-  final StringBuffer buff = new StringBuffer();
 }
 {
-  token = <BIT_AND> expr = UnaryExpressionNoPrefix()
-  {
-    if (token == null) {
-      return expr;
-    }
-    return token.image + expr;
-  }
-| (<AT> {buff.append("@");})*
+  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 buff.append(expr).toString();}
+  {return expr;}
 }
 
-String UnaryExpressionNoPrefix() :
+Expression UnaryExpressionNoPrefix() :
 {
-  final String expr;
+  final Expression expr;
   final Token token;
 }
 {
-  ( token = <PLUS> | token = <MINUS> ) expr = UnaryExpression()
-  {
-    return token.image + expr;
-  }
+  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;}
@@ -1448,23 +1739,28 @@ String UnaryExpressionNoPrefix() :
 }
 
 
-String PreIncDecExpression() :
+Expression PreIncDecExpression() :
 {
-final String expr;
+final Expression expr;
+final int operator;
 final Token token;
 }
 {
-  (token = <INCR> | token = <DECR>) expr = PrimaryExpression()
-  {return token.image + expr;}
+  (
+      token = <PLUS_PLUS>   {operator = OperatorIds.PLUS_PLUS;}
+    |
+      token = <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+  )
+  expr = PrimaryExpression()
+  {return new PrefixedUnaryExpression(expr,operator,token.sourceStart);}
 }
 
-String UnaryExpressionNotPlusMinus() :
+Expression UnaryExpressionNotPlusMinus() :
 {
-  final String expr;
+  final Expression expr;
 }
 {
-  <BANG> expr = UnaryExpression() {return "!" + expr;}
-| LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
+  LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
   expr = CastExpression()         {return expr;}
 | expr = PostfixExpression()      {return expr;}
 | expr = Literal()                {return expr;}
@@ -1474,593 +1770,997 @@ String 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+")";}
+  {return expr;}
 }
 
-String CastExpression() :
+CastExpression CastExpression() :
 {
-final String type, expr;
+final ConstantIdentifier type;
+final Expression expr;
+final Token token,token1;
 }
 {
-  <LPAREN> (type = Type() | <ARRAY> {type = "array";}) <RPAREN> expr = UnaryExpression()
-  {return "(" + type + ")" + expr;}
+  token1 = <LPAREN>
+  (
+      type = Type()
+    |
+      token = <ARRAY> {type = new ConstantIdentifier(token);}
+  )
+  <RPAREN> expr = UnaryExpression()
+  {return new CastExpression(type,expr,token1.sourceStart,expr.sourceEnd);}
 }
 
-String PostfixExpression() :
+Expression PostfixExpression() :
 {
-  final String expr;
-  Token operator = null;
+  final Expression expr;
+  int operator = -1;
+  Token token = null;
 }
 {
-  expr = PrimaryExpression() [ operator = <INCR> | operator = <DECR> ]
+  expr = PrimaryExpression()
+  [
+      token = <PLUS_PLUS>   {operator = OperatorIds.PLUS_PLUS;}
+    |
+      token = <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+  ]
   {
-    if (operator == null) {
+    if (operator == -1) {
       return expr;
     }
-    return expr + operator.image;
+    return new PostfixedUnaryExpression(expr,operator,token.sourceEnd);
   }
 }
 
-String PrimaryExpression() :
+Expression PrimaryExpression() :
 {
-  final Token identifier;
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr;
+  Token token = null;
 }
 {
-  LOOKAHEAD(2)
-  identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
-  {buff.append(identifier.image).append("::").append(expr);}
-  (
-  expr = PrimarySuffix()
-  {buff.append(expr);}
-  )*
-  {return buff.toString();}
-|
-  expr = PrimaryPrefix()  {buff.append(expr);}
-  ( expr = PrimarySuffix()  {buff.append(expr);} )*
-  {return buff.toString();}
+  [token = <BIT_AND>] expr = refPrimaryExpression(token)
+  {return expr;}
 |
   expr = ArrayDeclarator()
-  {return "array" + expr;}
+  {return expr;}
 }
 
-String ArrayDeclarator() :
+Expression refPrimaryExpression(final Token reference) :
 {
-  final String expr;
+  Expression expr;
+  Expression expr2 = null;
+  final Token identifier;
 }
 {
-  <ARRAY> expr = ArrayInitializer()
-  {return "array" + expr;}
+  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;}
 }
 
-String PrimaryPrefix() :
+/**
+ * An array declarator.
+ * array(vars)
+ * @return an array
+ */
+ArrayInitializer ArrayDeclarator() :
 {
-  final String expr;
+  final ArrayVariableDeclaration[] vars;
   final Token token;
 }
 {
-  token = <IDENTIFIER>           {return token.image;}
-| <NEW> expr = ClassIdentifier() {return "new " + expr;}
-| expr = VariableDeclaratorId()  {return expr;}
+  token = <ARRAY> vars = ArrayInitializer()
+  {return new ArrayInitializer(vars,
+                               token.sourceStart,
+                               PHPParser.token.sourceEnd);}
 }
 
-String classInstantiation() :
-{
-  String expr;
-  final StringBuffer buff = new StringBuffer("new ");
-}
+Expression ClassIdentifier():
 {
-  <NEW> expr = ClassIdentifier()
-  {buff.append(expr);}
-  [
-    expr = PrimaryExpression()
-    {buff.append(expr);}
-  ]
-  {return buff.toString();}
-}
-
-String ClassIdentifier():
-{
-  final String expr;
+  final Expression expr;
   final Token token;
 }
 {
-  token = <IDENTIFIER>          {return token.image;}
+  token = <IDENTIFIER>          {return new ConstantIdentifier(token);}
+| expr = Type()                 {return expr;}
 | expr = VariableDeclaratorId() {return expr;}
 }
 
-String PrimarySuffix() :
-{
-  final String expr;
-}
-{
-  expr = Arguments()      {return expr;}
-| expr = VariableSuffix() {return expr;}
-}
-
-String VariableSuffix() :
+/**
+ * Used by Variabledeclaratorid and primarysuffix
+ */
+AbstractVariable VariableSuffix(final AbstractVariable prefix) :
 {
-  String expr = null;
+  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 ConstantIdentifier(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 "->" + expr;}
+  {return new ClassAccess(prefix,
+                          expression,
+                          ClassAccess.NORMAL);}
 |
-  <LBRACKET> [ expr = Expression() | expr = 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);
   }
-  {
-    if(expr == null) {
-      return "[]";
-    }
-    return "[" + expr + "]";
+  {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,pos);}//todo : check braces here
 }
 
-String Literal() :
+Literal Literal() :
 {
-  final String expr;
   final Token token;
+  StringLiteral literal;
 }
 {
-  token = <INTEGER_LITERAL>        {return token.image;}
-| token = <FLOATING_POINT_LITERAL> {return token.image;}
-| token = <STRING_LITERAL>         {return token.image;}
-| expr = BooleanLiteral()          {return expr;}
-| <NULL>                           {return "null";}
+  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);}
+| literal = evaluableString()        {return literal;}
 }
 
-String BooleanLiteral() :
-{}
+StringLiteral evaluableString() :
+{
+  ArrayList list = new ArrayList();
+  Token start,end;
+  Token token,lbrace,rbrace;
+  AbstractVariable var;
+  Expression expr;
+}
 {
-  <TRUE>  {return "true";}
-| <FALSE> {return "false";}
+  start = <DOUBLEQUOTE>
+  (
+   <DOLLARS>
+       (
+        token = <IDENTIFIER> {list.add(new Variable(token.image,
+                                                    token.sourceStart,
+                                                    token.sourceEnd));}
+        |
+         lbrace = <LBRACE1>
+         token = <ID>
+         {list.add(new Variable(token.image,
+                                token.sourceStart,
+                                token.sourceEnd));}
+         rbrace = <RBRACE1>
+       )
+   )*
+  end = <DOUBLEQUOTE2>
+  {
+  AbstractVariable[] vars = new AbstractVariable[list.size()];
+  list.toArray(vars);
+  return new StringLiteral(SimpleCharStream.currentBuffer.substring(start.sourceEnd,end.sourceStart),
+                           start.sourceStart,
+                           end.sourceEnd,
+                           vars);
+  }
 }
 
-String Arguments() :
+FunctionCall Arguments(final Expression func) :
 {
-String expr = null;
+Expression[] args = null;
+final Token token,lparen;
 }
 {
-  <LPAREN> [ expr = ArgumentList() ]
+  lparen = <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;
+    if (args == null) {
+        errorStart = lparen.sourceEnd+1;
+        errorEnd   = lparen.sourceEnd+2;
+    } else {
+        errorStart = args[args.length-1].sourceEnd+1;
+        errorEnd   = args[args.length-1].sourceEnd+2;
+    }
+    processParseExceptionDebug(e);
   }
   {
-  if (expr == null) {
-    return "()";
-  }
-  return "(" + expr + ")";
-  }
+  int sourceEnd = (args == null && args.length != 0) ? lparen.sourceEnd+1 : args[args.length-1].sourceEnd;
+  return new FunctionCall(func,args,sourceEnd);}
 }
 
-String ArgumentList() :
+/**
+ * An argument list is a list of arguments separated by comma :
+ * argumentDeclaration() (, argumentDeclaration)*
+ * @return an array of arguments
+ */
+Expression[] ArgumentList() :
 {
-String expr;
-final StringBuffer buff = new StringBuffer();
+Expression arg;
+final ArrayList list = new ArrayList();
+int pos;
+Token token;
 }
 {
-  expr = Expression()
-  {buff.append(expr);}
-  ( <COMMA>
+  arg = Expression()
+  {list.add(arg);pos = arg.sourceEnd;}
+  ( token = <COMMA> {pos = token.sourceEnd;}
       try {
-        expr = Expression()
+        arg = Expression()
+        {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);
       }
-    {buff.append(",").append(expr);}
    )*
-   {return buff.toString();}
+   {
+   final Expression[] arguments = new Expression[list.size()];
+   list.toArray(arguments);
+   return arguments;}
 }
 
 /**
  * A Statement without break.
+ * @return a statement
  */
-void StatementNoBreak() :
-{}
+Statement StatementNoBreak() :
+{
+  final Statement statement;
+  Token token = null;
+}
 {
   LOOKAHEAD(2)
-  Expression()
+  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;}
+| statement = DoStatement()             {return statement;}
+| statement = ForStatement()            {return statement;}
+| statement = ForeachStatement()        {return statement;}
+| statement = ContinueStatement()       {return statement;}
+| statement = ReturnStatement()         {return statement;}
+| statement = EchoStatement()           {return statement;}
+| [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 {
-    <SEMICOLON>
+    token = <SEMICOLON>
+    {statement.sourceEnd = token.sourceEnd;}
   } catch (ParseException e) {
-    if (e.currentToken.next.kind != 4) {
+    if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
       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 = statement.sourceEnd+1;
+      errorEnd   = statement.sourceEnd+1;
+      processParseExceptionDebug(e);
     }
   }
-| LOOKAHEAD(2)
-  LabeledStatement()
-| Block()
-| EmptyStatement()
-| StatementExpression()
+  {return statement;}
+}
+
+Define defineStatement() :
+{
+  Expression defineName,defineValue;
+  final Token defineToken;
+  Token token;
+  int pos;
+}
+{
+  defineToken = <DEFINE> {pos = defineToken.sourceEnd+1;}
   try {
-    <SEMICOLON>
+    token = <LPAREN>
+    {pos = token.sourceEnd+1;}
   } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was 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   = pos;
+    errorEnd     = pos;
+    processParseExceptionDebug(e);
   }
-| SwitchStatement()
-| IfStatement()
-| WhileStatement()
-| DoStatement()
-| ForStatement()
-| ForeachStatement()
-| ContinueStatement()
-| ReturnStatement()
-| EchoStatement()
-| [<AT>] IncludeStatement()
-| StaticStatement()
-| GlobalStatement()
+  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);}
 }
 
 /**
  * A Normal statement.
  */
-void Statement() :
-{}
+Statement Statement() :
 {
-  StatementNoBreak()
-| BreakStatement()
+  final Statement statement;
+}
+{
+  statement = StatementNoBreak() {return statement;}
+| statement = BreakStatement()   {return statement;}
 }
 
 /**
  * An html block inside a php syntax.
  */
-void htmlBlock() :
-{}
+HTMLBlock htmlBlock() :
 {
-  <PHPEND> (phpEchoBlock())*
+  final int startIndex = nodePtr;
+  final AstNode[] blockNodes;
+  final int nbNodes;
+  final Token phpEnd;
+}
+{
+  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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
     throw e;
   }
+  {
+  nbNodes    = nodePtr - startIndex;
+  if (nbNodes == 0) {
+    return null;
+  }
+  blockNodes = new AstNode[nbNodes];
+  System.arraycopy(nodes,startIndex+1,blockNodes,0,nbNodes);
+  nodePtr = startIndex;
+  return new HTMLBlock(blockNodes);}
 }
 
 /**
  * An include statement. It's "include" an expression;
  */
-void IncludeStatement() :
+InclusionStatement IncludeStatement() :
 {
-  final String expr;
-  final Token token;
-  final int pos = jj_input_stream.getPosition();
+  Expression expr;
+  final int keyword;
+  final InclusionStatement inclusionStatement;
+  final Token token, token2;
+  int pos;
 }
 {
-  (  token = <REQUIRE>
-   | token = <REQUIRE_ONCE>
-   | token = <INCLUDE>
-   | token = <INCLUDE_ONCE> )
-    try {
-      expr = Expression()
-    } 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;
+      (  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;
     }
-  {
-    if (currentSegment != null) {
-      currentSegment.add(new PHPReqIncDeclaration(currentSegment, token.image,pos,expr));
-    }
+    errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected";
+    errorLevel   = ERROR;
+    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;
   }
 }
 
-String PrintExpression() :
+PrintExpression PrintExpression() :
 {
-  final String expr;
+  final Expression expr;
+  final Token printToken;
 }
 {
-  <PRINT> expr = Expression() {return "print " + expr;}
+  token = <PRINT> expr = Expression()
+  {return new PrintExpression(expr,token.sourceStart,expr.sourceEnd);}
 }
 
-String ListExpression() :
+ListExpression ListExpression() :
 {
-  final StringBuffer buff = new StringBuffer("list(");
-  String expr;
+  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()
-    {buff.append(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()
-    {buff.append(",").append(expr);}
+    [expr = VariableDeclaratorId() {list.add(expr);pos = expr.sourceEnd;}]
   )*
-  {buff.append(")");}
   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> expr = Expression() {buff.append("(").append(expr);}]
-  {return buff.toString();}
+  [ <ASSIGN> expression = Expression()
+    {
+    final AbstractVariable[] vars = new AbstractVariable[list.size()];
+    list.toArray(vars);
+    return new ListExpression(vars,
+                              expression,
+                              listToken.sourceStart,
+                              expression.sourceEnd);}
+  ]
+  {
+    final AbstractVariable[] vars = new AbstractVariable[list.size()];
+    list.toArray(vars);
+    return new ListExpression(vars,listToken.sourceStart,pos);}
 }
 
 /**
  * An echo statement.
  * echo anyexpression (, otherexpression)*
  */
-void EchoStatement() :
-{}
+EchoStatement EchoStatement() :
 {
-  <ECHO> Expression() (<COMMA> Expression())*
+  final ArrayList expressions = new ArrayList();
+  Expression expr;
+  Token token;
+  Token token2 = null;
+}
+{
+  token = <ECHO> expr = Expression()
+  {expressions.add(expr);}
+  (
+    <COMMA> expr = Expression()
+    {expressions.add(expr);}
+  )*
   try {
-    <SEMICOLON>
+    token2 = <SEMICOLON>
   } catch (ParseException e) {
     if (e.currentToken.next.kind != 4) {
       errorMessage = "';' expected after 'echo' statement";
       errorLevel   = ERROR;
-      errorStart   = 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);
+   }
 }
 
-void GlobalStatement() :
+GlobalStatement GlobalStatement() :
 {
-   final int pos = jj_input_stream.getPosition();
-   String expr;
+   Variable expr;
+   final ArrayList vars = new ArrayList();
+   final GlobalStatement global;
+   final Token token, token2;
+   int pos;
 }
 {
-  <GLOBAL>
-    expr = VariableDeclaratorId()
-    {if (currentSegment != null) {
-      currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr));
-    }}
+  token = <GLOBAL>
+    expr = Variable()
+    {vars.add(expr);pos = expr.sourceEnd+1;}
   (<COMMA>
-    expr = VariableDeclaratorId()
-    {if (currentSegment != null) {
-      currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr));
-    }}
+    expr = Variable()
+    {vars.add(expr);pos = expr.sourceEnd+1;}
   )*
   try {
-    <SEMICOLON>
+    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;}
 }
 
-void StaticStatement() :
-{}
+StaticStatement StaticStatement() :
 {
-  <STATIC> VariableDeclarator() (<COMMA> VariableDeclarator())*
+  final ArrayList vars = new ArrayList();
+  VariableDeclaration expr;
+  final Token token, token2;
+  int pos;
+}
+{
+  token = <STATIC> expr = VariableDeclarator() {vars.add(expr);pos = expr.sourceEnd+1;}
+  (
+    <COMMA> expr = VariableDeclarator() {vars.add(expr);pos = expr.sourceEnd+1;}
+  )*
   try {
-    <SEMICOLON>
+    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);}
 }
 
-void LabeledStatement() :
-{}
+LabeledStatement LabeledStatement() :
+{
+  final Token label;
+  final Statement statement;
+}
 {
-  <IDENTIFIER> <COLON> Statement()
+  label = <IDENTIFIER> <COLON> statement = Statement()
+  {return new LabeledStatement(label.image,statement,label.sourceStart,statement.sourceEnd);}
 }
 
-void Block() :
-{}
+/**
+ * A Block is
+ * {
+ * statements
+ * }.
+ * @return a block
+ */
+Block Block() :
+{
+  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;
-  }
-  ( BlockStatement() | htmlBlock())*
+    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);
   }
+  {
+  final Statement[] statements = new Statement[list.size()];
+  list.toArray(statements);
+  return new Block(statements,start,pos);}
 }
 
-void BlockStatement() :
-{}
+Statement BlockStatement() :
 {
-  Statement()
-| ClassDeclaration()
-| MethodDeclaration()
+  final Statement statement;
+}
+{
+  try {
+    statement = Statement()         {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+                                     return statement;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.image +"', a statement was expected";
+    errorLevel   = ERROR;
+    errorStart = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    throw e;
+  }
+| statement = ClassDeclaration()  {return statement;}
+| statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+                                   currentSegment.add((MethodDeclaration) statement);
+                                   ((MethodDeclaration) statement).analyzeCode();
+                                   return statement;}
 }
 
 /**
  * A Block statement that will not contain any 'break'
  */
-void BlockStatementNoBreak() :
-{}
+Statement BlockStatementNoBreak() :
 {
-  StatementNoBreak()
-| ClassDeclaration()
-| MethodDeclaration()
+  final Statement statement;
+}
+{
+  statement = StatementNoBreak()  {return statement;}
+| statement = ClassDeclaration()  {return statement;}
+| statement = MethodDeclaration() {currentSegment.add((MethodDeclaration) statement);
+                                   ((MethodDeclaration) statement).analyzeCode();
+                                   return statement;}
 }
 
-void LocalVariableDeclaration() :
-{}
+/**
+ * used only by ForInit()
+ */
+Expression[] LocalVariableDeclaration() :
+{
+  final ArrayList list = new ArrayList();
+  Expression var;
+}
 {
-  LocalVariableDeclarator() ( <COMMA> LocalVariableDeclarator() )*
+  var = Expression()
+  {list.add(var);}
+  ( <COMMA> var = Expression() {list.add(var);})*
+  {
+    final Expression[] vars = new Expression[list.size()];
+    list.toArray(vars);
+    return vars;
+  }
 }
 
-void LocalVariableDeclarator() :
-{}
+/**
+ * used only by LocalVariableDeclaration().
+ */
+VariableDeclaration LocalVariableDeclarator() :
 {
-  VariableDeclaratorId() [ <ASSIGN> Expression() ]
+  final Variable varName;
+  Expression initializer = null;
+}
+{
+  varName = Variable() [ <ASSIGN> initializer = Expression() ]
+  {
+   if (initializer == null) {
+    return new VariableDeclaration(currentSegment,
+                                   varName,
+                                   varName.sourceStart,
+                                   varName.sourceEnd);
+   }
+    return new VariableDeclaration(currentSegment,
+                                   varName,
+                                   initializer,
+                                   VariableDeclaration.EQUAL,
+                                   varName.sourceStart);
+  }
 }
 
-void EmptyStatement() :
-{}
+EmptyStatement EmptyStatement() :
 {
-  <SEMICOLON>
+  final Token token;
+}
+{
+  token = <SEMICOLON>
+  {return new EmptyStatement(token.sourceStart,token.sourceEnd);}
 }
 
-void StatementExpression() :
-{}
+/**
+ * used only by StatementExpressionList() which is used only by ForInit() and ForStatement()
+ */
+Expression StatementExpression() :
 {
-  PreIncDecExpression()
+  final Expression expr;
+  final Token operator;
+}
+{
+  expr = PreIncDecExpression() {return expr;}
 |
-  PrimaryExpression()
-  [ <INCR>
-  | <DECR>
-  | AssignmentOperator() Expression() ]
+  expr = PrimaryExpression()
+  [ 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;}
 }
 
-void SwitchStatement() :
+SwitchStatement SwitchStatement() :
 {
-  final int pos = jj_input_stream.getPosition();
+  Expression variable;
+  final AbstractCase[] cases;
+  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 {
-    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);
   }
-  (switchStatementBrace() | switchStatementColon(pos, pos + 6))
+  (  cases = switchStatementBrace()
+   | cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd))
+  {return new SwitchStatement(variable,
+                              cases,
+                              switchToken.sourceStart,
+                              PHPParser.token.sourceEnd);}
 }
 
-void switchStatementBrace() :
-{}
+AbstractCase[] switchStatementBrace() :
+{
+  AbstractCase cas;
+  final ArrayList cases = new ArrayList();
+  Token token;
+  int pos;
+}
 {
-  <LBRACE>
- ( switchLabel0() )*
+  token = <LBRACE> {pos = token.sourceEnd;}
+ ( cas = switchLabel0() {cases.add(cas);pos = cas.sourceEnd;})*
   try {
-    <RBRACE>
+    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
  * @param end the end offset of the switch
  */
-void switchStatementColon(final int start, final int end) :
-{}
+AbstractCase[] switchStatementColon(final int start, final int end) :
 {
-  <COLON>
+  AbstractCase cas;
+  final ArrayList cases = new ArrayList();
+  Token token;
+  int pos;
+}
+{
+  token = <COLON> {pos = token.sourceEnd;}
   {try {
   setMarker(fileToParse,
             "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;",
@@ -2071,95 +2771,92 @@ void switchStatementColon(final int start, final int end) :
   } catch (CoreException e) {
     PHPeclipsePlugin.log(e);
   }}
-  (switchLabel0())*
+  ( 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>
+    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);
   }
-}
-
-void switchLabel0() :
-{
-  Token breakToken = null;
-  final int line;
-}
-{
-  line = SwitchLabel()
-  ( BlockStatementNoBreak() | htmlBlock() )*
-  [ breakToken = BreakStatement() ]
   {
-    try {
-      if (breakToken == null) {
-        setMarker(fileToParse,
-                  "You should use put a 'break' at the end of your statement",
-                  line,
-                  INFO,
-                  "Line " + line);
-      }
-    } catch (CoreException e) {
-      PHPeclipsePlugin.log(e);
-    }
+    final AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    return abcase;
   }
 }
 
-Token BreakStatement() :
+AbstractCase switchLabel0() :
 {
-  final Token token;
+  final Expression expr;
+  Statement statement;
+  final ArrayList stmts = new ArrayList();
+  final Token token = PHPParser.token;
 }
 {
-  token = <BREAK> [ Expression() ]
-  try {
-    <SEMICOLON>
-  } 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;
+  expr = SwitchLabel()
+  ( statement = BlockStatementNoBreak() {stmts.add(statement);}
+  | statement = htmlBlock()             {if (statement != null) {stmts.add(statement);}}
+  | statement = BreakStatement()        {stmts.add(statement);})*
+  //[ statement = BreakStatement()        {stmts.add(statement);}]
+  {
+    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 token;}
 }
 
-int SwitchLabel() :
+/**
+ * A SwitchLabel.
+ * case Expression() :
+ * default :
+ * @return the if it was a case and null if not
+ */
+Expression SwitchLabel() :
 {
-  final Token token;
+  final Expression expr;
 }
 {
   token = <CASE>
   try {
-    Expression()
+    expr = Expression()
   } catch (ParseException e) {
     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>
   } 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);
   }
-  {return token.beginLine;}
+  {return expr;}
 |
   token = <_DEFAULT>
   try {
@@ -2167,50 +2864,96 @@ int 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);
   }
-  {return token.beginLine;}
+  {return null;}
 }
 
-void IfStatement() :
+Break BreakStatement() :
 {
-  final Token token;
-  final int pos = jj_input_stream.getPosition();
+  Expression expression = null;
+  final Token token, token2;
+  int pos;
 }
 {
-  token = <IF> Condition("if") IfStatement0(pos,pos+token.image.length())
+  token = <BREAK> {pos = token.sourceEnd+1;}
+  [ expression = Expression() {pos = expression.sourceEnd+1;}]
+  try {
+    token2 = <SEMICOLON>
+    {pos = token2.sourceEnd;}
+  } catch (ParseException e) {
+    errorMessage = "';' expected after 'break' keyword";
+    errorLevel   = ERROR;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
+  }
+  {return new Break(expression, token.sourceStart, pos);}
 }
 
-void Condition(final String keyword) :
-{}
+IfStatement IfStatement() :
+{
+  final Expression condition;
+  final IfStatement ifStatement;
+  Token token;
+}
+{
+  token = <IF> condition = Condition("if")
+  ifStatement = IfStatement0(condition,token.sourceStart,token.sourceEnd)
+  {return ifStatement;}
+}
+
+
+Expression Condition(final String keyword) :
+{
+  final Expression condition;
+}
 {
   try {
     <LPAREN>
   } 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);
   }
-  Expression()
+  condition = Expression()
   try {
      <RPAREN>
   } 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;}
 }
 
-void IfStatement0(final int start,final int end) :
-{}
+IfStatement IfStatement0(final Expression condition, final int start,final int end) :
+{
+  Statement statement;
+  final Statement stmt;
+  final Statement[] statementsArray;
+  ElseIf elseifStatement;
+  Else elseStatement = null;
+  final ArrayList stmts;
+  final ArrayList elseIfList = new ArrayList();
+  final ElseIf[] elseIfs;
+  int pos = SimpleCharStream.getPosition();
+  final int endStatements;
+}
 {
-  <COLON> (Statement() | htmlBlock())* (ElseIfStatementColon())* [ElseStatementColon()]
+  <COLON>
+  {stmts = new ArrayList();}
+  (  statement = Statement() {stmts.add(statement);}
+   | statement = htmlBlock() {if (statement != null) {stmts.add(statement);}})*
+   {endStatements = SimpleCharStream.getPosition();}
+   (elseifStatement = ElseIfStatementColon() {elseIfList.add(elseifStatement);})*
+   [elseStatement = ElseStatementColon()]
 
   {try {
   setMarker(fileToParse,
@@ -2227,8 +2970,8 @@ void IfStatement0(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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
     throw e;
   }
   try {
@@ -2236,61 +2979,133 @@ void IfStatement0(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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
     throw e;
   }
+    {
+    elseIfs = new ElseIf[elseIfList.size()];
+    elseIfList.toArray(elseIfs);
+    if (stmts.size() == 1) {
+      return new IfStatement(condition,
+                             (Statement) stmts.get(0),
+                              elseIfs,
+                              elseStatement,
+                              pos,
+                              SimpleCharStream.getPosition());
+    } else {
+      statementsArray = new Statement[stmts.size()];
+      stmts.toArray(statementsArray);
+      return new IfStatement(condition,
+                             new Block(statementsArray,pos,endStatements),
+                             elseIfs,
+                             elseStatement,
+                             pos,
+                             SimpleCharStream.getPosition());
+    }
+    }
+
 |
-  (Statement() |  htmlBlock())
-  ( LOOKAHEAD(1) ElseIfStatement() )*
+  (stmt = Statement() | stmt = htmlBlock())
+  ( LOOKAHEAD(1) elseifStatement = ElseIfStatement() {elseIfList.add(elseifStatement);})*
   [ LOOKAHEAD(1)
     <ELSE>
     try {
-      Statement()
+      {pos = SimpleCharStream.getPosition();}
+      statement = Statement()
+      {elseStatement = new Else(statement,pos,SimpleCharStream.getPosition());}
     } catch (ParseException e) {
       if (errorMessage != null) {
         throw e;
       }
       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 = e.currentToken.sourceStart;
+      errorEnd   = e.currentToken.sourceEnd;
       throw e;
     }
   ]
+  {
+    elseIfs = new ElseIf[elseIfList.size()];
+    elseIfList.toArray(elseIfs);
+    return new IfStatement(condition,
+                           stmt,
+                           elseIfs,
+                           elseStatement,
+                           pos,
+                           SimpleCharStream.getPosition());}
 }
 
-void ElseIfStatementColon() :
-{}
+ElseIf ElseIfStatementColon() :
 {
-  <ELSEIF> Condition("elseif") <COLON> (Statement() | htmlBlock())*
+  final Expression condition;
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final Token elseifToken;
+}
+{
+  elseifToken = <ELSEIF> condition = Condition("elseif")
+  <COLON> (  statement = Statement() {list.add(statement);}
+           | statement = htmlBlock() {if (statement != null) {list.add(statement);}})*
+  {
+  final int sizeList = list.size();
+  final Statement[] stmtsArray = new Statement[sizeList];
+  list.toArray(stmtsArray);
+  return new ElseIf(condition,stmtsArray ,
+                    elseifToken.sourceStart,
+                    stmtsArray[sizeList-1].sourceEnd);}
 }
 
-void ElseStatementColon() :
-{}
+Else ElseStatementColon() :
+{
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final Token elseToken;
+}
 {
-  <ELSE> <COLON> (Statement() | htmlBlock())*
+  elseToken = <ELSE> <COLON> (  statement = Statement() {list.add(statement);}
+                  | statement = htmlBlock() {if (statement != null) {list.add(statement);}})*
+  {
+  final int sizeList = list.size();
+  final Statement[] stmtsArray = new Statement[sizeList];
+  list.toArray(stmtsArray);
+  return new Else(stmtsArray,elseToken.sourceStart,stmtsArray[sizeList-1].sourceEnd);}
 }
 
-void ElseIfStatement() :
-{}
+ElseIf ElseIfStatement() :
 {
-  <ELSEIF> Condition("elseif") Statement()
+  final Expression condition;
+  //final Statement statement;
+  final Token elseifToken;
+  final Statement[] statement = new Statement[1];
+}
+{
+  elseifToken = <ELSEIF> condition = Condition("elseif") statement[0] = Statement()
+  {
+  return new ElseIf(condition,statement,elseifToken.sourceStart,statement[0].sourceEnd);}
 }
 
-void WhileStatement() :
+WhileStatement WhileStatement() :
 {
-  final Token token;
-  final int pos = jj_input_stream.getPosition();
+  final Expression condition;
+  final Statement action;
+  final Token whileToken;
 }
 {
-  token = <WHILE> Condition("while") WhileStatement0(pos,pos + token.image.length())
+  whileToken = <WHILE>
+    condition = Condition("while")
+    action    = WhileStatement0(whileToken.sourceStart,whileToken.sourceEnd)
+    {return new WhileStatement(condition,action,whileToken.sourceStart,action.sourceEnd);}
 }
 
-void WhileStatement0(final int start, final int end) :
-{}
+Statement WhileStatement0(final int start, final int end) :
 {
-  <COLON> (Statement())*
+  Statement statement;
+  final ArrayList stmts = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <COLON> (statement = Statement() {stmts.add(statement);})*
   {try {
   setMarker(fileToParse,
             "Ugly syntax detected, you should while () {...} instead of while (): ... endwhile;",
@@ -2306,105 +3121,151 @@ void 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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
     throw e;
   }
   try {
     <SEMICOLON>
+    {
+    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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
     throw e;
   }
 |
-  Statement()
+  statement = Statement()
+  {return statement;}
 }
 
-void DoStatement() :
-{}
+DoStatement DoStatement() :
+{
+  final Statement action;
+  final Expression condition;
+  final Token token;
+  Token token2 = null;
+}
 {
-  <DO> Statement() <WHILE> Condition("while")
+  token = <DO> action = Statement() <WHILE> condition = Condition("while")
   try {
-    <SEMICOLON>
+    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);
   }
 }
 
-void ForeachStatement() :
-{}
+ForeachStatement ForeachStatement() :
 {
-  <FOREACH>
-    try {
-    <LPAREN>
+  Statement statement = null;
+  Expression expression = null;
+  ArrayVariableDeclaration variable = null;
+  Token foreachToken;
+  Token lparenToken = null;
+  Token asToken = null;
+  Token rparenToken = null;
+  int pos;
+}
+{
+  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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
+    {pos = foreachToken.sourceEnd+1;}
   }
   try {
-    Variable()
+    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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
   }
-  ( VariableSuffix() )*
   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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
   }
   try {
-    Variable()
+    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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
   }
-  [ <ARRAYASSIGN> Expression() ]
   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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
   }
   try {
-    Statement()
+    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 = e.currentToken.sourceStart;
+    errorEnd   = e.currentToken.sourceEnd;
+    processParseExceptionDebug(e);
   }
+  {return new ForeachStatement(expression,
+                               variable,
+                               statement,
+                               foreachToken.sourceStart,
+                               statement.sourceEnd);}
+
 }
 
-void ForStatement() :
+/**
+ * a for declaration.
+ * @return a node representing the for statement
+ */
+ForStatement ForStatement() :
 {
-final Token token;
-final int pos = jj_input_stream.getPosition();
+final Token token,tokenEndFor,token2,tokenColon;
+int pos;
+Expression[] initializations = null;
+Expression condition = null;
+Expression[] increments = null;
+Statement action;
+final ArrayList list = new ArrayList();
 }
 {
   token = <FOR>
@@ -2413,21 +3274,30 @@ final int pos = jj_input_stream.getPosition();
   } 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);
   }
-     [ ForInit() ] <SEMICOLON> [ Expression() ] <SEMICOLON> [ StatementExpressionList() ] <RPAREN>
+     [ initializations = ForInit() ] <SEMICOLON>
+     [ condition = Expression() ] <SEMICOLON>
+     [ increments = StatementExpressionList() ] <RPAREN>
     (
-      Statement()
+      action = Statement()
+      {return new ForStatement(initializations,
+                               condition,
+                               increments,
+                               action,
+                               token.sourceStart,
+                               action.sourceEnd);}
     |
-      <COLON> (Statement())*
+      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) {
@@ -2435,67 +3305,130 @@ final int pos = jj_input_stream.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>
+        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);}
     )
 }
 
-void ForInit() :
-{}
+Expression[] ForInit() :
+{
+  final Expression[] exprs;
+}
 {
   LOOKAHEAD(LocalVariableDeclaration())
-  LocalVariableDeclaration()
+  exprs = LocalVariableDeclaration()
+  {return exprs;}
 |
-  StatementExpressionList()
+  exprs = StatementExpressionList()
+  {return exprs;}
 }
 
-void StatementExpressionList() :
-{}
+Expression[] StatementExpressionList() :
 {
-  StatementExpression() ( <COMMA> StatementExpression() )*
+  final ArrayList list = new ArrayList();
+  final Expression expr;
+}
+{
+  expr = Expression()   {list.add(expr);}
+  (<COMMA> Expression() {list.add(expr);})*
+  {
+    final Expression[] exprsArray = new Expression[list.size()];
+    list.toArray(exprsArray);
+    return exprsArray;
+  }
 }
 
-void ContinueStatement() :
-{}
+Continue ContinueStatement() :
+{
+  Expression expr = null;
+  final Token token;
+  Token token2 = null;
+}
 {
-  <CONTINUE> [ Expression() ]
+  token = <CONTINUE> [ expr = Expression() ]
   try {
-    <SEMICOLON>
+    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);
   }
 }
 
-void ReturnStatement() :
-{}
+ReturnStatement ReturnStatement() :
 {
-  <RETURN> [ Expression() ]
+  Expression expr = null;
+  final Token token;
+  Token token2 = null;
+}
+{
+  token = <RETURN> [ expr = Expression() ]
   try {
-    <SEMICOLON>
+    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);
+  }
+}
+