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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 57e9eb8..d3b3e59 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -28,147 +28,257 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.ui.texteditor.MarkerUtilities;
 import org.eclipse.jface.preference.IPreferenceStore;
 
-import java.io.CharArrayReader;
 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.ast.*;
+import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
 import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
 
 /**
  * A new php parser.
- * This php parser is inspired by the Java 1.2 grammar example 
+ * This php parser is inspired by the Java 1.2 grammar example
  * given with JavaCC. You can get JavaCC at http://www.webgain.com
  * You can test the parser with the PHPParserTestCase2.java
  * @author Matthieu Casanova
  */
-public class PHPParser extends PHPParserSuperclass {
-
-  private static PHPParser me;
+public final class PHPParser extends PHPParserSuperclass {
 
+  /** The file that is parsed. */
   private static IFile fileToParse;
 
+  /** The current segment. */
+  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$
-  public static final int ERROR = 2;
-  public static final int WARNING = 1;
-  public static final int INFO = 0;
-  PHPOutlineInfo outlineInfo;
+  static PHPOutlineInfo outlineInfo;
+
+  public static MethodDeclaration currentFunction;
+  private static boolean assigning;
+
+  /** The error level of the current ParseException. */
   private static int errorLevel = ERROR;
+  /** The message of the current ParseException. If it's null it's because the parse exception wasn't handled */
   private static String errorMessage;
 
+  private static int errorStart = -1;
+  private static int errorEnd = -1;
+  private static PHPDocument phpDocument;
+  /**
+   * 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[] nodes;
+  /** The cursor in expression stack. */
+  private static int nodePtr;
+  private static VariableDeclaration[] variableDeclarationStack;
+  private static int variableDeclarationPtr;
+  private static Statement[] statementStack;
+  private static int statementPtr;
+  private static ElseIf[] elseIfStack;
+  private static int elseIfPtr;
+
+  public final void setFileToParse(final IFile fileToParse) {
+    this.fileToParse = fileToParse;
+  }
+
   public PHPParser() {
   }
 
-  public static PHPParser getInstance(IFile fileToParse) {
-    if (me == null) {
-      me = new PHPParser(fileToParse);
-    } else {
-      me.setFileToParse(fileToParse);
+  public PHPParser(final IFile fileToParse) {
+    this(new StringReader(""));
+    this.fileToParse = fileToParse;
+  }
+
+  /**
+   * Reinitialize the parser.
+   */
+  private static final void init() {
+    nodes = new AstNode[AstStackIncrement];
+    statementStack = new Statement[AstStackIncrement];
+    elseIfStack = new ElseIf[AstStackIncrement];
+    nodePtr = -1;
+    statementPtr = -1;
+    elseIfPtr = -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(AstNode node) {
+    try {
+      nodes[++nodePtr] = node;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = nodes.length;
+      AstNode[] oldStack = nodes;
+      nodes = new AstNode[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, nodes, 0, oldStackLength);
+      nodePtr = oldStackLength;
+      nodes[nodePtr] = node;
     }
-    return me;
   }
 
-  public void setFileToParse(IFile fileToParse) {
-    this.fileToParse = fileToParse;
+  private static final void pushOnVariableDeclarationStack(VariableDeclaration var) {
+    try {
+      variableDeclarationStack[++variableDeclarationPtr] = var;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = variableDeclarationStack.length;
+      VariableDeclaration[] oldStack = variableDeclarationStack;
+      variableDeclarationStack = new VariableDeclaration[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, variableDeclarationStack, 0, oldStackLength);
+      variableDeclarationPtr = oldStackLength;
+      variableDeclarationStack[variableDeclarationPtr] = var;
+    }
   }
 
-  public static PHPParser getInstance(java.io.Reader stream) {
-    if (me == null) {
-      me = new PHPParser(stream);
-    } else {
-      me.ReInit(stream);
+  private static final void pushOnStatementStack(Statement statement) {
+    try {
+      statementStack[++statementPtr] = statement;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = statementStack.length;
+      Statement[] oldStack = statementStack;
+      statementStack = new Statement[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, statementStack, 0, oldStackLength);
+      statementPtr = oldStackLength;
+      statementStack[statementPtr] = statement;
     }
-    return me;
   }
 
-  public PHPParser(IFile fileToParse) {
-    this(new StringReader(""));
-    this.fileToParse = fileToParse;
+  private static final void pushOnElseIfStack(ElseIf elseIf) {
+    try {
+      elseIfStack[++elseIfPtr] = elseIf;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = elseIfStack.length;
+      ElseIf[] oldStack = elseIfStack;
+      elseIfStack = new ElseIf[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, elseIfStack, 0, oldStackLength);
+      elseIfPtr = oldStackLength;
+      elseIfStack[elseIfPtr] = elseIf;
+    }
   }
 
-  public void phpParserTester(String strEval) throws CoreException, ParseException {
+  public static final void phpParserTester(final String strEval) throws CoreException, ParseException {
     PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
-    StringReader stream = new StringReader(strEval);
+    final StringReader stream = new StringReader(strEval);
     if (jj_input_stream == null) {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(new StringReader(strEval));
+    init();
     phpTest();
   }
 
-  public void htmlParserTester(String strEval) throws CoreException, ParseException {
-    StringReader stream = new StringReader(strEval);
+  public static final void htmlParserTester(final File fileName) throws CoreException, ParseException {
+    try {
+      final Reader stream = new FileReader(fileName);
+      if (jj_input_stream == null) {
+        jj_input_stream = new SimpleCharStream(stream, 1, 1);
+      }
+      ReInit(stream);
+      init();
+      phpFile();
+    } catch (FileNotFoundException e) {
+      e.printStackTrace();  //To change body of catch statement use Options | File Templates.
+    }
+  }
+
+  public static final void htmlParserTester(final String strEval) throws CoreException, ParseException {
+    final StringReader stream = new StringReader(strEval);
     if (jj_input_stream == null) {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(stream);
-    phpTest();
+    init();
+    phpFile();
   }
 
-  public PHPOutlineInfo parseInfo(Object parent, String s) {
+  public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
+    currentSegment = new PHPDocument(parent);
     outlineInfo = new PHPOutlineInfo(parent);
-    StringReader stream = new StringReader(s);
+    final StringReader stream = new StringReader(s);
     if (jj_input_stream == null) {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(stream);
+    init();
     try {
       parse();
+      phpDocument = new PHPDocument(null);
+      phpDocument.nodes = nodes;
+      PHPeclipsePlugin.log(1,phpDocument.toString());
     } catch (ParseException e) {
-      if (errorMessage == null) {
-        PHPeclipsePlugin.log(e);
-      } else {
-        setMarker(errorMessage, e.currentToken.beginLine, errorLevel);
-        errorMessage = null;
-      }
+      processParseException(e);
     }
     return outlineInfo;
   }
 
-
   /**
-   * Create marker for the parse error
+   * This method will process the parse exception.
+   * If the error message is null, the parse exception wasn't catched and a trace is written in the log
+   * @param e the ParseException
    */
-  private static void setMarker(String message, int lineNumber, int errorLevel) {
-    try {
-      setMarker(fileToParse, message, lineNumber, errorLevel);
-    } catch (CoreException e) {
+  private static void processParseException(final ParseException e) {
+    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;
     }
+    setMarker(e);
+    errorMessage = null;
   }
 
-  public static void setMarker(IFile file, String message, int lineNumber, int errorLevel) throws CoreException {
-    if (file != null) {
-      Hashtable attributes = new Hashtable();
-      MarkerUtilities.setMessage(attributes, message);
-      switch (errorLevel) {
-        case ERROR :
-          attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
-          break;
-        case WARNING :
-          attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING));
-          break;
-        case INFO :
-          attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
-          break;
+  /**
+   * Create marker for the parse error
+   * @param e the ParseException
+   */
+  private static void setMarker(final ParseException e) {
+    try {
+      if (errorStart == -1) {
+        setMarker(fileToParse,
+                  errorMessage,
+                  jj_input_stream.tokenBegin,
+                  jj_input_stream.tokenBegin + e.currentToken.image.length(),
+                  errorLevel,
+                  "Line " + e.currentToken.beginLine);
+      } else {
+        setMarker(fileToParse,
+                  errorMessage,
+                  errorStart,
+                  errorEnd,
+                  errorLevel,
+                  "Line " + e.currentToken.beginLine);
+        errorStart = -1;
+        errorEnd = -1;
       }
-      MarkerUtilities.setLineNumber(attributes, lineNumber);
-      MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM);
+    } catch (CoreException e2) {
+      PHPeclipsePlugin.log(e2);
     }
   }
 
   /**
    * Create markers according to the external parser output
    */
-  private static void createMarkers(String output, IFile file) throws CoreException {
+  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 = 0;
+    int brIndx;
     boolean flag = true;
     while ((brIndx = output.indexOf("<br />", indx)) != -1) {
       // newer php error output (tested with 4.2.3)
@@ -185,7 +295,10 @@ public class PHPParser extends PHPParserSuperclass {
     }
   }
 
-  private static void scanLine(String output, IFile file, int indx, int brIndx) throws CoreException {
+  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);
     char ch;
@@ -223,12 +336,17 @@ public class PHPParser extends PHPParserSuperclass {
     }
   }
 
-  public void parse(String s) throws CoreException {
-    ReInit(new StringReader(s));
+  public final void parse(final String s) throws CoreException {
+    final StringReader stream = new StringReader(s);
+    if (jj_input_stream == null) {
+      jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    }
+    ReInit(stream);
+    init();
     try {
       parse();
     } catch (ParseException e) {
-      PHPeclipsePlugin.log(e);
+      processParseException(e);
     }
   }
 
@@ -236,15 +354,15 @@ public class PHPParser extends PHPParserSuperclass {
    * Call the php parse command ( php -l -f &lt;filename&gt; )
    * and create markers according to the external parser output
    */
-  public static void phpExternalParse(IFile file) {
-    IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-    String filename = file.getLocation().toString();
+  public static void phpExternalParse(final IFile file) {
+    final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+    final String filename = file.getLocation().toString();
 
-    String[] arguments = { filename };
-    MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF));
-    String command = form.format(arguments);
+    final String[] arguments = { filename };
+    final MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF));
+    final String command = form.format(arguments);
 
-    String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: ");
+    final String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: ");
 
     try {
       // parse the buffer to find the errors and warnings
@@ -254,7 +372,19 @@ public class PHPParser extends PHPParserSuperclass {
     }
   }
 
-  public void parse() throws ParseException {
+  /**
+   * Put a new html block in the stack.
+   */
+  public static final void createNewHTMLCode() {
+    final int currentPosition = SimpleCharStream.getPosition();
+    if (currentPosition == htmlStart) {
+      return;
+    }
+    final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition).toCharArray();
+    pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
+  }
+
+  private static final void parse() throws ParseException {
 	  phpFile();
   }
 }
@@ -263,22 +393,24 @@ PARSER_END(PHPParser)
 
 <DEFAULT> TOKEN :
 {
-  "<?php" : PHPPARSING
-| "<?"    : PHPPARSING
+  <PHPSTARTSHORT : "<?">    {PHPParser.createNewHTMLCode();} : PHPPARSING
+| <PHPSTARTLONG  : "<?php"> {PHPParser.createNewHTMLCode();} : PHPPARSING
+| <PHPECHOSTART  : "<?=">   {PHPParser.createNewHTMLCode();} : PHPPARSING
 }
 
-<DEFAULT> SKIP :
+<PHPPARSING> TOKEN :
 {
- < ~[] >
+  <PHPEND :"?>"> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT
 }
 
-<PHPPARSING> TOKEN :
+/* Skip any character if we are not in php mode */
+<DEFAULT> SKIP :
 {
-  "?>" : DEFAULT
+ < ~[] >
 }
 
-/* WHITE SPACE */
 
+/* WHITE SPACE */
 <PHPPARSING> SKIP :
 {
   " "
@@ -289,20 +421,25 @@ PARSER_END(PHPParser)
 }
 
 /* COMMENTS */
-
-<PHPPARSING> MORE :
+<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>
-SPECIAL_TOKEN :
+<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
 {
-  <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" | "?>" > : PHPPARSING
+  <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : PHPPARSING
+}
+
+<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
+{
+  <SINGLE_LINE_COMMENT_PHPEND : "?>" > : DEFAULT
 }
 
 <IN_FORMAL_COMMENT>
@@ -333,72 +470,103 @@ MORE :
 | <ELSEIF   : "elseif">
 | <ELSE     : "else">
 | <ARRAY    : "array">
+| <BREAK    : "break">
+| <LIST     : "list">
 }
 
 /* LANGUAGE CONSTRUCT */
 <PHPPARSING> TOKEN :
 {
-  <PRINT : "print">
-| <ECHO : "echo">
-| <INCLUDE : "include">
-| <REQUIRE : "require">
-| <INCLUDE_ONCE : "include_once">
-| <REQUIRE_ONCE : "require_once">
-| <GLOBAL : "global">
-| <STATIC : "static">
-| <CLASSACCESS: "->">
-| <STATICCLASSACCESS: "::">
-| <ARRAYASSIGN: "=>">
+  <PRINT              : "print">
+| <ECHO               : "echo">
+| <INCLUDE            : "include">
+| <REQUIRE            : "require">
+| <INCLUDE_ONCE       : "include_once">
+| <REQUIRE_ONCE       : "require_once">
+| <GLOBAL             : "global">
+| <STATIC             : "static">
+| <CLASSACCESS        : "->">
+| <STATICCLASSACCESS  : "::">
+| <ARRAYASSIGN        : "=>">
 }
 
 /* RESERVED WORDS AND LITERALS */
 
 <PHPPARSING> TOKEN :
 {
-  < BREAK: "break" >
-| < CASE: "case" >
-| < CONST: "const" >
-| < CONTINUE: "continue" >
-| < _DEFAULT: "default" >
-| < DO: "do" >
-| < EXTENDS: "extends" >
-| < FALSE: "false" >
-| < FOR: "for" >
-| < GOTO: "goto" >
-| < NEW: "new" >
-| < NULL: "null" >
-| < RETURN: "return" >
-| < SUPER: "super" >
-| < SWITCH: "switch" >
-| < THIS: "this" >
-| < TRUE: "true" >
-| < WHILE: "while" >
-| < ENDWHILE : "endwhile" >
+  <CASE     : "case">
+| <CONST    : "const">
+| <CONTINUE : "continue">
+| <_DEFAULT : "default">
+| <DO       : "do">
+| <EXTENDS  : "extends">
+| <FOR      : "for">
+| <GOTO     : "goto">
+| <NEW      : "new">
+| <NULL     : "null">
+| <RETURN   : "return">
+| <SUPER    : "super">
+| <SWITCH   : "switch">
+| <THIS     : "this">
+| <TRUE     : "true">
+| <FALSE    : "false">
+| <WHILE    : "while">
+| <ENDWHILE : "endwhile">
+| <ENDSWITCH: "endswitch">
+| <ENDIF    : "endif">
+| <ENDFOR   : "endfor">
+| <FOREACH  : "foreach">
+| <AS       : "as" >
 }
 
 /* TYPES */
-
 <PHPPARSING> TOKEN :
 {
-  <STRING : "string">
-| <OBJECT : "object">
-| <BOOL : "bool">
+  <STRING  : "string">
+| <OBJECT  : "object">
+| <BOOL    : "bool">
 | <BOOLEAN : "boolean">
-| <REAL : "real">
-| <DOUBLE : "double">
-| <FLOAT : "float">
-| <INT : "int">
+| <REAL    : "real">
+| <DOUBLE  : "double">
+| <FLOAT   : "float">
+| <INT     : "int">
 | <INTEGER : "integer">
 }
 
+//Misc token
 <PHPPARSING> TOKEN :
 {
-  < _ORL : "OR" >
-| < _ANDL: "AND">
+  <AT                 : "@">
+| <DOLLAR             : "$">
+| <BANG               : "!">
+| <TILDE              : "~">
+| <HOOK               : "?">
+| <COLON              : ":">
 }
 
-/* LITERALS */
+/* OPERATORS */
+<PHPPARSING> TOKEN :
+{
+  <OR_OR              : "||">
+| <AND_AND            : "&&">
+| <INCR               : "++">
+| <DECR               : "--">
+| <PLUS               : "+">
+| <MINUS              : "-">
+| <STAR               : "*">
+| <SLASH              : "/">
+| <BIT_AND            : "&">
+| <BIT_OR             : "|">
+| <XOR                : "^">
+| <REMAINDER          : "%">
+| <LSHIFT             : "<<">
+| <RSIGNEDSHIFT       : ">>">
+| <RUNSIGNEDSHIFT     : ">>>">
+| <_ORL               : "OR">
+| <_ANDL              : "AND">
+}
 
+/* LITERALS */
 <PHPPARSING> TOKEN :
 {
   < INTEGER_LITERAL:
@@ -425,20 +593,29 @@ MORE :
   < STRING_LITERAL: (<STRING_1> | <STRING_2> | <STRING_3>)>
 |    < STRING_1:
       "\""
-      (   (~["\""])
+      (
+          ~["\"","{","}"]
         | "\\\""
+        | "\\"
+        | "{" ~["\""] "}"
       )*
       "\""
     >
 |    < STRING_2:
       "'"
-      (   (~["'"]))*
+      (
+         ~["'"]
+       | "\\'"
+      )*
 
       "'"
     >
 |   < STRING_3:
       "`"
-      (   (~["`"]))*
+      (
+        ~["`"]
+      | "\\`"
+      )*
       "`"
     >
 }
@@ -458,7 +635,7 @@ MORE :
   >
 |
   < #SPECIAL:
-    "_"
+    "_" | ["\u007f"-"\u00ff"]
   >
 }
 
@@ -466,87 +643,128 @@ MORE :
 
 <PHPPARSING> TOKEN :
 {
-  < LPAREN: "(" >
-| < RPAREN: ")" >
-| < LBRACE: "{" >
-| < RBRACE: "}" >
-| < LBRACKET: "[" >
-| < RBRACKET: "]" >
-| < SEMICOLON: ";" >
-| < COMMA: "," >
-| < DOT: "." >
+  <LPAREN    : "(">
+| <RPAREN    : ")">
+| <LBRACE    : "{">
+| <RBRACE    : "}">
+| <LBRACKET  : "[">
+| <RBRACKET  : "]">
+| <SEMICOLON : ";">
+| <COMMA     : ",">
+| <DOT       : ".">
 }
 
-/* OPERATORS */
 
+/* COMPARATOR */
 <PHPPARSING> TOKEN :
 {
-  <AT     : "@">
-| <DOLLAR : "$">
-| < ASSIGN: "=" >
-| < GT: ">" >
-| < LT: "<" >
-| < BANG: "!" >
-| < HOOK: "?" >
-| < COLON: ":" >
-| < EQ: "==" >
-| < LE: "<=" >
-| < GE: ">=" >
-| < NE: "!=" >
-| < SC_OR: "||" >
-| < SC_AND: "&&" >
-| < INCR: "++" >
-| < DECR: "--" >
-| < PLUS: "+" >
-| < MINUS: "-" >
-| < STAR: "*" >
-| < SLASH: "/" >
-| < BIT_AND: "&" >
-| < BIT_OR: "|" >
-| < XOR: "^" >
-| < REM: "%" >
-| < LSHIFT: "<<" >
-| < RSIGNEDSHIFT: ">>" >
-| < RUNSIGNEDSHIFT: ">>>" >
-| < PLUSASSIGN: "+=" >
-| < MINUSASSIGN: "-=" >
-| < STARASSIGN: "*=" >
-| < SLASHASSIGN: "/=" >
-| < ANDASSIGN: "&=" >
-| < ORASSIGN: "|=" >
-| < XORASSIGN: "^=" >
-| < DOTASSIGN: ".=" >
-| < REMASSIGN: "%=" >
-| < LSHIFTASSIGN: "<<=" >
-| < RSIGNEDSHIFTASSIGN: ">>=" >
-| < RUNSIGNEDSHIFTASSIGN: ">>>=" >
+  <GT                 : ">">
+| <LT                 : "<">
+| <EQUAL_EQUAL        : "==">
+| <LE                 : "<=">
+| <GE                 : ">=">
+| <NOT_EQUAL          : "!=">
+| <DIF                : "<>">
+| <BANGDOUBLEEQUAL    : "!==">
+| <TRIPLEEQUAL        : "===">
 }
 
+/* ASSIGNATION */
 <PHPPARSING> TOKEN :
 {
-  < DOLLAR_ID: <DOLLAR> <IDENTIFIER>  >
+  <ASSIGN             : "=">
+| <PLUSASSIGN         : "+=">
+| <MINUSASSIGN        : "-=">
+| <STARASSIGN         : "*=">
+| <SLASHASSIGN        : "/=">
+| <ANDASSIGN          : "&=">
+| <ORASSIGN           : "|=">
+| <XORASSIGN          : "^=">
+| <DOTASSIGN          : ".=">
+| <REMASSIGN          : "%=">
+| <TILDEEQUAL         : "~=">
+| <LSHIFTASSIGN       : "<<=">
+| <RSIGNEDSHIFTASSIGN : ">>=">
 }
 
-/*****************************************
- * THE JAVA LANGUAGE GRAMMAR STARTS HERE *
- *****************************************/
-
-/*
- * Program structuring syntax follows.
- */
+<PHPPARSING> TOKEN :
+{
+  < DOLLAR_ID: <DOLLAR> <IDENTIFIER>  >
+}
 
 void phpTest() :
 {}
 {
   Php()
   <EOF>
+  {PHPParser.createNewHTMLCode();}
 }
 
 void phpFile() :
 {}
 {
- ("<?php" Php() "?>")*
-  <EOF>
+  try {
+    (PhpBlock())*
+    <EOF>
+  } catch (TokenMgrError e) {
+    PHPeclipsePlugin.log(e);
+    errorStart   = SimpleCharStream.getPosition();
+    errorEnd     = errorStart + 1;
+    errorMessage = e.getMessage();
+    errorLevel   = ERROR;
+    throw generateParseException();
+  }
+}
+
+/**
+ * A php block is a <?= expression [;]?>
+ * or <?php somephpcode ?>
+ * or <? somephpcode ?>
+ */
+void PhpBlock() :
+{
+  final int start = jj_input_stream.getPosition();
+}
+{
+  phpEchoBlock()
+|
+  [ <PHPSTARTLONG>
+    | <PHPSTARTSHORT>
+    {try {
+      setMarker(fileToParse,
+                "You should use '<?php' instead of '<?' it will avoid some problems with XML",
+                start,
+                jj_input_stream.getPosition(),
+                INFO,
+                "Line " + token.beginLine);
+    } catch (CoreException e) {
+      PHPeclipsePlugin.log(e);
+    }}
+  ]
+  Php()
+  try {
+    <PHPEND>
+  } 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;
+  }
+}
+
+PHPEchoBlock phpEchoBlock() :
+{
+  final Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+  PHPEchoBlock echoBlock;
+}
+{
+  <PHPECHOSTART> expr = Expression() [ <SEMICOLON> ] <PHPEND>
+  {
+  echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
+  pushOnAstNodes(echoBlock);
+  return echoBlock;}
 }
 
 void Php() :
@@ -555,630 +773,2227 @@ void Php() :
   (BlockStatement())*
 }
 
-void ClassDeclaration() :
-{}
+ClassDeclaration ClassDeclaration() :
 {
-  <CLASS> <IDENTIFIER> [ <EXTENDS> <IDENTIFIER> ]
-  ClassBody()
+  final ClassDeclaration classDeclaration;
+  final Token className;
+  Token superclassName = null;
+  final int pos;
+}
+{
+  <CLASS>
+  try {
+    {pos = jj_input_stream.getPosition();}
+    className = <IDENTIFIER>
+  } 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;
+  }
+  [
+    <EXTENDS>
+    try {
+      superclassName = <IDENTIFIER>
+    } 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;
+    }
+  ]
+  {
+    if (superclassName == null) {
+      classDeclaration = new ClassDeclaration(currentSegment,
+                                              className.image.toCharArray(),
+                                              pos,
+                                              0);
+    } else {
+      classDeclaration = new ClassDeclaration(currentSegment,
+                                              className.image.toCharArray(),
+                                              superclassName.image.toCharArray(),
+                                              pos,
+                                              0);
+    }
+      currentSegment.add(classDeclaration);
+      currentSegment = classDeclaration;
+  }
+  ClassBody(classDeclaration)
+  {currentSegment = (OutlineableWithChildren) currentSegment.getParent();
+   classDeclaration.sourceEnd = SimpleCharStream.getPosition();
+   pushOnAstNodes(classDeclaration);
+   return classDeclaration;}
 }
 
-void ClassBody() :
+void ClassBody(ClassDeclaration classDeclaration) :
 {}
 {
-  <LBRACE> ( ClassBodyDeclaration() )* <RBRACE>
+  try {
+    <LBRACE>
+  } 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;
+  }
+  ( ClassBodyDeclaration(classDeclaration) )*
+  try {
+    <RBRACE>
+  } catch (ParseException e) {
+    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;
+  }
 }
 
-void ClassBodyDeclaration() :
-{}
+/**
+ * A class can contain only methods and fields.
+ */
+void ClassBodyDeclaration(ClassDeclaration classDeclaration) :
 {
-  MethodDeclaration()
-|
-  FieldDeclaration()
+  MethodDeclaration method;
+  FieldDeclaration field;
+}
+{
+  method = MethodDeclaration() {classDeclaration.addMethod(method);}
+| field = FieldDeclaration()   {classDeclaration.addVariable(field);}
 }
 
-void FieldDeclaration() :
-{}
+/**
+ * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ */
+FieldDeclaration FieldDeclaration() :
+{
+  VariableDeclaration variableDeclaration;
+  variableDeclarationPtr = 0;
+  variableDeclarationStack = new VariableDeclaration[AstStackIncrement];
+  VariableDeclaration[] list;
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <VAR> VariableDeclarator() ( <COMMA> VariableDeclarator() )* <SEMICOLON>
+  <VAR> variableDeclaration = VariableDeclarator()
+  {
+    pushOnVariableDeclarationStack(variableDeclaration);
+    outlineInfo.addVariable(new String(variableDeclaration.name));
+    currentSegment.add(variableDeclaration);
+  }
+  ( <COMMA>
+      variableDeclaration = VariableDeclarator()
+      {pushOnVariableDeclarationStack(variableDeclaration);
+       outlineInfo.addVariable(new String(variableDeclaration.name));
+       currentSegment.add(variableDeclaration);}
+  )*
+  try {
+    <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;
+  }
+
+  {list = new VariableDeclaration[variableDeclarationPtr];
+   System.arraycopy(variableDeclarationStack,0,list,0,variableDeclarationPtr);
+   return new FieldDeclaration(list,
+                               pos,
+                               SimpleCharStream.getPosition());}
 }
 
-void VariableDeclarator() :
-{}
+VariableDeclaration VariableDeclarator() :
 {
-  VariableDeclaratorId() [ <ASSIGN> VariableInitializer() ]
+  final String varName, varValue;
+  Expression initializer = null;
+  final int pos = jj_input_stream.getPosition();
+}
+{
+  varName = VariableDeclaratorId()
+  [
+    <ASSIGN>
+    try {
+      initializer = VariableInitializer()
+    } catch (ParseException e) {
+      errorMessage = "Literal expression expected in variable initializer";
+      errorLevel   = ERROR;
+      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = jj_input_stream.getPosition() + 1;
+      throw e;
+    }
+  ]
+  {
+  if (initializer == null) {
+    return new VariableDeclaration(currentSegment,
+                                  varName.toCharArray(),
+                                  pos,
+                                  jj_input_stream.getPosition());
+  }
+    return new VariableDeclaration(currentSegment,
+                                    varName.toCharArray(),
+                                    initializer,
+                                    pos);
+  }
 }
 
-void VariableDeclaratorId() :
-{}
+/**
+ * A Variable name.
+ * @return the variable name (with suffix)
+ */
+String VariableDeclaratorId() :
 {
-  Variable() ( LOOKAHEAD(2) VariableSuffix() )*
+  String expr;
+  Expression expression;
+  final StringBuffer buff = new StringBuffer();
+  final int pos = SimpleCharStream.getPosition();
+  ConstantIdentifier ex;
+}
+{
+  try {
+    expr = Variable()   {buff.append(expr);}
+    ( LOOKAHEAD(2)
+      {ex = new ConstantIdentifier(expr.toCharArray(),
+                                   pos,
+                                   SimpleCharStream.getPosition());}
+      expression = VariableSuffix(ex)
+      {buff.append(expression.toStringExpression());}
+    )*
+    {return buff.toString();}
+  } 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;
+    throw e;
+  }
 }
 
-void Variable():
-{}
+String Variable():
 {
-  <DOLLAR_ID> (<LBRACE> Expression() <RBRACE>) *
+  final StringBuffer buff;
+  Expression expression = null;
+  final Token token;
+  final String expr;
+}
+{
+  token = <DOLLAR_ID> [<LBRACE> expression = Expression() <RBRACE>]
+  {
+    if (expression == null && !assigning) {
+      return token.image.substring(1);
+    }
+    buff = new StringBuffer(token.image);
+    buff.append('{');
+    buff.append(expression.toStringExpression());
+    buff.append('}');
+    return buff.toString();
+  }
 |
-  <DOLLAR> VariableName()
+  <DOLLAR> expr = VariableName()
+  {return expr;}
 }
 
-void VariableName():
-{}
+String VariableName():
+{
+  final StringBuffer buff;
+  String expr = null;
+  Expression expression = null;
+  final Token token;
+}
 {
-  <LBRACE> Expression() <RBRACE>
+  <LBRACE> expression = Expression() <RBRACE>
+  {buff = new StringBuffer('{');
+   buff.append(expression.toStringExpression());
+   buff.append('}');
+   return buff.toString();}
 |
-  <IDENTIFIER> (<LBRACE> Expression() <RBRACE>) *
+  token = <IDENTIFIER> [<LBRACE> expression = Expression() <RBRACE>]
+  {
+    if (expression == null) {
+      return token.image;
+    }
+    buff = new StringBuffer(token.image);
+    buff.append('{');
+    buff.append(expression.toStringExpression());
+    buff.append('}');
+    return buff.toString();
+  }
 |
-  <DOLLAR> VariableName()
+  <DOLLAR> expr = VariableName()
+  {
+    buff = new StringBuffer('$');
+    buff.append(expr);
+    return buff.toString();
+  }
+|
+  token = <DOLLAR_ID> {return token.image;}
 }
 
-void VariableInitializer() :
-{}
+Expression VariableInitializer() :
 {
-  Expression()
+  final Expression expr;
+  final Token token;
+  final int pos = SimpleCharStream.getPosition();
 }
-
-void ArrayVariable() :
-{}
 {
-  Expression() (<ARRAYASSIGN> Expression())*
+  expr = Literal()
+  {return expr;}
+|
+  <MINUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+  {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
+                                                        pos,
+                                                        SimpleCharStream.getPosition()),
+                                      OperatorIds.MINUS,
+                                      pos);}
+|
+  <PLUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+  {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
+                                                        pos,
+                                                        SimpleCharStream.getPosition()),
+                                      OperatorIds.PLUS,
+                                      pos);}
+|
+  expr = ArrayDeclarator()
+  {return expr;}
+|
+  token = <IDENTIFIER>
+  {return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
 }
 
-void ArrayInitializer() :
-{}
+ArrayVariableDeclaration ArrayVariable() :
 {
-  <LPAREN> [ ArrayVariable() ( LOOKAHEAD(2) <COMMA> ArrayVariable() )* ]<RPAREN>
+Expression expr;
+Expression expr2 = null;
 }
-
-void MethodDeclaration() :
-{}
 {
-  <FUNCTION> MethodDeclarator()
-  ( Block() | <SEMICOLON> )
+  expr = Expression() [<ARRAYASSIGN> expr2 = Expression()]
+  {return new ArrayVariableDeclaration(expr,expr2);}
 }
 
-void MethodDeclarator() :
-{}
+ArrayVariableDeclaration[] ArrayInitializer() :
+{
+  ArrayVariableDeclaration expr;
+  final ArrayList list = new ArrayList();
+}
 {
-  [<BIT_AND>] <IDENTIFIER> FormalParameters()
+  <LPAREN> [ expr = ArrayVariable()
+            {list.add(expr);}
+            ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
+            {list.add(expr);}
+            )*
+           ]
+           [<COMMA> {list.add(null);}]
+  <RPAREN>
+  {
+  ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+  list.toArray(vars);
+  return vars;}
 }
 
-void FormalParameters() :
-{}
+/**
+ * A Method Declaration.
+ * <b>function</b> MetodDeclarator() Block()
+ */
+MethodDeclaration MethodDeclaration() :
 {
-  <LPAREN> [ FormalParameter() ( <COMMA> FormalParameter() )* ] <RPAREN>
+  final MethodDeclaration functionDeclaration;
+  Token functionToken;
+  final Block block;
+}
+{
+  functionToken = <FUNCTION>
+  try {
+    functionDeclaration = MethodDeclarator()
+    {outlineInfo.addVariable(new String(functionDeclaration.name));}
+  } catch (ParseException e) {
+    if (errorMessage != null) {
+      throw e;
+    }
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+    errorLevel   = ERROR;
+    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = jj_input_stream.getPosition() + 1;
+    throw e;
+  }
+  {
+    if (currentSegment != null) {
+      currentSegment.add(functionDeclaration);
+      currentSegment = functionDeclaration;
+    }
+    currentFunction = functionDeclaration;
+  }
+  block = Block()
+  {
+    functionDeclaration.statements = block.statements;
+    currentFunction = null;
+    if (currentSegment != null) {
+      currentSegment = (OutlineableWithChildren) currentSegment.getParent();
+    }
+    return functionDeclaration;
+  }
 }
 
-void FormalParameter() :
-{}
+/**
+ * A MethodDeclarator.
+ * [&] IDENTIFIER(parameters ...).
+ * @return a function description for the outline
+ */
+MethodDeclaration MethodDeclarator() :
+{
+  final Token identifier;
+  Token reference = null;
+  final Hashtable formalParameters;
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  [<BIT_AND>] VariableDeclarator()
+  [ reference = <BIT_AND> ]
+  identifier = <IDENTIFIER>
+  formalParameters = FormalParameters()
+  {return new MethodDeclaration(currentSegment,
+                                 identifier.image.toCharArray(),
+                                 formalParameters,
+                                 reference != null,
+                                 pos,
+                                 SimpleCharStream.getPosition());}
 }
 
-void Type() :
-{}
+/**
+ * FormalParameters follows method identifier.
+ * (FormalParameter())
+ */
+Hashtable FormalParameters() :
 {
-  <STRING>
-|
-  <BOOL>
-|
-  <BOOLEAN>
-|
-  <REAL>
-|
-  <DOUBLE>
-|
-  <FLOAT>
-|
-  <INT>
-|
-  <INTEGER>
+  String expr;
+  final StringBuffer buff = new StringBuffer("(");
+  VariableDeclaration var;
+  final Hashtable parameters = new Hashtable();
+}
+{
+  try {
+  <LPAREN>
+  } 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;
+  }
+            [ var = FormalParameter()
+              {parameters.put(new String(var.name),var);}
+              (
+                <COMMA> var = FormalParameter()
+                {parameters.put(new String(var.name),var);}
+              )*
+            ]
+  try {
+    <RPAREN>
+  } 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;
+  }
+ {return parameters;}
 }
 
-/*
- * Expression syntax follows.
+/**
+ * A formal parameter.
+ * $varname[=value] (,$varname[=value])
  */
+VariableDeclaration FormalParameter() :
+{
+  final VariableDeclaration variableDeclaration;
+  Token token = null;
+}
+{
+  [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
+  {
+    if (token != null) {
+      variableDeclaration.setReference(true);
+    }
+    return variableDeclaration;}
+}
+
+ConstantIdentifier Type() :
+{final int pos;}
+{
+  <STRING>             {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.STRING,
+                                        pos,pos-6);}
+| <BOOL>               {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.BOOL,
+                                        pos,pos-4);}
+| <BOOLEAN>            {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.BOOLEAN,
+                                        pos,pos-7);}
+| <REAL>               {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.REAL,
+                                        pos,pos-4);}
+| <DOUBLE>             {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.DOUBLE,
+                                        pos,pos-5);}
+| <FLOAT>              {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.FLOAT,
+                                        pos,pos-5);}
+| <INT>                {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.INT,
+                                        pos,pos-3);}
+| <INTEGER>            {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.INTEGER,
+                                        pos,pos-7);}
+| <OBJECT>             {pos = SimpleCharStream.getPosition();
+                        return new ConstantIdentifier(Types.OBJECT,
+                                        pos,pos-6);}
+}
+
+Expression Expression() :
+{
+  final Expression expr;
+}
+{
+  expr = PrintExpression()       {return expr;}
+| expr = ListExpression()        {return expr;}
+| LOOKAHEAD(varAssignation())
+  expr = varAssignation()        {return expr;}
+| expr = ConditionalExpression() {return expr;}
+}
 
-void Expression() :
-/*
- * This expansion has been written this way instead of:
- *   Assignment() | ConditionalExpression()
- * for performance reasons.
- * However, it is a weakening of the grammar for it allows the LHS of
- * assignments to be any conditional expression whereas it can only be
- * a primary expression.  Consider adding a semantic predicate to work
- * around this.
+/**
+ * A Variable assignation.
+ * varName (an assign operator) any expression
  */
-{}
+VarAssignation varAssignation() :
 {
-  PrintExpression()
-|
-  ConditionalExpression()
-  [
-    AssignmentOperator() Expression()
-  ]
+  String varName;
+  final Expression expression;
+  final int assignOperator;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  varName = VariableDeclaratorId()
+  assignOperator = AssignmentOperator()
+    try {
+      expression = Expression()
+    } 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;
+    }
+    {return new VarAssignation(varName.toCharArray(),
+                               expression,
+                               assignOperator,
+                               pos,
+                               SimpleCharStream.getPosition());}
 }
 
-void AssignmentOperator() :
+int AssignmentOperator() :
 {}
 {
-  <ASSIGN> | <STARASSIGN> | <SLASHASSIGN> | <REMASSIGN> | <PLUSASSIGN> | <MINUSASSIGN> | <LSHIFTASSIGN> | <RSIGNEDSHIFTASSIGN> | <RUNSIGNEDSHIFTASSIGN> | <ANDASSIGN> | <XORASSIGN> | <ORASSIGN> | <DOTASSIGN>
+  <ASSIGN>             {return VarAssignation.EQUAL;}
+| <STARASSIGN>         {return VarAssignation.STAR_EQUAL;}
+| <SLASHASSIGN>        {return VarAssignation.SLASH_EQUAL;}
+| <REMASSIGN>          {return VarAssignation.REM_EQUAL;}
+| <PLUSASSIGN>         {return VarAssignation.PLUS_EQUAL;}
+| <MINUSASSIGN>        {return VarAssignation.MINUS_EQUAL;}
+| <LSHIFTASSIGN>       {return VarAssignation.LSHIFT_EQUAL;}
+| <RSIGNEDSHIFTASSIGN> {return VarAssignation.RSIGNEDSHIFT_EQUAL;}
+| <ANDASSIGN>          {return VarAssignation.AND_EQUAL;}
+| <XORASSIGN>          {return VarAssignation.XOR_EQUAL;}
+| <ORASSIGN>           {return VarAssignation.OR_EQUAL;}
+| <DOTASSIGN>          {return VarAssignation.DOT_EQUAL;}
+| <TILDEEQUAL>         {return VarAssignation.TILDE_EQUAL;}
 }
 
-void ConditionalExpression() :
-{}
+Expression ConditionalExpression() :
+{
+  final Expression expr;
+  Expression expr2 = null;
+  Expression expr3 = null;
+}
+{
+  expr = ConditionalOrExpression() [ <HOOK> expr2 = Expression() <COLON> expr3 = ConditionalExpression() ]
 {
-  ConditionalOrExpression() [ <HOOK> Expression() <COLON> ConditionalExpression() ]
+  if (expr3 == null) {
+    return expr;
+  }
+  return new ConditionalExpression(expr,expr2,expr3);
+}
 }
 
-void ConditionalOrExpression() :
-{}
+Expression ConditionalOrExpression() :
 {
-  ConditionalAndExpression() ( (<SC_OR> | <_ORL>) ConditionalAndExpression() )*
+  Expression expr,expr2;
+  int operator;
+}
+{
+  expr = ConditionalAndExpression()
+  (
+    (
+        <OR_OR> {operator = OperatorIds.OR_OR;}
+      | <_ORL>  {operator = OperatorIds.ORL;}
+    ) expr2 = ConditionalAndExpression()
+    {
+      expr = new BinaryExpression(expr,expr2,operator);
+    }
+  )*
+  {return expr;}
 }
 
-void ConditionalAndExpression() :
-{}
+Expression ConditionalAndExpression() :
+{
+  Expression expr,expr2;
+  int operator;
+}
 {
-  ConcatExpression() ( (<SC_AND> | <_ANDL>) ConcatExpression() )*
+  expr = ConcatExpression()
+  (
+  (  <AND_AND> {operator = OperatorIds.AND_AND;}
+   | <_ANDL>   {operator = OperatorIds.ANDL;})
+   expr2 = ConcatExpression() {expr = new BinaryExpression(expr,expr2,operator);}
+  )*
+  {return expr;}
 }
 
-void ConcatExpression() :
-{}
+Expression ConcatExpression() :
 {
-  InclusiveOrExpression() ( <DOT> InclusiveOrExpression() )*
+  Expression expr,expr2;
+}
+{
+  expr = InclusiveOrExpression()
+  (
+    <DOT> expr2 = InclusiveOrExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.DOT);}
+  )*
+  {return expr;}
 }
 
-void InclusiveOrExpression() :
-{}
+Expression InclusiveOrExpression() :
+{
+  Expression expr,expr2;
+}
 {
-  ExclusiveOrExpression() ( <BIT_OR> ExclusiveOrExpression() )*
+  expr = ExclusiveOrExpression()
+  (<BIT_OR> expr2 = ExclusiveOrExpression()
+   {expr = new BinaryExpression(expr,expr2,OperatorIds.OR);}
+  )*
+  {return expr;}
 }
 
-void ExclusiveOrExpression() :
-{}
+Expression ExclusiveOrExpression() :
+{
+  Expression expr,expr2;
+}
 {
-  AndExpression() ( <XOR> AndExpression() )*
+  expr = AndExpression()
+  (
+    <XOR> expr2 = AndExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.XOR);}
+  )*
+  {return expr;}
 }
 
-void AndExpression() :
-{}
+Expression AndExpression() :
+{
+  Expression expr,expr2;
+}
 {
-  EqualityExpression() ( <BIT_AND> EqualityExpression() )*
+  expr = EqualityExpression()
+  (
+    <BIT_AND> expr2 = EqualityExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.AND);}
+  )*
+  {return expr;}
 }
 
-void EqualityExpression() :
-{}
+Expression EqualityExpression() :
 {
-  RelationalExpression() ( ( <EQ> | <NE> ) RelationalExpression() )*
+  Expression expr,expr2;
+  int operator;
+}
+{
+  expr = RelationalExpression()
+  (
+  (   <EQUAL_EQUAL>      {operator = OperatorIds.EQUAL_EQUAL;}
+    | <DIF>              {operator = OperatorIds.DIF;}
+    | <NOT_EQUAL>        {operator = OperatorIds.DIF;}
+    | <BANGDOUBLEEQUAL>  {operator = OperatorIds.BANG_EQUAL_EQUAL;}
+    | <TRIPLEEQUAL>      {operator = OperatorIds.EQUAL_EQUAL_EQUAL;}
+  )
+  try {
+    expr2 = RelationalExpression()
+  } catch (ParseException e) {
+    if (errorMessage != null) {
+      throw e;
+    }
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+    errorLevel   = ERROR;
+    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = jj_input_stream.getPosition() + 1;
+    throw e;
+  }
+  {
+    expr = new BinaryExpression(expr,expr2,operator);
+  }
+  )*
+  {return expr;}
 }
 
-void RelationalExpression() :
-{}
+Expression RelationalExpression() :
+{
+  Expression expr,expr2;
+  int operator;
+}
 {
-  ShiftExpression() ( ( <LT> | <GT> | <LE> | <GE> ) ShiftExpression() )*
+  expr = ShiftExpression()
+  (
+  ( <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 expr;}
 }
 
-void ShiftExpression() :
-{}
+Expression ShiftExpression() :
+{
+  Expression expr,expr2;
+  int operator;
+}
 {
-  AdditiveExpression() ( ( <LSHIFT> | <RSIGNEDSHIFT> | <RUNSIGNEDSHIFT> ) AdditiveExpression() )*
+  expr = AdditiveExpression()
+  (
+  ( <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 expr;}
 }
 
-void AdditiveExpression() :
-{}
+Expression AdditiveExpression() :
+{
+  Expression expr,expr2;
+  int operator;
+}
 {
-  MultiplicativeExpression() ( ( <PLUS> | <MINUS> ) MultiplicativeExpression() )*
+  expr = MultiplicativeExpression()
+  (
+   ( <PLUS>  {operator = OperatorIds.PLUS;}
+   | <MINUS> {operator = OperatorIds.MINUS;} )
+   expr2 = MultiplicativeExpression()
+  {expr = new BinaryExpression(expr,expr2,operator);}
+   )*
+  {return expr;}
 }
 
-void MultiplicativeExpression() :
-{}
+Expression MultiplicativeExpression() :
+{
+  Expression expr,expr2;
+  int operator;
+}
 {
-  UnaryExpression() ( ( <STAR> | <SLASH> | <REM> ) UnaryExpression() )*
+  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;
+    throw e;
+  }
+  (
+   (  <STAR>      {operator = OperatorIds.MULTIPLY;}
+    | <SLASH>     {operator = OperatorIds.DIVIDE;}
+    | <REMAINDER> {operator = OperatorIds.REMAINDER;})
+    expr2 = UnaryExpression()
+    {expr = new BinaryExpression(expr,expr2,operator);}
+  )*
+  {return expr;}
 }
 
-void UnaryExpression() :
-{}
+/**
+ * An unary expression starting with @, & or nothing
+ */
+Expression UnaryExpression() :
 {
-  <AT> UnaryExpression()
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <BIT_AND> expr = UnaryExpressionNoPrefix()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
 |
-  ( <PLUS> | <MINUS> ) UnaryExpression()
+  expr = AtUnaryExpression()
+  {return expr;}
+}
+
+Expression AtUnaryExpression() :
+{
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <AT>
+  expr = AtUnaryExpression()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
 |
-  PreIncrementExpression()
+  expr = UnaryExpressionNoPrefix()
+  {return expr;}
+}
+
+
+Expression UnaryExpressionNoPrefix() :
+{
+  Expression expr;
+  int operator;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  (  <PLUS>  {operator = OperatorIds.PLUS;}
+   | <MINUS> {operator = OperatorIds.MINUS;})
+   expr = UnaryExpression()
+  {return new PrefixedUnaryExpression(expr,operator,pos);}
 |
-  PreDecrementExpression()
+  expr = PreIncDecExpression()
+  {return expr;}
 |
-  UnaryExpressionNotPlusMinus()
+  expr = UnaryExpressionNotPlusMinus()
+  {return expr;}
 }
 
-void PreIncrementExpression() :
-{}
+
+Expression PreIncDecExpression() :
 {
-  <INCR> PrimaryExpression()
+final Expression expr;
+final int operator;
+  final int pos = SimpleCharStream.getPosition();
 }
-
-void PreDecrementExpression() :
-{}
 {
-  <DECR> PrimaryExpression()
+  (  <INCR> {operator = OperatorIds.PLUS_PLUS;}
+   | <DECR> {operator = OperatorIds.MINUS_MINUS;})
+   expr = PrimaryExpression()
+  {return new PrefixedUnaryExpression(expr,operator,pos);}
 }
 
-void UnaryExpressionNotPlusMinus() :
-{}
+Expression UnaryExpressionNotPlusMinus() :
 {
-  <BANG> UnaryExpression()
-|
-  LOOKAHEAD( <LPAREN> Type() <RPAREN> )
-  CastExpression()
-|
-  PostfixExpression()
-|
-  Literal()
-|
-  <LPAREN>Expression()<RPAREN>
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <BANG> expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+| LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
+  expr = CastExpression()         {return expr;}
+| expr = PostfixExpression()      {return expr;}
+| expr = Literal()                {return expr;}
+| <LPAREN> expr = Expression()
+  try {
+    <RPAREN>
+  } 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;
+  }
+  {return expr;}
 }
 
-void CastExpression() :
-{}
+CastExpression CastExpression() :
+{
+final ConstantIdentifier type;
+final Expression expr;
+final int pos = SimpleCharStream.getPosition();
+}
 {
-  <LPAREN> Type() <RPAREN> UnaryExpression()
+  <LPAREN>
+  (type = Type()
+  | <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());})
+  <RPAREN> expr = UnaryExpression()
+  {return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
 }
 
-void PostfixExpression() :
-{}
+Expression PostfixExpression() :
+{
+  Expression expr;
+  int operator = -1;
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  PrimaryExpression() [ <INCR> | <DECR> ]
+  expr = PrimaryExpression()
+  [ <INCR> {operator = OperatorIds.PLUS_PLUS;}
+  | <DECR> {operator = OperatorIds.MINUS_MINUS;}]
+  {
+    if (operator == -1) {
+      return expr;
+    }
+    return new PostfixedUnaryExpression(expr,operator,pos);
+  }
 }
 
-void PrimaryExpression() :
-{}
+Expression PrimaryExpression() :
+{
+  final Token identifier;
+  Expression expr;
+  final StringBuffer buff = new StringBuffer();
+  final int pos = SimpleCharStream.getPosition();
+}
 {
   LOOKAHEAD(2)
-  <IDENTIFIER> <STATICCLASSACCESS> ClassIdentifier() (PrimarySuffix())*
+  identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
+  {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
+                                                 pos,
+                                                 SimpleCharStream.getPosition()),
+                          expr,
+                          ClassAccess.STATIC);}
+  (expr = PrimarySuffix(expr))*
+  {return expr;}
 |
-  PrimaryPrefix() ( PrimarySuffix() )*
+  expr = PrimaryPrefix()
+  (expr = PrimarySuffix(expr))*
+  {return expr;}
 |
-  <ARRAY> ArrayInitializer()
+  expr = ArrayDeclarator()
+  {return expr;}
 }
 
-void PrimaryPrefix() :
-{}
+ArrayInitializer ArrayDeclarator() :
 {
-  <IDENTIFIER>
-|
-  <NEW> ClassIdentifier()
-|  
-  VariableDeclaratorId()
+  final ArrayVariableDeclaration[] vars;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <ARRAY> vars = ArrayInitializer()
+  {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
 }
 
-void ClassIdentifier():
-{}
+Expression PrimaryPrefix() :
 {
-  <IDENTIFIER>
-|
-  VariableDeclaratorId()
+  final Expression expr;
+  final Token token;
+  final String var;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  token = <IDENTIFIER>           {return new ConstantIdentifier(token.image.toCharArray(),
+                                                                pos,
+                                                                SimpleCharStream.getPosition());}
+| <NEW> expr = ClassIdentifier() {return new PrefixedUnaryExpression(expr,
+                                                                     OperatorIds.NEW,
+                                                                     pos);}
+| var = VariableDeclaratorId()  {return new ConstantIdentifier(var.toCharArray(),
+                                                               pos,
+                                                               SimpleCharStream.getPosition());}
 }
 
-void PrimarySuffix() :
-{}
+PrefixedUnaryExpression classInstantiation() :
 {
-  Arguments()
-|
-  VariableSuffix()
+  Expression expr;
+  final StringBuffer buff;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <NEW> expr = ClassIdentifier()
+  [
+    {buff = new StringBuffer(expr.toStringExpression());}
+    expr = PrimaryExpression()
+    {buff.append(expr.toStringExpression());
+    expr = new ConstantIdentifier(buff.toString().toCharArray(),
+                                  pos,
+                                  SimpleCharStream.getPosition());}
+  ]
+  {return new PrefixedUnaryExpression(expr,
+                                      OperatorIds.NEW,
+                                      pos);}
 }
 
-void VariableSuffix() :
-{}
+ConstantIdentifier ClassIdentifier():
 {
-  <CLASSACCESS> VariableName()
-| 
-  <LBRACKET> [ Expression() ] <RBRACKET>
+  final String expr;
+  final Token token;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  token = <IDENTIFIER>          {return new ConstantIdentifier(token.image.toCharArray(),
+                                                               pos,
+                                                               SimpleCharStream.getPosition());}
+| expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(),
+                                                               pos,
+                                                               SimpleCharStream.getPosition());}
 }
 
-void Literal() :
-{}
+AbstractSuffixExpression PrimarySuffix(Expression prefix) :
 {
-  <INTEGER_LITERAL>
-|
-  <FLOATING_POINT_LITERAL>
-|
-  <STRING_LITERAL>
-|
-  BooleanLiteral()
-|
-  NullLiteral()
+  final AbstractSuffixExpression expr;
+}
+{
+  expr = Arguments(prefix)      {return expr;}
+| expr = VariableSuffix(prefix) {return expr;}
 }
 
-void BooleanLiteral() :
-{}
+AbstractSuffixExpression VariableSuffix(Expression prefix) :
 {
-  <TRUE>
+  String expr = null;
+  final int pos = SimpleCharStream.getPosition();
+  Expression expression = null;
+}
+{
+  <CLASSACCESS>
+  try {
+    expr = VariableName()
+  } 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;
+  }
+  {return new ClassAccess(prefix,
+                          new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+                          ClassAccess.NORMAL);}
 |
-  <FALSE>
+  <LBRACKET> [ expression = Expression() | expression = Type() ]  //Not good
+  try {
+    <RBRACKET>
+  } 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;
+  }
+  {return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
 }
 
-void NullLiteral() :
-{}
+Literal Literal() :
+{
+  final Token token;
+  final int pos;
+}
 {
-  <NULL>
+  token = <INTEGER_LITERAL>        {pos = SimpleCharStream.getPosition();
+                                    return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
+| token = <FLOATING_POINT_LITERAL> {pos = SimpleCharStream.getPosition();
+                                    return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
+| token = <STRING_LITERAL>         {pos = SimpleCharStream.getPosition();
+                                    return new StringLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
+| <TRUE>                           {pos = SimpleCharStream.getPosition();
+                                    return new TrueLiteral(pos-4,pos);}
+| <FALSE>                          {pos = SimpleCharStream.getPosition();
+                                    return new FalseLiteral(pos-4,pos);}
+| <NULL>                           {pos = SimpleCharStream.getPosition();
+                                    return new NullLiteral(pos-4,pos);}
 }
 
-void Arguments() :
-{}
+FunctionCall Arguments(Expression func) :
 {
-  <LPAREN> [ ArgumentList() ] <RPAREN>
+ArgumentDeclaration[] args = null;
+}
+{
+  <LPAREN> [ args = ArgumentList() ]
+  try {
+    <RPAREN>
+  } 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;
+  }
+  {return new FunctionCall(func,args,SimpleCharStream.getPosition());}
 }
 
-void ArgumentList() :
-{}
+ArgumentDeclaration[] ArgumentList() :
 {
-  Expression() ( <COMMA> Expression() )*
+ArgumentDeclaration arg;
+final ArrayList list = new ArrayList();
+ArgumentDeclaration argument;
+}
+{
+  arg = argumentDeclaration()
+  {list.add(arg);}
+  ( <COMMA>
+      try {
+        arg = argumentDeclaration()
+        {list.add(arg);}
+      } 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;
+      }
+   )*
+   {
+   ArgumentDeclaration[] args = new ArgumentDeclaration[list.size()];
+   list.toArray(args);
+   return args;}
 }
 
-/*
- * Statement syntax follows.
+ArgumentDeclaration argumentDeclaration() :
+{
+  boolean reference = false;
+  String varName;
+  Expression initializer = null;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  [<BIT_AND> {reference = true;}]
+  varName = VariableDeclaratorId()
+ [
+    <ASSIGN>
+    try {
+      initializer = VariableInitializer()
+    } catch (ParseException e) {
+      errorMessage = "Literal expression expected in variable initializer";
+      errorLevel   = ERROR;
+      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = jj_input_stream.getPosition() + 1;
+      throw e;
+    }
+  ]
+  {
+  if (initializer == null) {
+    return new ArgumentDeclaration(varName.toCharArray(),
+                                   reference,
+                                   pos);
+  }
+  return new ArgumentDeclaration(varName.toCharArray(),
+                                 reference,
+                                 initializer,
+                                 pos);
+  }
+}
+/**
+ * A Statement without break.
  */
-
-void Statement() :
-{}
+Statement StatementNoBreak() :
+{
+  final Statement statement;
+  Token token = null;
+}
 {
   LOOKAHEAD(2)
-  Expression()  (<SEMICOLON> | "?>")
-|
-  LOOKAHEAD(2)
-  LabeledStatement()
-|
-  Block()
-|
-  EmptyStatement()
-|
-  StatementExpression()
+  statement = Expression()
   try {
     <SEMICOLON>
   } catch (ParseException e) {
-    errorMessage = "';' expected after expression";
+    if (e.currentToken.next.kind != 4) {
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+      errorLevel   = ERROR;
+      errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+      errorEnd   = jj_input_stream.getPosition() + 1;
+      throw e;
+    }
+  }
+  {return statement;}
+| LOOKAHEAD(2)
+  statement = LabeledStatement() {return statement;}
+| statement = Block()            {return statement;}
+| statement = EmptyStatement()   {return statement;}
+| statement = StatementExpression()
+  try {
+    <SEMICOLON>
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
     errorLevel   = ERROR;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
     throw e;
   }
-|
-  SwitchStatement()
-|
-  IfStatement()
-|
-  WhileStatement()
-|
-  DoStatement()
-|
-  ForStatement()
-|
-  BreakStatement()
-|
-  ContinueStatement()
-|
-  ReturnStatement()
-|
-  EchoStatement()
-|
-  IncludeStatement()
-|
-  StaticStatement()
-|
-  GlobalStatement()
+  {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;
+  }
+  return statement;}
+| statement = StaticStatement()         {return statement;}
+| statement = GlobalStatement()         {return statement;}
 }
 
-void IncludeStatement() :
-{}
+/**
+ * A Normal statement.
+ */
+Statement Statement() :
 {
-  <REQUIRE> Expression() (<SEMICOLON> | "?>")
-|
-  <REQUIRE_ONCE> Expression() (<SEMICOLON> | "?>")
-|
-  <INCLUDE> Expression() (<SEMICOLON> | "?>")
-|
-  <INCLUDE_ONCE> Expression() (<SEMICOLON> | "?>")
+  final Statement statement;
+}
+{
+  statement = StatementNoBreak() {return statement;}
+| statement = BreakStatement()   {return statement;}
 }
 
-void PrintExpression() :
-{}
+/**
+ * An html block inside a php syntax.
+ */
+HTMLBlock htmlBlock() :
 {
-  <PRINT> Expression()
+  final int startIndex = nodePtr;
+  AstNode[] blockNodes;
+  int nbNodes;
+}
+{
+  <PHPEND> (phpEchoBlock())*
+  try {
+    (<PHPSTARTLONG> | <PHPSTARTSHORT>)
+  } catch (ParseException e) {
+    errorMessage = "End of file unexpected, '<?php' expected";
+    errorLevel   = ERROR;
+    errorStart   = jj_input_stream.getPosition();
+    errorEnd     = jj_input_stream.getPosition();
+    throw e;
+  }
+  {
+  nbNodes = nodePtr-startIndex;
+  blockNodes = new AstNode[nbNodes];
+  System.arraycopy(nodes,startIndex,blockNodes,0,nbNodes);
+  return new HTMLBlock(nodes);}
 }
 
-void EchoStatement() :
-{}
+/**
+ * An include statement. It's "include" an expression;
+ */
+InclusionStatement IncludeStatement() :
+{
+  final Expression expr;
+  final Token token;
+  final int keyword;
+  final int pos = jj_input_stream.getPosition();
+  final InclusionStatement inclusionStatement;
+}
 {
-  <ECHO> Expression() (<COMMA> Expression())*
+      (  <REQUIRE>      {keyword = InclusionStatement.REQUIRE;}
+       | <REQUIRE_ONCE> {keyword = InclusionStatement.REQUIRE_ONCE;}
+       | <INCLUDE>      {keyword = InclusionStatement.INCLUDE;}
+       | <INCLUDE_ONCE> {keyword = InclusionStatement.INCLUDE_ONCE;})
   try {
-    (<SEMICOLON> | "?>")
+    expr = Expression()
   } catch (ParseException e) {
-    errorMessage = "';' expected after 'echo' statement";
+    if (errorMessage != null) {
+      throw e;
+    }
+    errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected";
     errorLevel   = ERROR;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
     throw e;
   }
+  {inclusionStatement = new InclusionStatement(currentSegment,
+                                               keyword,
+                                               expr,
+                                               pos);
+   currentSegment.add(inclusionStatement);
+  }
+  try {
+    <SEMICOLON>
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+    errorLevel   = ERROR;
+    errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd     = jj_input_stream.getPosition() + 1;
+    throw e;
+  }
+  {return inclusionStatement;}
 }
 
-void GlobalStatement() :
-{}
+PrintExpression PrintExpression() :
 {
-  <GLOBAL> VariableDeclaratorId() (<COMMA> VariableDeclaratorId())* (<SEMICOLON> | "?>")
+  final Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <PRINT> expr = Expression() {return new PrintExpression(expr,pos,SimpleCharStream.getPosition());}
 }
 
-void StaticStatement() :
-{}
+ListExpression ListExpression() :
 {
-  <STATIC> VariableDeclarator() (<COMMA> VariableDeclarator())* (<SEMICOLON> | "?>")
+  String expr = null;
+  Expression expression = null;
+  ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <LIST>
+  try {
+    <LPAREN>
+  } 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;
+  }
+  [
+    expr = VariableDeclaratorId()
+    {list.add(expr);}
+  ]
+  {if (expr == null) list.add(null);}
+  (
+    try {
+      <COMMA>
+    } 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;
+    }
+    expr = VariableDeclaratorId()
+    {list.add(expr);}
+  )*
+  try {
+    <RPAREN>
+  } 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;
+  }
+  [ <ASSIGN> expression = Expression()
+    {
+    String[] strings = new String[list.size()];
+    list.toArray(strings);
+    return new ListExpression(strings,
+                              expression,
+                              pos,
+                              SimpleCharStream.getPosition());}
+  ]
+  {
+    String[] strings = new String[list.size()];
+    list.toArray(strings);
+    return new ListExpression(strings,pos,SimpleCharStream.getPosition());}
 }
 
-void LabeledStatement() :
-{}
+/**
+ * An echo statement.
+ * echo anyexpression (, otherexpression)*
+ */
+EchoStatement EchoStatement() :
+{
+  final ArrayList expressions = new ArrayList();
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <IDENTIFIER> <COLON> Statement()
+  <ECHO> expr = Expression()
+  {expressions.add(expr);}
+  (
+    <COMMA> expr = Expression()
+    {expressions.add(expr);}
+  )*
+  try {
+    <SEMICOLON>
+    {
+    Expression[] exprs = new Expression[expressions.size()];
+    expressions.toArray(exprs);
+    return new EchoStatement(exprs,pos);}
+  } 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;
+    }
+  }
 }
 
-void Block() :
-{}
+GlobalStatement GlobalStatement() :
 {
-  <LBRACE> ( BlockStatement() )* <RBRACE>
+   final int pos = jj_input_stream.getPosition();
+   String expr;
+   ArrayList vars = new ArrayList();
+   GlobalStatement global;
+}
+{
+  <GLOBAL>
+    expr = VariableDeclaratorId()
+    {vars.add(expr);}
+  (<COMMA>
+    expr = VariableDeclaratorId()
+    {vars.add(expr);}
+  )*
+  try {
+    <SEMICOLON>
+    {
+    String[] strings = new String[vars.size()];
+    vars.toArray(strings);
+    global = new GlobalStatement(currentSegment,
+                                 strings,
+                                 pos,
+                                 SimpleCharStream.getPosition());
+    currentSegment.add(global);
+    return global;}
+  } 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;
+  }
 }
 
-void BlockStatement() :
-{}
+StaticStatement StaticStatement() :
 {
-  Statement()
-|
-  ClassDeclaration()
-|
-  MethodDeclaration()
+  final int pos = SimpleCharStream.getPosition();
+  final ArrayList vars = new ArrayList();
+  VariableDeclaration expr;
+}
+{
+  <STATIC> expr = VariableDeclarator() {vars.add(new String(expr.name));}
+  (<COMMA> expr = VariableDeclarator() {vars.add(new String(expr.name));})*
+  try {
+    <SEMICOLON>
+    {
+    String[] strings = new String[vars.size()];
+    vars.toArray(strings);
+    return new StaticStatement(strings,
+                                pos,
+                                SimpleCharStream.getPosition());}
+  } 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;
+  }
 }
 
-void LocalVariableDeclaration() :
-{}
+LabeledStatement LabeledStatement() :
+{
+  final int pos = SimpleCharStream.getPosition();
+  final Token label;
+  final Statement statement;
+}
 {
-  VariableDeclarator() ( <COMMA> VariableDeclarator() )*
+  label = <IDENTIFIER> <COLON> statement = Statement()
+  {return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());}
 }
 
-void EmptyStatement() :
-{}
+/**
+ * A Block is
+ * {
+ * statements
+ * }.
+ * @return a block
+ */
+Block Block() :
 {
-  <SEMICOLON>
+  final int pos = SimpleCharStream.getPosition();
+  Statement[] statements;
+  Statement statement;
+  final int startingPtr = statementPtr;
+  final int length;
+}
+{
+  try {
+    <LBRACE>
+  } catch (ParseException e) {
+    errorMessage = "'{' expected";
+    errorLevel   = ERROR;
+    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = jj_input_stream.getPosition() + 1;
+    throw e;
+  }
+  ( statement = BlockStatement() {pushOnStatementStack(statement);}
+  | statement = htmlBlock()      {pushOnStatementStack(statement);})*
+  try {
+    <RBRACE>
+  } 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;
+  }
+  {
+  length = statementPtr-startingPtr+1;
+  statements = new Statement[length];
+  System.arraycopy(variableDeclarationStack,startingPtr+1,statements,0,length);
+  statementPtr = startingPtr;
+  return new Block(statements,pos,SimpleCharStream.getPosition());}
 }
 
-void StatementExpression() :
-/*
- * The last expansion of this production accepts more than the legal
- * Java expansions for StatementExpression.  This expansion does not
- * use PostfixExpression for performance reasons.
+Statement BlockStatement() :
+{
+  final Statement statement;
+}
+{
+  statement = Statement()         {return statement;}
+| statement = ClassDeclaration()  {return statement;}
+| statement = MethodDeclaration() {return statement;}
+}
+
+/**
+ * A Block statement that will not contain any 'break'
  */
-{}
+Statement BlockStatementNoBreak() :
 {
-  PreIncrementExpression()
-|
-  PreDecrementExpression()
-|
-  PrimaryExpression()
-  [
-   <INCR>
-  |
-    <DECR>
-  |
-    AssignmentOperator() Expression()
-  ]
+  final Statement statement;
+}
+{
+  statement = StatementNoBreak()  {return statement;}
+| statement = ClassDeclaration()  {return statement;}
+| statement = MethodDeclaration() {return statement;}
 }
 
-void SwitchStatement() :
-{}
+VariableDeclaration[] LocalVariableDeclaration() :
+{
+  final ArrayList list = new ArrayList();
+  VariableDeclaration var;
+}
 {
-  <SWITCH> <LPAREN> Expression() <RPAREN> <LBRACE>
-    ( SwitchLabel() ( BlockStatement() )* )*
-  <RBRACE>
+  var = LocalVariableDeclarator()
+  {list.add(var);}
+  ( <COMMA> var = LocalVariableDeclarator() {list.add(var);})*
+  {
+    VariableDeclaration[] vars = new VariableDeclaration[list.size()];
+    list.toArray(vars);
+  return vars;}
 }
 
-void SwitchLabel() :
-{}
+VariableDeclaration LocalVariableDeclarator() :
+{
+  final String varName;
+  Expression initializer = null;
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <CASE> Expression() <COLON>
+  varName = VariableDeclaratorId() [ <ASSIGN> initializer = Expression() ]
+  {
+   if (initializer == null) {
+    return new VariableDeclaration(currentSegment,
+                                  varName.toCharArray(),
+                                  pos,
+                                  jj_input_stream.getPosition());
+   }
+    return new VariableDeclaration(currentSegment,
+                                    varName.toCharArray(),
+                                    initializer,
+                                    pos);
+  }
+}
+
+EmptyStatement EmptyStatement() :
+{
+  final int pos;
+}
+{
+  <SEMICOLON>
+  {pos = SimpleCharStream.getPosition();
+   return new EmptyStatement(pos-1,pos);}
+}
+
+Statement StatementExpression() :
+{
+  Expression expr;
+}
+{
+  expr = PreIncDecExpression() {return expr;}
 |
-  <_DEFAULT> <COLON>
+  expr = PrimaryExpression()
+  [ <INCR> {expr = new PostfixedUnaryExpression(expr,
+                                                OperatorIds.PLUS_PLUS,
+                                                SimpleCharStream.getPosition());}
+  | <DECR> {expr = new PostfixedUnaryExpression(expr,
+                                                OperatorIds.MINUS_MINUS,
+                                                SimpleCharStream.getPosition());}
+  | AssignmentOperator() Expression() ]
 }
 
-void IfStatement() :
-/*
- * The disambiguating algorithm of JavaCC automatically binds dangling
- * else's to the innermost if statement.  The LOOKAHEAD specification
- * is to tell JavaCC that we know what we are doing.
+SwitchStatement SwitchStatement() :
+{
+  final Expression variable;
+  final AbstractCase[] cases;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <SWITCH>
+  try {
+    <LPAREN>
+  } 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;
+  }
+  try {
+    variable = Expression()
+  } 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;
+  }
+  try {
+    <RPAREN>
+  } 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;
+  }
+  (cases = switchStatementBrace() | cases = switchStatementColon(pos, pos + 6))
+  {return new SwitchStatement(variable,cases,pos,SimpleCharStream.getPosition());}
+}
+
+AbstractCase[] switchStatementBrace() :
+{
+  AbstractCase cas;
+  final ArrayList cases = new ArrayList();
+}
+{
+  <LBRACE>
+ ( cas = switchLabel0() {cases.add(cas);})*
+  try {
+    <RBRACE>
+    {
+    AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    return abcase;}
+  } 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;
+  }
+}
+/**
+ * A Switch statement with : ... endswitch;
+ * @param start the begin offset of the switch
+ * @param end the end offset of the switch
  */
-{}
+AbstractCase[] switchStatementColon(final int start, final int end) :
+{
+  AbstractCase cas;
+  final ArrayList cases = new ArrayList();
+}
+{
+  <COLON>
+  {try {
+  setMarker(fileToParse,
+            "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;",
+            start,
+            end,
+            INFO,
+            "Line " + token.beginLine);
+  } catch (CoreException e) {
+    PHPeclipsePlugin.log(e);
+  }}
+  ( cas = switchLabel0() {cases.add(cas);})*
+  try {
+    <ENDSWITCH>
+  } 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;
+  }
+  try {
+    <SEMICOLON>
+    {
+    AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    return abcase;}
+  } 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;
+  }
+}
+
+AbstractCase switchLabel0() :
 {
-  <IF> Condition("if") Statement() [ LOOKAHEAD(1) ElseIfStatement() ] [ LOOKAHEAD(1) <ELSE> Statement() ]
+  final Expression expr;
+  Statement statement;
+  final ArrayList stmts = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  expr = SwitchLabel()
+  ( statement = BlockStatementNoBreak() {stmts.add(statement);}
+  | statement = htmlBlock()             {stmts.add(statement);})*
+  [ statement = BreakStatement()        {stmts.add(statement);}]
+  {
+  Statement[] stmtsArray = new Statement[stmts.size()];
+  stmts.toArray(stmtsArray);
+  if (expr == null) {//it's a default
+    return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition());
+  }
+  return new Case(expr,stmtsArray,pos,SimpleCharStream.getPosition());}
 }
 
-void Condition(String keyword) :
-{}
+/**
+ * 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 {
+    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;
+    throw e;
+  }
+  try {
+    <COLON>
+    {return expr;}
+  } catch (ParseException e) {
+    errorMessage = "':' expected after case expression";
+    errorLevel   = ERROR;
+    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = jj_input_stream.getPosition() + 1;
+    throw e;
+  }
+|
+  token = <_DEFAULT>
+  try {
+    <COLON>
+    {return null;}
+  } 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;
+  }
+}
+
+Break BreakStatement() :
+{
+  Expression expression = null;
+  final int start = SimpleCharStream.getPosition();
+}
+{
+  <BREAK> [ expression = 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;
+  }
+  {return new Break(expression, start, SimpleCharStream.getPosition());}
+}
+
+IfStatement IfStatement() :
+{
+  final int pos = jj_input_stream.getPosition();
+  Expression condition;
+  IfStatement ifStatement;
+}
+{
+  <IF> condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2)
+  {return ifStatement;}
+}
+
+
+Expression Condition(final String keyword) :
+{
+  final Expression condition;
+}
 {
   try {
     <LPAREN>
   } catch (ParseException e) {
     errorMessage = "'(' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
-    throw e;
+    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length();
+    errorEnd   = errorStart +1;
+    processParseException(e);
   }
-  Expression()
+  condition = Expression()
   try {
      <RPAREN>
+     {return condition;}
   } catch (ParseException e) {
     errorMessage = "')' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
+    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+    errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
 }
 
-void ElseIfStatement() :
-{}
+IfStatement IfStatement0(Expression condition, final int start,final int end) :
+{
+  Statement statement;
+  Statement stmt;
+  final Statement[] statementsArray;
+  ElseIf elseifStatement;
+  Else elseStatement = null;
+  ArrayList stmts;
+  final ArrayList elseIfList = new ArrayList();
+  ElseIf[] elseIfs;
+  int pos = SimpleCharStream.getPosition();
+  int endStatements;
+}
+{
+  <COLON>
+  {stmts = new ArrayList();}
+  (  statement = Statement() {stmts.add(statement);}
+   | statement = htmlBlock() {stmts.add(statement);})*
+   {endStatements = SimpleCharStream.getPosition();}
+   (elseifStatement = ElseIfStatementColon() {elseIfList.add(elseifStatement);})*
+   [elseStatement = ElseStatementColon()]
+
+  {try {
+  setMarker(fileToParse,
+            "Ugly syntax detected, you should if () {...} instead of if (): ... endif;",
+            start,
+            end,
+            INFO,
+            "Line " + token.beginLine);
+  } catch (CoreException e) {
+    PHPeclipsePlugin.log(e);
+  }}
+  try {
+    <ENDIF>
+  } 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;
+    throw e;
+  }
+  try {
+    <SEMICOLON>
+  } 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;
+    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());
+    }
+    }
+
+|
+  (stmt = Statement() | stmt = htmlBlock())
+  ( LOOKAHEAD(1) elseifStatement = ElseIfStatement() {elseIfList.add(elseifStatement);})*
+  [ LOOKAHEAD(1)
+    <ELSE>
+    try {
+      {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;
+      throw e;
+    }
+  ]
+  {
+    elseIfs = new ElseIf[elseIfList.size()];
+    elseIfList.toArray(elseIfs);
+    return new IfStatement(condition,
+                           stmt,
+                           elseIfs,
+                           elseStatement,
+                           pos,
+                           SimpleCharStream.getPosition());}
+}
+
+ElseIf ElseIfStatementColon() :
+{
+  Expression condition;
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <ELSEIF> Condition("elseif") Statement()
+  <ELSEIF> condition = Condition("elseif")
+  <COLON> (  statement = Statement() {list.add(statement);}
+           | statement = htmlBlock() {list.add(statement);})*
+  {
+  Statement[] stmtsArray = new Statement[list.size()];
+  list.toArray(stmtsArray);
+  return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());}
 }
 
-void WhileStatement() :
-{}
+Else ElseStatementColon() :
+{
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <WHILE> Condition("while") WhileStatement0()
+  <ELSE> <COLON> (  statement = Statement() {list.add(statement);}
+                  | statement = htmlBlock() {list.add(statement);})*
+  {
+  Statement[] stmtsArray = new Statement[list.size()];
+  list.toArray(stmtsArray);
+  return new Else(stmtsArray,pos,SimpleCharStream.getPosition());}
 }
 
-void WhileStatement0() :
-{}
+ElseIf ElseIfStatement() :
+{
+  Expression condition;
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <ELSEIF> condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/}
+  {
+  Statement[] stmtsArray = new Statement[list.size()];
+  list.toArray(stmtsArray);
+  return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());}
+}
+
+WhileStatement WhileStatement() :
 {
-  <COLON> (Statement())* <ENDWHILE> (<SEMICOLON> | "?>")
+  final Expression condition;
+  final Statement action;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <WHILE>
+    condition = Condition("while")
+    action    = WhileStatement0(pos,pos + 5)
+    {return new WhileStatement(condition,action,pos,SimpleCharStream.getPosition());}
+}
+
+Statement WhileStatement0(final int start, final int end) :
+{
+  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;",
+            start,
+            end,
+            INFO,
+            "Line " + token.beginLine);
+  } catch (CoreException e) {
+    PHPeclipsePlugin.log(e);
+  }}
+  try {
+    <ENDWHILE>
+  } 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;
+    throw e;
+  }
+  try {
+    <SEMICOLON>
+    {
+    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;
+    throw e;
+  }
 |
-  Statement()
+  statement = Statement()
+  {return statement;}
 }
 
-void DoStatement() :
-{}
+DoStatement DoStatement() :
 {
-  <DO> Statement() <WHILE> Condition("while") (<SEMICOLON> | "?>")
+  final Statement action;
+  final Expression condition;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <DO> action = Statement() <WHILE> condition = Condition("while")
+  try {
+    <SEMICOLON>
+    {return new DoStatement(condition,action,pos,SimpleCharStream.getPosition());}
+  } 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;
+  }
 }
 
-void ForStatement() :
-{}
+ForeachStatement ForeachStatement() :
 {
-  <FOR> <LPAREN> [ ForInit() ] <SEMICOLON> [ Expression() ] <SEMICOLON> [ ForUpdate() ] <RPAREN> Statement()
+  Statement statement;
+  Expression expression;
+  final StringBuffer buff = new StringBuffer();
+  final int pos = SimpleCharStream.getPosition();
+  ArrayVariableDeclaration variable;
 }
+{
+  <FOREACH>
+    try {
+    <LPAREN>
+  } 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;
+  }
+  try {
+    expression = Expression()
+  } 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;
+  }
+  try {
+    <AS>
+  } 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;
+  }
+  try {
+    variable = ArrayVariable()
+  } 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;
+  }
+  try {
+    <RPAREN>
+  } 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;
+  }
+  try {
+    statement = Statement()
+  } 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;
+  }
+  {return new ForeachStatement(expression,
+                               variable,
+                               statement,
+                               pos,
+                               SimpleCharStream.getPosition());}
 
-void ForInit() :
-{}
+}
+
+ForStatement ForStatement() :
+{
+final Token token;
+final int pos = SimpleCharStream.getPosition();
+Statement[] initializations = null;
+Expression condition = null;
+Statement[] increments = null;
+Statement action;
+final ArrayList list = new ArrayList();
+final int startBlock, endBlock;
+}
+{
+  token = <FOR>
+  try {
+    <LPAREN>
+  } 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;
+  }
+     [ initializations = ForInit() ] <SEMICOLON>
+     [ condition = Expression() ] <SEMICOLON>
+     [ increments = StatementExpressionList() ] <RPAREN>
+    (
+      action = Statement()
+      {return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());}
+    |
+      <COLON>
+      {startBlock = SimpleCharStream.getPosition();}
+      (action = Statement() {list.add(action);})*
+      {
+        try {
+        setMarker(fileToParse,
+                  "Ugly syntax detected, you should for () {...} instead of for (): ... endfor;",
+                  pos,
+                  pos+token.image.length(),
+                  INFO,
+                  "Line " + token.beginLine);
+        } catch (CoreException e) {
+          PHPeclipsePlugin.log(e);
+        }
+      }
+      {endBlock = SimpleCharStream.getPosition();}
+      try {
+        <ENDFOR>
+      } 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;
+      }
+      try {
+        <SEMICOLON>
+        {
+        Statement[] stmtsArray = new Statement[list.size()];
+        list.toArray(stmtsArray);
+        return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());}
+      } 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;
+      }
+    )
+}
+
+Statement[] ForInit() :
+{
+  Statement[] statements;
+}
 {
   LOOKAHEAD(LocalVariableDeclaration())
-  LocalVariableDeclaration()
+  statements = LocalVariableDeclaration()
+  {return statements;}
 |
-  StatementExpressionList()
+  statements = StatementExpressionList()
+  {return statements;}
 }
 
-void StatementExpressionList() :
-{}
+Statement[] StatementExpressionList() :
 {
-  StatementExpression() ( <COMMA> StatementExpression() )*
+  final ArrayList list = new ArrayList();
+  Statement expr;
 }
-
-void ForUpdate() :
-{}
 {
-  StatementExpressionList()
+  expr = StatementExpression()   {list.add(expr);}
+  (<COMMA> StatementExpression() {list.add(expr);})*
+  {
+  Statement[] stmtsArray = new Statement[list.size()];
+  list.toArray(stmtsArray);
+  return stmtsArray;}
 }
 
-void BreakStatement() :
-{}
+Continue ContinueStatement() :
 {
-  <BREAK> [ <IDENTIFIER> ] <SEMICOLON>
+  Expression expr = null;
+  final int pos = SimpleCharStream.getPosition();
 }
-
-void ContinueStatement() :
-{}
 {
-  <CONTINUE> [ <IDENTIFIER> ] <SEMICOLON>
+  <CONTINUE> [ expr = Expression() ]
+  try {
+    <SEMICOLON>
+    {return new Continue(expr,pos,SimpleCharStream.getPosition());}
+  } 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;
+  }
 }
 
-void ReturnStatement() :
-{}
+ReturnStatement ReturnStatement() :
+{
+  Expression expr = null;
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <RETURN> [ Expression() ] <SEMICOLON>
+  <RETURN> [ expr = Expression() ]
+  try {
+    <SEMICOLON>
+    {return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());}
+  } 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;
+  }
 }
\ No newline at end of file