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 35b3173..44e28d2 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -30,14 +30,16 @@ import org.eclipse.jface.preference.IPreferenceStore;
 
 import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.ArrayList;
 import java.io.StringReader;
 import java.io.*;
 import java.text.MessageFormat;
 
 import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpdt.internal.compiler.parser.*;
 import net.sourceforge.phpdt.internal.compiler.ast.*;
+import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
+import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
 
 /**
  * A new php parser.
@@ -52,13 +54,13 @@ public final class PHPParser extends PHPParserSuperclass {
   private static IFile fileToParse;
 
   /** The current segment. */
-  private static PHPSegmentWithChildren currentSegment;
+  private static OutlineableWithChildren currentSegment;
 
   private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$
   private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
   static PHPOutlineInfo outlineInfo;
 
-  private static PHPFunctionDeclaration currentFunction;
+  public static MethodDeclaration currentFunction;
   private static boolean assigning;
 
   /** The error level of the current ParseException. */
@@ -68,13 +70,19 @@ public final class PHPParser extends PHPParserSuperclass {
 
   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[] astStack;
+  private static AstNode[] nodes;
   /** The cursor in expression stack. */
-	private static int expressionPtr;
+  private static int nodePtr;
 
   public final void setFileToParse(final IFile fileToParse) {
     this.fileToParse = fileToParse;
@@ -88,6 +96,32 @@ public final class PHPParser extends PHPParserSuperclass {
     this.fileToParse = fileToParse;
   }
 
+  /**
+   * Reinitialize the parser.
+   */
+  private static final void init() {
+    nodes = new AstNode[AstStackIncrement];
+    nodePtr = -1;
+    htmlStart = 0;
+  }
+
+  /**
+   * Add an php node on the stack.
+   * @param node the node that will be added to the stack
+   */
+  private static final void pushOnAstNodes(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;
+    }
+  }
+
   public static final void phpParserTester(final String strEval) throws CoreException, ParseException {
     PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
     final StringReader stream = new StringReader(strEval);
@@ -95,7 +129,7 @@ public final class PHPParser extends PHPParserSuperclass {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(new StringReader(strEval));
-    astStack = new AstNode[AstStackIncrement];
+    init();
     phpTest();
   }
 
@@ -106,7 +140,7 @@ public final class PHPParser extends PHPParserSuperclass {
         jj_input_stream = new SimpleCharStream(stream, 1, 1);
       }
       ReInit(stream);
-      astStack = new AstNode[AstStackIncrement];
+      init();
       phpFile();
     } catch (FileNotFoundException e) {
       e.printStackTrace();  //To change body of catch statement use Options | File Templates.
@@ -119,21 +153,22 @@ public final class PHPParser extends PHPParserSuperclass {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(stream);
-    astStack = new AstNode[AstStackIncrement];
+    init();
     phpFile();
   }
 
   public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
+    currentSegment = new PHPDocument(parent);
     outlineInfo = new PHPOutlineInfo(parent);
-    currentSegment = outlineInfo.getDeclarations();
     final StringReader stream = new StringReader(s);
     if (jj_input_stream == null) {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(stream);
-    astStack = new AstNode[AstStackIncrement];
+    init();
     try {
       parse();
+      //PHPeclipsePlugin.log(1,phpDocument.toString());
     } catch (ParseException e) {
       processParseException(e);
     }
@@ -256,7 +291,7 @@ public final class PHPParser extends PHPParserSuperclass {
       jj_input_stream = new SimpleCharStream(stream, 1, 1);
     }
     ReInit(stream);
-    astStack = new AstNode[AstStackIncrement];
+    init();
     try {
       parse();
     } catch (ParseException e) {
@@ -286,6 +321,18 @@ public final class PHPParser extends PHPParserSuperclass {
     }
   }
 
+  /**
+   * Put a new html block in the stack.
+   */
+  public static final void createNewHTMLCode() {
+    final int currentPosition = SimpleCharStream.getPosition();
+    if (currentPosition == htmlStart) {
+      return;
+    }
+    final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition).toCharArray();
+    pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
+  }
+
   private static final void parse() throws ParseException {
 	  phpFile();
   }
@@ -295,14 +342,14 @@ PARSER_END(PHPParser)
 
 <DEFAULT> TOKEN :
 {
-  <PHPSTARTSHORT : "<?">   : PHPPARSING
-| <PHPSTARTLONG : "<?php"> : PHPPARSING
-| <PHPECHOSTART : "<?=">   : PHPPARSING
+  <PHPSTARTSHORT : "<?">    {PHPParser.createNewHTMLCode();} : PHPPARSING
+| <PHPSTARTLONG  : "<?php"> {PHPParser.createNewHTMLCode();} : PHPPARSING
+| <PHPECHOSTART  : "<?=">   {PHPParser.createNewHTMLCode();} : PHPPARSING
 }
 
 <PHPPARSING> TOKEN :
 {
-  <PHPEND :"?>"> : DEFAULT
+  <PHPEND :"?>"> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT
 }
 
 /* Skip any character if we are not in php mode */
@@ -435,10 +482,37 @@ MORE :
 | <INTEGER : "integer">
 }
 
+//Misc token
+<PHPPARSING> TOKEN :
+{
+  <AT                 : "@">
+| <DOLLAR             : "$">
+| <BANG               : "!">
+| <TILDE              : "~">
+| <HOOK               : "?">
+| <COLON              : ":">
+}
+
+/* OPERATORS */
 <PHPPARSING> TOKEN :
 {
-  <_ORL  : "OR">
-| <_ANDL : "AND">
+  <OR_OR              : "||">
+| <AND_AND            : "&&">
+| <INCR               : "++">
+| <DECR               : "--">
+| <PLUS               : "+">
+| <MINUS              : "-">
+| <STAR               : "*">
+| <SLASH              : "/">
+| <BIT_AND            : "&">
+| <BIT_OR             : "|">
+| <XOR                : "^">
+| <REMAINDER          : "%">
+| <LSHIFT             : "<<">
+| <RSIGNEDSHIFT       : ">>">
+| <RUNSIGNEDSHIFT     : ">>>">
+| <_ORL               : "OR">
+| <_ANDL              : "AND">
 }
 
 /* LITERALS */
@@ -535,10 +609,10 @@ MORE :
 {
   <GT                 : ">">
 | <LT                 : "<">
-| <EQ                 : "==">
+| <EQUAL_EQUAL        : "==">
 | <LE                 : "<=">
 | <GE                 : ">=">
-| <NE                 : "!=">
+| <NOT_EQUAL          : "!=">
 | <DIF                : "<>">
 | <BANGDOUBLEEQUAL    : "!==">
 | <TRIPLEEQUAL        : "===">
@@ -558,32 +632,6 @@ MORE :
 | <DOTASSIGN          : ".=">
 | <REMASSIGN          : "%=">
 | <TILDEEQUAL         : "~=">
-}
-
-/* OPERATORS */
-<PHPPARSING> TOKEN :
-{
-  <AT                 : "@">
-| <DOLLAR             : "$">
-| <BANG               : "!">
-| <TILDE              : "~">
-| <HOOK               : "?">
-| <COLON              : ":">
-| <SC_OR              : "||">
-| <SC_AND             : "&&">
-| <INCR               : "++">
-| <DECR               : "--">
-| <PLUS               : "+">
-| <MINUS              : "-">
-| <STAR               : "*">
-| <SLASH              : "/">
-| <BIT_AND            : "&">
-| <BIT_OR             : "|">
-| <XOR                : "^">
-| <REM                : "%">
-| <LSHIFT             : "<<">
-| <RSIGNEDSHIFT       : ">>">
-| <RUNSIGNEDSHIFT     : ">>>">
 | <LSHIFTASSIGN       : "<<=">
 | <RSIGNEDSHIFTASSIGN : ">>=">
 }
@@ -598,6 +646,7 @@ void phpTest() :
 {
   Php()
   <EOF>
+  {PHPParser.createNewHTMLCode();}
 }
 
 void phpFile() :
@@ -653,10 +702,18 @@ void PhpBlock() :
   }
 }
 
-void phpEchoBlock() :
-{}
+PHPEchoBlock phpEchoBlock() :
 {
-  <PHPECHOSTART> Expression() [ <SEMICOLON> ] <PHPEND>
+  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() :
@@ -665,10 +722,11 @@ void Php() :
   (BlockStatement())*
 }
 
-void ClassDeclaration() :
+ClassDeclaration ClassDeclaration() :
 {
-  final PHPClassDeclaration classDeclaration;
+  final ClassDeclaration classDeclaration;
   final Token className;
+  Token superclassName = null;
   final int pos;
 }
 {
@@ -686,7 +744,7 @@ void ClassDeclaration() :
   [
     <EXTENDS>
     try {
-      <IDENTIFIER>
+      superclassName = <IDENTIFIER>
     } catch (ParseException e) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
       errorLevel   = ERROR;
@@ -696,21 +754,29 @@ void ClassDeclaration() :
     }
   ]
   {
-    if (currentSegment != null) {
-      classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos);
+    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()
-  {
-    if (currentSegment != null) {
-      currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
-    }
   }
+  ClassBody(classDeclaration)
+  {currentSegment = (OutlineableWithChildren) currentSegment.getParent();
+   classDeclaration.sourceEnd = SimpleCharStream.getPosition();
+   pushOnAstNodes(classDeclaration);
+   return classDeclaration;}
 }
 
-void ClassBody() :
+void ClassBody(ClassDeclaration classDeclaration) :
 {}
 {
   try {
@@ -722,7 +788,7 @@ void ClassBody() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  ( ClassBodyDeclaration() )*
+  ( ClassBodyDeclaration(classDeclaration) )*
   try {
     <RBRACE>
   } catch (ParseException e) {
@@ -737,35 +803,37 @@ void ClassBody() :
 /**
  * A class can contain only methods and fields.
  */
-void ClassBodyDeclaration() :
-{}
+void ClassBodyDeclaration(ClassDeclaration classDeclaration) :
+{
+  MethodDeclaration method;
+  FieldDeclaration field;
+}
 {
-  MethodDeclaration()
-| FieldDeclaration()
+  method = MethodDeclaration() {classDeclaration.addMethod(method);}
+| field = FieldDeclaration()   {classDeclaration.addVariable(field);}
 }
 
 /**
  * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
  */
-void FieldDeclaration() :
+FieldDeclaration FieldDeclaration() :
 {
-  PHPVarDeclaration variableDeclaration;
+  VariableDeclaration variableDeclaration;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
 }
 {
   <VAR> variableDeclaration = VariableDeclarator()
   {
-    outlineInfo.addVariable(variableDeclaration.getVariable().getName());
-    if (currentSegment != null) {
-      currentSegment.add(variableDeclaration);
-    }
+    list.add(variableDeclaration);
+    outlineInfo.addVariable(new String(variableDeclaration.name));
+    currentSegment.add(variableDeclaration);
   }
   ( <COMMA>
       variableDeclaration = VariableDeclarator()
-      {
-      if (currentSegment != null) {
-        currentSegment.add(variableDeclaration);
-      }
-      }
+      {list.add(variableDeclaration);
+       outlineInfo.addVariable(new String(variableDeclaration.name));
+       currentSegment.add(variableDeclaration);}
   )*
   try {
     <SEMICOLON>
@@ -776,11 +844,15 @@ void FieldDeclaration() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
+  {return new FieldDeclaration((VariableDeclaration[]) list.toArray(),
+                               pos,
+                               SimpleCharStream.getPosition());}
 }
 
-PHPVarDeclaration VariableDeclarator() :
+VariableDeclaration VariableDeclarator() :
 {
   final String varName, varValue;
+  Expression initializer = null;
   final int pos = jj_input_stream.getPosition();
 }
 {
@@ -788,8 +860,7 @@ PHPVarDeclaration VariableDeclarator() :
   [
     <ASSIGN>
     try {
-      varValue = VariableInitializer()
-      {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);}
+      initializer = VariableInitializer()
     } catch (ParseException e) {
       errorMessage = "Literal expression expected in variable initializer";
       errorLevel   = ERROR;
@@ -798,19 +869,41 @@ PHPVarDeclaration VariableDeclarator() :
       throw e;
     }
   ]
-  {return new PHPVarDeclaration(currentSegment,varName,pos);}
+  {
+  if (initializer == null) {
+    return new VariableDeclaration(currentSegment,
+                                  varName.toCharArray(),
+                                  pos,
+                                  jj_input_stream.getPosition());
+  }
+    return new VariableDeclaration(currentSegment,
+                                    varName.toCharArray(),
+                                    initializer,
+                                    pos);
+  }
 }
 
+/**
+ * A Variable name.
+ * @return the variable name (with suffix)
+ */
 String VariableDeclaratorId() :
 {
   String expr;
+  Expression expression;
   final StringBuffer buff = new StringBuffer();
+  final int pos = SimpleCharStream.getPosition();
+  ConstantIdentifier ex;
 }
 {
   try {
     expr = Variable()   {buff.append(expr);}
     ( LOOKAHEAD(2)
-      expr = VariableSuffix() {buff.append(expr);}
+      {ex = new ConstantIdentifier(expr.toCharArray(),
+                                   pos,
+                                   SimpleCharStream.getPosition());}
+      expression = VariableSuffix(ex)
+      {buff.append(expression.toStringExpression());}
     )*
     {return buff.toString();}
   } catch (ParseException e) {
@@ -824,22 +917,22 @@ String VariableDeclaratorId() :
 
 String Variable():
 {
-  String expr = null;
+  final StringBuffer buff;
+  Expression expression = null;
   final Token token;
+  final String expr;
 }
 {
-  token = <DOLLAR_ID> [<LBRACE> expr = Expression() <RBRACE>]
+  token = <DOLLAR_ID> [<LBRACE> expression = Expression() <RBRACE>]
   {
-    if (expr == null && !assigning) {
-      if (currentFunction != null) {
-        PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1));
-        if (var != null) {
-          var.getVariable().setUsed(true);
-        }
-      }
+    if (expression == null && !assigning) {
       return token.image.substring(1);
     }
-    return token + "{" + expr + "}";
+    buff = new StringBuffer(token.image);
+    buff.append('{');
+    buff.append(expression.toStringExpression());
+    buff.append('}');
+    return buff.toString();
   }
 |
   <DOLLAR> expr = VariableName()
@@ -848,127 +941,113 @@ String Variable():
 
 String VariableName():
 {
-String expr = null;
-final Token token;
+  final StringBuffer buff;
+  String expr = null;
+  Expression expression = null;
+  final Token token;
 }
 {
-  <LBRACE> expr = Expression() <RBRACE>
-  {return "{"+expr+"}";}
+  <LBRACE> expression = Expression() <RBRACE>
+  {buff = new StringBuffer('{');
+   buff.append(expression.toStringExpression());
+   buff.append('}');
+   return buff.toString();}
 |
-  token = <IDENTIFIER> [<LBRACE> expr = Expression() <RBRACE>]
+  token = <IDENTIFIER> [<LBRACE> expression = Expression() <RBRACE>]
   {
-    if (expr == null) {
-      if (currentFunction != null) {
-        PHPVarDeclaration var = currentFunction.getParameter(token.image);
-        if (var != null) {
-          var.getVariable().setUsed(true);
-        }
-      }
+    if (expression == null) {
       return token.image;
     }
-    return token + "{" + expr + "}";
+    buff = new StringBuffer(token.image);
+    buff.append('{');
+    buff.append(expression.toStringExpression());
+    buff.append('}');
+    return buff.toString();
   }
 |
   <DOLLAR> expr = VariableName()
   {
-    if (currentFunction != null) {
-      PHPVarDeclaration var = currentFunction.getParameter(expr);
-      if (var != null) {
-        var.getVariable().setUsed(true);
-      }
-    }
-    return "$" + expr;
+    buff = new StringBuffer('$');
+    buff.append(expr);
+    return buff.toString();
   }
 |
-  token = <DOLLAR_ID>
-  {
-    if (currentFunction != null) {
-      PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1));
-      if (var != null) {
-        var.getVariable().setUsed(true);
-      }
-    }
-    return token.image + expr;
-  }
-/*|      pas besoin ?
-  token = <DOLLAR_ID> [expr = VariableName()]
-  {
-  if (expr == null) {
-    return token.image;
-  }
-  return token.image + expr;
-  }*/
+  token = <DOLLAR_ID> {return token.image;}
 }
 
-String VariableInitializer() :
+Expression VariableInitializer() :
 {
-  final String expr;
+  final Expression expr;
   final Token token;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
   expr = Literal()
   {return expr;}
 |
   <MINUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
-  {return "-" + token.image;}
+  {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
+                                                        pos,
+                                                        SimpleCharStream.getPosition()),
+                                      OperatorIds.MINUS,
+                                      pos);}
 |
   <PLUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
-  {return "+" + token.image;}
+  {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
+                                                        pos,
+                                                        SimpleCharStream.getPosition()),
+                                      OperatorIds.PLUS,
+                                      pos);}
 |
   expr = ArrayDeclarator()
   {return expr;}
 |
   token = <IDENTIFIER>
-  {return token.image;}
+  {return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
 }
 
-String ArrayVariable() :
+ArrayVariableDeclaration ArrayVariable() :
 {
-String expr;
-final StringBuffer buff = new StringBuffer();
+Expression expr;
+Expression expr2 = null;
 }
 {
-  expr = Expression()
-  {buff.append(expr);}
-   [<ARRAYASSIGN> expr = Expression()
-   {buff.append("=>").append(expr);}]
-  {return buff.toString();}
+  expr = Expression() [<ARRAYASSIGN> expr2 = Expression()]
+  {return new ArrayVariableDeclaration(expr,expr2);}
 }
 
-String ArrayInitializer() :
+ArrayVariableDeclaration[] ArrayInitializer() :
 {
-String expr;
-final StringBuffer buff = new StringBuffer("(");
+  ArrayVariableDeclaration expr;
+  final ArrayList list = new ArrayList();
 }
 {
   <LPAREN> [ expr = ArrayVariable()
-            {buff.append(expr);}
+            {list.add(expr);}
             ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
-            {buff.append(",").append(expr);}
+            {list.add(expr);}
             )*
            ]
-           [<COMMA> {buff.append(",");}]
+           [<COMMA> {list.add(null);}]
   <RPAREN>
-  {
-    buff.append(")");
-    return buff.toString();
-  }
+  {return (ArrayVariableDeclaration[]) list.toArray();}
 }
 
 /**
  * A Method Declaration.
  * <b>function</b> MetodDeclarator() Block()
  */
-void MethodDeclaration() :
+MethodDeclaration MethodDeclaration() :
 {
-  final PHPFunctionDeclaration functionDeclaration;
+  final MethodDeclaration functionDeclaration;
   Token functionToken;
+  final Block block;
 }
 {
   functionToken = <FUNCTION>
   try {
     functionDeclaration = MethodDeclarator()
-    {outlineInfo.addVariable(functionDeclaration.getName());}
+    {outlineInfo.addVariable(new String(functionDeclaration.name));}
   } catch (ParseException e) {
     if (errorMessage != null) {
       throw e;
@@ -986,28 +1065,14 @@ void MethodDeclaration() :
     }
     currentFunction = functionDeclaration;
   }
-  Block()
+  block = Block()
   {
-    Hashtable parameters = currentFunction.getParameters();
-    Enumeration vars = parameters.elements();
-    while (vars.hasMoreElements()) {
-      PHPVarDeclaration o = (PHPVarDeclaration) vars.nextElement();
-      if (!o.getVariable().isUsed()) {
-        try {
-          setMarker(fileToParse,
-                    "Parameter "+o.getVariable().getName()+" is never used in function",
-                    functionToken.beginLine,
-                    WARNING,
-                    "Line " + token.beginLine);
-        } catch (CoreException e) {
-          PHPeclipsePlugin.log(e);
-        }
-      }
-    }
+    functionDeclaration.statements = block.statements;
     currentFunction = null;
     if (currentSegment != null) {
-      currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
+      currentSegment = (OutlineableWithChildren) currentSegment.getParent();
     }
+    return functionDeclaration;
   }
 }
 
@@ -1016,21 +1081,23 @@ void MethodDeclaration() :
  * [&] IDENTIFIER(parameters ...).
  * @return a function description for the outline
  */
-PHPFunctionDeclaration MethodDeclarator() :
+MethodDeclaration MethodDeclarator() :
 {
   final Token identifier;
-  final StringBuffer methodDeclaration = new StringBuffer();
+  Token reference = null;
   final Hashtable formalParameters;
-  final int pos = jj_input_stream.getPosition();
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  [ <BIT_AND> {methodDeclaration.append("&");} ]
+  [ reference = <BIT_AND> ]
   identifier = <IDENTIFIER>
   formalParameters = FormalParameters()
-  {
-    methodDeclaration.append(identifier);
-    return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters);
-  }
+  {return new MethodDeclaration(currentSegment,
+                                 identifier.image.toCharArray(),
+                                 formalParameters,
+                                 reference != null,
+                                 pos,
+                                 SimpleCharStream.getPosition());}
 }
 
 /**
@@ -1041,7 +1108,7 @@ Hashtable FormalParameters() :
 {
   String expr;
   final StringBuffer buff = new StringBuffer("(");
-  PHPVarDeclaration var;
+  VariableDeclaration var;
   final Hashtable parameters = new Hashtable();
 }
 {
@@ -1055,10 +1122,10 @@ Hashtable FormalParameters() :
     throw e;
   }
             [ var = FormalParameter()
-              {parameters.put(var.getVariable().getName(),var);}
+              {parameters.put(new String(var.name),var);}
               (
                 <COMMA> var = FormalParameter()
-                {parameters.put(var.getVariable().getName(),var);}
+                {parameters.put(new String(var.name),var);}
               )*
             ]
   try {
@@ -1077,40 +1144,55 @@ Hashtable FormalParameters() :
  * A formal parameter.
  * $varname[=value] (,$varname[=value])
  */
-PHPVarDeclaration FormalParameter() :
+VariableDeclaration FormalParameter() :
 {
-  final PHPVarDeclaration variableDeclaration;
+  final VariableDeclaration variableDeclaration;
   Token token = null;
 }
 {
   [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
   {
     if (token != null) {
-      variableDeclaration.getVariable().setReference(true);
+      variableDeclaration.setReference(true);
     }
-    return variableDeclaration;
-  }
-}
-
-String Type() :
-{}
-{
-  <STRING>  {return "string";}
-| <BOOL>    {return "bool";}
-| <BOOLEAN> {return "boolean";}
-| <REAL>    {return "real";}
-| <DOUBLE>  {return "double";}
-| <FLOAT>   {return "float";}
-| <INT>     {return "int";}
-| <INTEGER> {return "integer";}
-| <OBJECT>  {return "object";}
-}
-
-String Expression() :
-{
-  final String expr;
-  final String assignOperator;
-  final String expr2;
+    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;}
@@ -1124,17 +1206,18 @@ String Expression() :
  * A Variable assignation.
  * varName (an assign operator) any expression
  */
-String varAssignation() :
+VarAssignation varAssignation() :
 {
-  String varName,assignOperator,expr2;
-  PHPVarDeclaration variable;
+  String varName;
+  final Expression expression;
+  final int assignOperator;
   final int pos = SimpleCharStream.getPosition();
 }
 {
   varName = VariableDeclaratorId()
   assignOperator = AssignmentOperator()
     try {
-      expr2 = Expression()
+      expression = Expression()
     } catch (ParseException e) {
       if (errorMessage != null) {
         throw e;
@@ -1145,300 +1228,286 @@ String varAssignation() :
       errorEnd   = jj_input_stream.getPosition() + 1;
       throw e;
     }
-    {return varName + assignOperator + expr2;}
+    {return new VarAssignation(varName.toCharArray(),
+                               expression,
+                               assignOperator,
+                               pos,
+                               SimpleCharStream.getPosition());}
 }
 
-String AssignmentOperator() :
+int AssignmentOperator() :
 {}
 {
-  <ASSIGN>             {return "=";}
-| <STARASSIGN>         {return "*=";}
-| <SLASHASSIGN>        {return "/=";}
-| <REMASSIGN>          {return "%=";}
-| <PLUSASSIGN>         {return "+=";}
-| <MINUSASSIGN>        {return "-=";}
-| <LSHIFTASSIGN>       {return "<<=";}
-| <RSIGNEDSHIFTASSIGN> {return ">>=";}
-| <ANDASSIGN>          {return "&=";}
-| <XORASSIGN>          {return "|=";}
-| <ORASSIGN>           {return "|=";}
-| <DOTASSIGN>          {return ".=";}
-| <TILDEEQUAL>         {return "~=";}
+  <ASSIGN>             {return 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;}
 }
 
-String ConditionalExpression() :
+Expression ConditionalExpression() :
 {
-  final String expr;
-  String expr2 = null;
-  String expr3 = null;
+  final Expression expr;
+  Expression expr2 = null;
+  Expression expr3 = null;
 }
 {
   expr = ConditionalOrExpression() [ <HOOK> expr2 = Expression() <COLON> expr3 = ConditionalExpression() ]
 {
   if (expr3 == null) {
     return expr;
-  } else {
-    return expr + "?" + expr2 + ":" + expr3;
   }
+  return new ConditionalExpression(expr,expr2,expr3);
 }
 }
 
-String ConditionalOrExpression() :
+Expression ConditionalOrExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = ConditionalAndExpression()
-  {buff.append(expr);}
   (
-    (operator = <SC_OR> | operator = <_ORL>) expr = ConditionalAndExpression()
+    (
+        <OR_OR> {operator = OperatorIds.OR_OR;}
+      | <_ORL>  {operator = OperatorIds.ORL;}
+    ) expr2 = ConditionalAndExpression()
     {
-      buff.append(operator.image);
-      buff.append(expr);
+      expr = new BinaryExpression(expr,expr2,operator);
     }
   )*
-  {
-    return buff.toString();
-  }
+  {return expr;}
 }
 
-String ConditionalAndExpression() :
+Expression ConditionalAndExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = ConcatExpression()
-  {buff.append(expr);}
   (
-  (operator = <SC_AND> | operator = <_ANDL>) expr = ConcatExpression()
-    {
-      buff.append(operator.image);
-      buff.append(expr);
-    }
+  (  <AND_AND> {operator = OperatorIds.AND_AND;}
+   | <_ANDL>   {operator = OperatorIds.ANDL;})
+   expr2 = ConcatExpression() {expr = new BinaryExpression(expr,expr2,operator);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String ConcatExpression() :
+Expression ConcatExpression() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
 }
 {
   expr = InclusiveOrExpression()
-  {buff.append(expr);}
   (
-  <DOT> expr = InclusiveOrExpression()
-  {buff.append(".").append(expr);}
+    <DOT> expr2 = InclusiveOrExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.DOT);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String InclusiveOrExpression() :
+Expression InclusiveOrExpression() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
 }
 {
   expr = ExclusiveOrExpression()
-  {buff.append(expr);}
-  (
-  <BIT_OR> expr = ExclusiveOrExpression()
-  {buff.append("|").append(expr);}
+  (<BIT_OR> expr2 = ExclusiveOrExpression()
+   {expr = new BinaryExpression(expr,expr2,OperatorIds.OR);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String ExclusiveOrExpression() :
+Expression ExclusiveOrExpression() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
 }
 {
   expr = AndExpression()
-  {
-    buff.append(expr);
-  }
   (
-    <XOR> expr = AndExpression()
-  {
-    buff.append("^");
-    buff.append(expr);
-  }
+    <XOR> expr2 = AndExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.XOR);}
   )*
-  {
-    return buff.toString();
-  }
+  {return expr;}
 }
 
-String AndExpression() :
+Expression AndExpression() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
 }
 {
   expr = EqualityExpression()
-  {
-    buff.append(expr);
-  }
   (
-    <BIT_AND> expr = EqualityExpression()
-  {
-    buff.append("&").append(expr);
-  }
+    <BIT_AND> expr2 = EqualityExpression()
+    {expr = new BinaryExpression(expr,expr2,OperatorIds.AND);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String EqualityExpression() :
+Expression EqualityExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = RelationalExpression()
-  {buff.append(expr);}
   (
-  (   operator = <EQ>
-    | operator = <DIF>
-    | operator = <NE>
-    | operator = <BANGDOUBLEEQUAL>
-    | operator = <TRIPLEEQUAL>
+  (   <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 {
-    expr = RelationalExpression()
+    expr2 = RelationalExpression()
   } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'";
+    if (errorMessage != null) {
+      throw e;
+    }
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
   {
-    buff.append(operator.image);
-    buff.append(expr);
+    expr = new BinaryExpression(expr,expr2,operator);
   }
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String RelationalExpression() :
+Expression RelationalExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = ShiftExpression()
-  {buff.append(expr);}
   (
-  ( operator = <LT> | operator = <GT> | operator = <LE> | operator = <GE> ) expr = ShiftExpression()
-  {buff.append(operator.image).append(expr);}
+  ( <LT> {operator = OperatorIds.LESS;}
+  | <GT> {operator = OperatorIds.GREATER;}
+  | <LE> {operator = OperatorIds.LESS_EQUAL;}
+  | <GE> {operator = OperatorIds.GREATER_EQUAL;})
+   expr2 = ShiftExpression()
+  {expr = new BinaryExpression(expr,expr2,operator);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String ShiftExpression() :
+Expression ShiftExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = AdditiveExpression()
-  {buff.append(expr);}
   (
-  (operator = <LSHIFT> | operator = <RSIGNEDSHIFT> | operator = <RUNSIGNEDSHIFT> ) expr = AdditiveExpression()
-  {
-    buff.append(operator.image);
-    buff.append(expr);
-  }
+  ( <LSHIFT>         {operator = OperatorIds.LEFT_SHIFT;}
+  | <RSIGNEDSHIFT>   {operator = OperatorIds.RIGHT_SHIFT;}
+  | <RUNSIGNEDSHIFT> {operator = OperatorIds.UNSIGNED_RIGHT_SHIFT;})
+  expr2 = AdditiveExpression()
+  {expr = new BinaryExpression(expr,expr2,operator);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String AdditiveExpression() :
+Expression AdditiveExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr,expr2;
+  int operator;
 }
 {
   expr = MultiplicativeExpression()
-  {buff.append(expr);}
   (
-   ( operator = <PLUS> | operator = <MINUS> ) expr = MultiplicativeExpression()
-  {
-    buff.append(operator.image);
-    buff.append(expr);
-  }
+   ( <PLUS>  {operator = OperatorIds.PLUS;}
+   | <MINUS> {operator = OperatorIds.MINUS;} )
+   expr2 = MultiplicativeExpression()
+  {expr = new BinaryExpression(expr,expr2,operator);}
    )*
-  {return buff.toString();}
+  {return expr;}
 }
 
-String MultiplicativeExpression() :
+Expression MultiplicativeExpression() :
 {
-  String expr;
-  Token operator;
-  final StringBuffer buff = new StringBuffer();}
+  Expression expr,expr2;
+  int operator;
+}
 {
   try {
     expr = UnaryExpression()
   } catch (ParseException e) {
+    if (errorMessage != null) {
+      throw e;
+    }
     errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
     errorLevel   = ERROR;
     errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  {buff.append(expr);}
   (
-    ( operator = <STAR> | operator = <SLASH> | operator = <REM> ) expr = UnaryExpression()
-    {
-      buff.append(operator.image);
-      buff.append(expr);
-    }
+   (  <STAR>      {operator = OperatorIds.MULTIPLY;}
+    | <SLASH>     {operator = OperatorIds.DIVIDE;}
+    | <REMAINDER> {operator = OperatorIds.REMAINDER;})
+    expr2 = UnaryExpression()
+    {expr = new BinaryExpression(expr,expr2,operator);}
   )*
-  {return buff.toString();}
+  {return expr;}
 }
 
 /**
  * An unary expression starting with @, & or nothing
  */
-String UnaryExpression() :
+Expression UnaryExpression() :
 {
-  final String expr;
-  final Token token;
-  final StringBuffer buff = new StringBuffer();
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  token = <BIT_AND> expr = UnaryExpressionNoPrefix()
-  {
-    if (token == null) {
-      return expr;
-    }
-    return token.image + expr;
-  }
-| (<AT> {buff.append("@");})*
+  <BIT_AND> expr = UnaryExpressionNoPrefix()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
+|
+  expr = AtUnaryExpression()
+  {return expr;}
+}
+
+Expression AtUnaryExpression() :
+{
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <AT>
+  expr = AtUnaryExpression()
+  {return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
+|
   expr = UnaryExpressionNoPrefix()
-  {return buff.append(expr).toString();}
+  {return expr;}
 }
 
-String UnaryExpressionNoPrefix() :
+
+Expression UnaryExpressionNoPrefix() :
 {
-  final String expr;
-  final Token token;
+  Expression expr;
+  int operator;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  ( token = <PLUS> | token = <MINUS> ) expr = UnaryExpression()
-  {
-    return token.image + expr;
-  }
+  (  <PLUS>  {operator = OperatorIds.PLUS;}
+   | <MINUS> {operator = OperatorIds.MINUS;})
+   expr = UnaryExpression()
+  {return new PrefixedUnaryExpression(expr,operator,pos);}
 |
   expr = PreIncDecExpression()
   {return expr;}
@@ -1448,22 +1517,26 @@ String UnaryExpressionNoPrefix() :
 }
 
 
-String PreIncDecExpression() :
+Expression PreIncDecExpression() :
 {
-final String expr;
-final Token token;
+final Expression expr;
+final int operator;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  (token = <INCR> | token = <DECR>) expr = PrimaryExpression()
-  {return token.image + expr;}
+  (  <INCR> {operator = OperatorIds.PLUS_PLUS;}
+   | <DECR> {operator = OperatorIds.MINUS_MINUS;})
+   expr = PrimaryExpression()
+  {return new PrefixedUnaryExpression(expr,operator,pos);}
 }
 
-String UnaryExpressionNotPlusMinus() :
+Expression UnaryExpressionNotPlusMinus() :
 {
-  final String expr;
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  <BANG> expr = UnaryExpression() {return "!" + expr;}
+  <BANG> expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
 | LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
   expr = CastExpression()         {return expr;}
 | expr = PostfixExpression()      {return expr;}
@@ -1478,114 +1551,146 @@ String UnaryExpressionNotPlusMinus() :
     errorEnd     = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  {return "("+expr+")";}
+  {return expr;}
 }
 
-String CastExpression() :
+CastExpression CastExpression() :
 {
-final String type, expr;
+final ConstantIdentifier type;
+final Expression expr;
+final int pos = SimpleCharStream.getPosition();
 }
 {
-  <LPAREN> (type = Type() | <ARRAY> {type = "array";}) <RPAREN> expr = UnaryExpression()
-  {return "(" + type + ")" + expr;}
+  <LPAREN>
+  (type = Type()
+  | <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());})
+  <RPAREN> expr = UnaryExpression()
+  {return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
 }
 
-String PostfixExpression() :
+Expression PostfixExpression() :
 {
-  final String expr;
-  Token operator = null;
+  Expression expr;
+  int operator = -1;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  expr = PrimaryExpression() [ operator = <INCR> | operator = <DECR> ]
+  expr = PrimaryExpression()
+  [ <INCR> {operator = OperatorIds.PLUS_PLUS;}
+  | <DECR> {operator = OperatorIds.MINUS_MINUS;}]
   {
-    if (operator == null) {
+    if (operator == -1) {
       return expr;
     }
-    return expr + operator.image;
+    return new PostfixedUnaryExpression(expr,operator,pos);
   }
 }
 
-String PrimaryExpression() :
+Expression PrimaryExpression() :
 {
   final Token identifier;
-  String expr;
+  Expression expr;
   final StringBuffer buff = new StringBuffer();
+  final int pos = SimpleCharStream.getPosition();
 }
 {
   LOOKAHEAD(2)
   identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
-  {buff.append(identifier.image).append("::").append(expr);}
-  (
-  expr = PrimarySuffix()
-  {buff.append(expr);}
-  )*
-  {return buff.toString();}
+  {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
+                                                 pos,
+                                                 SimpleCharStream.getPosition()),
+                          expr,
+                          ClassAccess.STATIC);}
+  (expr = PrimarySuffix(expr))*
+  {return expr;}
 |
-  expr = PrimaryPrefix()  {buff.append(expr);}
-  ( expr = PrimarySuffix()  {buff.append(expr);} )*
-  {return buff.toString();}
+  expr = PrimaryPrefix()
+  (expr = PrimarySuffix(expr))*
+  {return expr;}
 |
   expr = ArrayDeclarator()
-  {return "array" + expr;}
+  {return expr;}
 }
 
-String ArrayDeclarator() :
+ArrayInitializer ArrayDeclarator() :
 {
-  final String expr;
+  final ArrayVariableDeclaration[] vars;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  <ARRAY> expr = ArrayInitializer()
-  {return "array" + expr;}
+  <ARRAY> vars = ArrayInitializer()
+  {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
 }
 
-String PrimaryPrefix() :
+Expression PrimaryPrefix() :
 {
-  final String expr;
+  final Expression expr;
   final Token token;
+  final String var;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  token = <IDENTIFIER>           {return token.image;}
-| <NEW> expr = ClassIdentifier() {return "new " + expr;}
-| expr = VariableDeclaratorId()  {return expr;}
+  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());}
 }
 
-String classInstantiation() :
+PrefixedUnaryExpression classInstantiation() :
 {
-  String expr;
-  final StringBuffer buff = new StringBuffer("new ");
+  Expression expr;
+  final StringBuffer buff;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
   <NEW> expr = ClassIdentifier()
-  {buff.append(expr);}
   [
+    {buff = new StringBuffer(expr.toStringExpression());}
     expr = PrimaryExpression()
-    {buff.append(expr);}
+    {buff.append(expr.toStringExpression());
+    expr = new ConstantIdentifier(buff.toString().toCharArray(),
+                                  pos,
+                                  SimpleCharStream.getPosition());}
   ]
-  {return buff.toString();}
+  {return new PrefixedUnaryExpression(expr,
+                                      OperatorIds.NEW,
+                                      pos);}
 }
 
-String ClassIdentifier():
+ConstantIdentifier ClassIdentifier():
 {
   final String expr;
   final Token token;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  token = <IDENTIFIER>          {return token.image;}
-| expr = VariableDeclaratorId() {return expr;}
+  token = <IDENTIFIER>          {return new ConstantIdentifier(token.image.toCharArray(),
+                                                               pos,
+                                                               SimpleCharStream.getPosition());}
+| expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(),
+                                                               pos,
+                                                               SimpleCharStream.getPosition());}
 }
 
-String PrimarySuffix() :
+AbstractSuffixExpression PrimarySuffix(Expression prefix) :
 {
-  final String expr;
+  final AbstractSuffixExpression expr;
 }
 {
-  expr = Arguments()      {return expr;}
-| expr = VariableSuffix() {return expr;}
+  expr = Arguments(prefix)      {return expr;}
+| expr = VariableSuffix(prefix) {return expr;}
 }
 
-String VariableSuffix() :
+AbstractSuffixExpression VariableSuffix(Expression prefix) :
 {
   String expr = null;
+  final int pos = SimpleCharStream.getPosition();
+  Expression expression = null;
 }
 {
   <CLASSACCESS>
@@ -1598,9 +1703,11 @@ String VariableSuffix() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  {return "->" + expr;}
+  {return new ClassAccess(prefix,
+                          new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+                          ClassAccess.NORMAL);}
 |
-  <LBRACKET> [ expr = Expression() | expr = Type() ]  //Not good
+  <LBRACKET> [ expression = Expression() | expression = Type() ]  //Not good
   try {
     <RBRACKET>
   } catch (ParseException e) {
@@ -1610,40 +1717,35 @@ String VariableSuffix() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  {
-    if(expr == null) {
-      return "[]";
-    }
-    return "[" + expr + "]";
-  }
+  {return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
 }
 
-String Literal() :
+Literal Literal() :
 {
-  final String expr;
   final Token token;
+  final int pos;
 }
 {
-  token = <INTEGER_LITERAL>        {return token.image;}
-| token = <FLOATING_POINT_LITERAL> {return token.image;}
-| token = <STRING_LITERAL>         {return token.image;}
-| expr = BooleanLiteral()          {return expr;}
-| <NULL>                           {return "null";}
+  token = <INTEGER_LITERAL>        {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);}
 }
 
-String BooleanLiteral() :
-{}
+FunctionCall Arguments(Expression func) :
 {
-  <TRUE>  {return "true";}
-| <FALSE> {return "false";}
+ArgumentDeclaration[] args = null;
 }
-
-String Arguments() :
 {
-String expr = null;
-}
-{
-  <LPAREN> [ expr = ArgumentList() ]
+  <LPAREN> [ args = ArgumentList() ]
   try {
     <RPAREN>
   } catch (ParseException e) {
@@ -1653,25 +1755,21 @@ String expr = null;
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  {
-  if (expr == null) {
-    return "()";
-  }
-  return "(" + expr + ")";
-  }
+  {return new FunctionCall(func,args,SimpleCharStream.getPosition());}
 }
 
-String ArgumentList() :
+ArgumentDeclaration[] ArgumentList() :
 {
-String expr;
-final StringBuffer buff = new StringBuffer();
+Expression expr;
+final ArrayList list = new ArrayList();
 }
 {
   expr = Expression()
-  {buff.append(expr);}
+  {list.add(expr);}
   ( <COMMA>
       try {
         expr = Expression()
+        {list.add(expr);}
       } catch (ParseException e) {
         errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list";
         errorLevel   = ERROR;
@@ -1679,19 +1777,21 @@ final StringBuffer buff = new StringBuffer();
         errorEnd     = jj_input_stream.getPosition() + 1;
         throw e;
       }
-    {buff.append(",").append(expr);}
    )*
-   {return buff.toString();}
+   {return (ArgumentDeclaration[]) list.toArray();}
 }
 
 /**
  * A Statement without break.
  */
-void StatementNoBreak() :
-{}
+Statement StatementNoBreak() :
+{
+  final Statement statement;
+  Token token = null;
+}
 {
   LOOKAHEAD(2)
-  Expression()
+  statement = Expression()
   try {
     <SEMICOLON>
   } catch (ParseException e) {
@@ -1703,11 +1803,12 @@ void StatementNoBreak() :
       throw e;
     }
   }
+  {return statement;}
 | LOOKAHEAD(2)
-  LabeledStatement()
-| Block()
-| EmptyStatement()
-| StatementExpression()
+  statement = LabeledStatement() {return statement;}
+| statement = Block()            {return statement;}
+| statement = EmptyStatement()   {return statement;}
+| statement = StatementExpression()
   try {
     <SEMICOLON>
   } catch (ParseException e) {
@@ -1717,35 +1818,46 @@ void StatementNoBreak() :
     errorEnd     = jj_input_stream.getPosition() + 1;
     throw e;
   }
-| SwitchStatement()
-| IfStatement()
-| WhileStatement()
-| DoStatement()
-| ForStatement()
-| ForeachStatement()
-| ContinueStatement()
-| ReturnStatement()
-| EchoStatement()
-| [<AT>] 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;}
 }
 
 /**
  * A Normal statement.
  */
-void Statement() :
-{}
+Statement Statement() :
+{
+  final Statement statement;
+}
 {
-  StatementNoBreak()
-| BreakStatement()
+  statement = StatementNoBreak() {return statement;}
+| statement = BreakStatement()   {return statement;}
 }
 
 /**
  * An html block inside a php syntax.
  */
-void htmlBlock() :
-{}
+HTMLBlock htmlBlock() :
+{
+  final int startIndex = nodePtr;
+  AstNode[] blockNodes;
+  int nbNodes;
+}
 {
   <PHPEND> (phpEchoBlock())*
   try {
@@ -1757,38 +1869,46 @@ void htmlBlock() :
     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);}
 }
 
 /**
  * An include statement. It's "include" an expression;
  */
-void IncludeStatement() :
+InclusionStatement IncludeStatement() :
 {
-  final String expr;
+  final Expression expr;
   final Token token;
+  final int keyword;
   final int pos = jj_input_stream.getPosition();
+  final InclusionStatement inclusionStatement;
 }
 {
-  (  token = <REQUIRE>
-   | token = <REQUIRE_ONCE>
-   | token = <INCLUDE>
-   | token = <INCLUDE_ONCE> )
-    try {
-      expr = Expression()
-    } catch (ParseException e) {
-      if (errorMessage != null) {
-        throw e;
-      }
-      errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected";
-      errorLevel   = ERROR;
-      errorStart   = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd     = jj_input_stream.getPosition() + 1;
+      (  <REQUIRE>      {keyword = InclusionStatement.REQUIRE;}
+       | <REQUIRE_ONCE> {keyword = InclusionStatement.REQUIRE_ONCE;}
+       | <INCLUDE>      {keyword = InclusionStatement.INCLUDE;}
+       | <INCLUDE_ONCE> {keyword = InclusionStatement.INCLUDE_ONCE;})
+  try {
+    expr = Expression()
+  } catch (ParseException e) {
+    if (errorMessage != null) {
       throw e;
     }
-  {
-    if (currentSegment != null) {
-      currentSegment.add(new PHPReqIncDeclaration(currentSegment, token.image,pos,expr));
-    }
+    errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected";
+    errorLevel   = ERROR;
+    errorStart   = 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>
@@ -1799,20 +1919,24 @@ void IncludeStatement() :
     errorEnd     = jj_input_stream.getPosition() + 1;
     throw e;
   }
+  {return inclusionStatement;}
 }
 
-String PrintExpression() :
+PrintExpression PrintExpression() :
 {
-  final String expr;
+  final Expression expr;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  <PRINT> expr = Expression() {return "print " + expr;}
+  <PRINT> expr = Expression() {return new PrintExpression(expr,pos,SimpleCharStream.getPosition());}
 }
 
-String ListExpression() :
+ListExpression ListExpression() :
 {
-  final StringBuffer buff = new StringBuffer("list(");
-  String expr;
+  String expr = null;
+  Expression expression = null;
+  ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
 }
 {
   <LIST>
@@ -1827,8 +1951,9 @@ String ListExpression() :
   }
   [
     expr = VariableDeclaratorId()
-    {buff.append(expr);}
+    {list.add(expr);}
   ]
+  {if (expr == null) list.add(null);}
   (
     try {
       <COMMA>
@@ -1840,9 +1965,8 @@ String ListExpression() :
       throw e;
     }
     expr = VariableDeclaratorId()
-    {buff.append(",").append(expr);}
+    {list.add(expr);}
   )*
-  {buff.append(")");}
   try {
     <RPAREN>
   } catch (ParseException e) {
@@ -1852,20 +1976,31 @@ String ListExpression() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  [ <ASSIGN> expr = Expression() {buff.append("(").append(expr);}]
-  {return buff.toString();}
+  [ <ASSIGN> expression = Expression()
+    {return new ListExpression((String[]) list.toArray(),expression,pos,SimpleCharStream.getPosition());}]
+  {return new ListExpression((String[]) list.toArray(),null,pos,SimpleCharStream.getPosition());}
 }
 
 /**
  * An echo statement.
  * echo anyexpression (, otherexpression)*
  */
-void EchoStatement() :
-{}
+EchoStatement EchoStatement() :
 {
-  <ECHO> Expression() (<COMMA> Expression())*
+  final ArrayList expressions = new ArrayList();
+  Expression expr;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <ECHO> expr = Expression()
+  {expressions.add(expr);}
+  (
+    <COMMA> expr = Expression()
+    {expressions.add(expr);}
+  )*
   try {
     <SEMICOLON>
+    {return new EchoStatement((Expression[]) expressions.toArray(),pos);}
   } catch (ParseException e) {
     if (e.currentToken.next.kind != 4) {
       errorMessage = "';' expected after 'echo' statement";
@@ -1877,25 +2012,29 @@ void EchoStatement() :
   }
 }
 
-void GlobalStatement() :
+GlobalStatement GlobalStatement() :
 {
    final int pos = jj_input_stream.getPosition();
    String expr;
+   ArrayList vars = new ArrayList();
+   GlobalStatement global;
 }
 {
   <GLOBAL>
     expr = VariableDeclaratorId()
-    {if (currentSegment != null) {
-      currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr));
-    }}
+    {vars.add(expr);}
   (<COMMA>
     expr = VariableDeclaratorId()
-    {if (currentSegment != null) {
-      currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr));
-    }}
+    {vars.add(expr);}
   )*
   try {
     <SEMICOLON>
+    {global = new GlobalStatement(currentSegment,
+                                  (String[]) vars.toArray(),
+                                  pos,
+                                  SimpleCharStream.getPosition());
+    currentSegment.add(global);
+    return global;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
     errorLevel   = ERROR;
@@ -1905,12 +2044,20 @@ void GlobalStatement() :
   }
 }
 
-void StaticStatement() :
-{}
+StaticStatement StaticStatement() :
+{
+  final int pos = SimpleCharStream.getPosition();
+  final ArrayList vars = new ArrayList();
+  VariableDeclaration expr;
+}
 {
-  <STATIC> VariableDeclarator() (<COMMA> VariableDeclarator())*
+  <STATIC> expr = VariableDeclarator() {vars.add(new String(expr.name));}
+  (<COMMA> expr = VariableDeclarator() {vars.add(new String(expr.name));})*
   try {
     <SEMICOLON>
+    {return new StaticStatement((String[])vars.toArray(),
+                                pos,
+                                SimpleCharStream.getPosition());}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
     errorLevel   = ERROR;
@@ -1920,14 +2067,28 @@ void StaticStatement() :
   }
 }
 
-void LabeledStatement() :
-{}
+LabeledStatement LabeledStatement() :
+{
+  final int pos = SimpleCharStream.getPosition();
+  final Token label;
+  final Statement statement;
+}
 {
-  <IDENTIFIER> <COLON> Statement()
+  label = <IDENTIFIER> <COLON> statement = Statement()
+  {return new LabeledStatement(label.image.toCharArray(),statement,pos,SimpleCharStream.getPosition());}
 }
 
-void Block() :
-{}
+/**
+ * A Block is
+ * {
+ * statements
+ * }.
+ * @return a block
+ */
+Block Block() :
+{
+  final int pos = SimpleCharStream.getPosition();
+}
 {
   try {
     <LBRACE>
@@ -1950,57 +2111,95 @@ void Block() :
   }
 }
 
-void BlockStatement() :
-{}
+Statement BlockStatement() :
 {
-  Statement()
-| ClassDeclaration()
-| MethodDeclaration()
+  final Statement statement;
+}
+{
+  statement = Statement()         {return statement;}
+| statement = ClassDeclaration()  {return statement;}
+| statement = MethodDeclaration() {return statement;}
 }
 
 /**
  * A Block statement that will not contain any 'break'
  */
-void BlockStatementNoBreak() :
-{}
+Statement BlockStatementNoBreak() :
 {
-  StatementNoBreak()
-| ClassDeclaration()
-| MethodDeclaration()
+  final Statement statement;
+}
+{
+  statement = StatementNoBreak()  {return statement;}
+| statement = ClassDeclaration()  {return statement;}
+| statement = MethodDeclaration() {return statement;}
 }
 
-void LocalVariableDeclaration() :
-{}
+VariableDeclaration[] LocalVariableDeclaration() :
 {
-  LocalVariableDeclarator() ( <COMMA> LocalVariableDeclarator() )*
+  final ArrayList list = new ArrayList();
+  VariableDeclaration var;
+}
+{
+  var = LocalVariableDeclarator()
+  {list.add(var);}
+  ( <COMMA> var = LocalVariableDeclarator() {list.add(var);})*
+  {return (VariableDeclaration[]) list.toArray();}
 }
 
-void LocalVariableDeclarator() :
-{}
+VariableDeclaration LocalVariableDeclarator() :
 {
-  VariableDeclaratorId() [ <ASSIGN> Expression() ]
+  final String varName;
+  Expression initializer = null;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  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);
+  }
 }
 
-void EmptyStatement() :
-{}
+EmptyStatement EmptyStatement() :
+{
+  final int pos;
+}
 {
   <SEMICOLON>
+  {pos = SimpleCharStream.getPosition();
+   return new EmptyStatement(pos-1,pos);}
 }
 
-void StatementExpression() :
-{}
+Statement StatementExpression() :
+{
+  Expression expr;
+}
 {
-  PreIncDecExpression()
+  expr = PreIncDecExpression() {return expr;}
 |
-  PrimaryExpression()
-  [ <INCR>
-  | <DECR>
+  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 SwitchStatement() :
+SwitchStatement SwitchStatement() :
 {
-  final int pos = jj_input_stream.getPosition();
+  final Expression variable;
+  final AbstractCase[] cases;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
   <SWITCH>
@@ -2014,7 +2213,7 @@ void SwitchStatement() :
     throw e;
   }
   try {
-    Expression()
+    variable = Expression()
   } catch (ParseException e) {
     if (errorMessage != null) {
       throw e;
@@ -2034,16 +2233,21 @@ void SwitchStatement() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  (switchStatementBrace() | switchStatementColon(pos, pos + 6))
+  (cases = switchStatementBrace() | cases = switchStatementColon(pos, pos + 6))
+  {return new SwitchStatement(variable,cases,pos,SimpleCharStream.getPosition());}
 }
 
-void switchStatementBrace() :
-{}
+AbstractCase[] switchStatementBrace() :
+{
+  AbstractCase cas;
+  final ArrayList cases = new ArrayList();
+}
 {
   <LBRACE>
- ( switchLabel0() )*
+ ( cas = switchLabel0() {cases.add(cas);})*
   try {
     <RBRACE>
+    {return (AbstractCase[]) cases.toArray();}
   } catch (ParseException e) {
     errorMessage = "'}' expected";
     errorLevel   = ERROR;
@@ -2057,8 +2261,11 @@ void switchStatementBrace() :
  * @param start the begin offset of the switch
  * @param end the end offset of the switch
  */
-void switchStatementColon(final int start, final int end) :
-{}
+AbstractCase[] switchStatementColon(final int start, final int end) :
+{
+  AbstractCase cas;
+  final ArrayList cases = new ArrayList();
+}
 {
   <COLON>
   {try {
@@ -2071,7 +2278,7 @@ void switchStatementColon(final int start, final int end) :
   } catch (CoreException e) {
     PHPeclipsePlugin.log(e);
   }}
-  (switchLabel0())*
+  ( cas = switchLabel0() {cases.add(cas);})*
   try {
     <ENDSWITCH>
   } catch (ParseException e) {
@@ -2083,6 +2290,7 @@ void switchStatementColon(final int start, final int end) :
   }
   try {
     <SEMICOLON>
+    {return (AbstractCase[]) cases.toArray();}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'endswitch' keyword";
     errorLevel   = ERROR;
@@ -2092,56 +2300,39 @@ void switchStatementColon(final int start, final int end) :
   }
 }
 
-void switchLabel0() :
-{
-  Token breakToken = null;
-  final int line;
-}
-{
-  line = SwitchLabel()
-  ( BlockStatementNoBreak() | htmlBlock() )*
-  [ breakToken = BreakStatement() ]
-  {
-    try {
-      if (breakToken == null) {
-        setMarker(fileToParse,
-                  "You should use put a 'break' at the end of your statement",
-                  line,
-                  INFO,
-                  "Line " + line);
-      }
-    } catch (CoreException e) {
-      PHPeclipsePlugin.log(e);
-    }
-  }
-}
-
-Token BreakStatement() :
+AbstractCase switchLabel0() :
 {
-  final Token token;
+  final Expression expr;
+  Statement statement;
+  final ArrayList stmts = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  token = <BREAK> [ Expression() ]
-  try {
-    <SEMICOLON>
-  } catch (ParseException e) {
-    errorMessage = "';' expected after 'break' keyword";
-    errorLevel   = ERROR;
-    errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = jj_input_stream.getPosition() + 1;
-    throw e;
+  expr = SwitchLabel()
+  ( statement = BlockStatementNoBreak() {stmts.add(statement);}
+  | statement = htmlBlock()             {stmts.add(statement);})*
+  [ statement = BreakStatement()        {stmts.add(statement);}]
+  {if (expr == null) {//it's a default
+    return new DefaultCase((Statement[]) stmts.toArray(),pos,SimpleCharStream.getPosition());
   }
-  {return token;}
+  return new Case(expr,(Statement[]) stmts.toArray(),pos,SimpleCharStream.getPosition());}
 }
 
-int SwitchLabel() :
+/**
+ * A SwitchLabel.
+ * case Expression() :
+ * default :
+ * @return the if it was a case and null if not
+ */
+Expression SwitchLabel() :
 {
   final Token token;
+  final Expression expr;
 }
 {
   token = <CASE>
   try {
-    Expression()
+    expr = Expression()
   } catch (ParseException e) {
     if (errorMessage != null) throw e;
     errorMessage = "expression expected after 'case' keyword";
@@ -2152,6 +2343,7 @@ int SwitchLabel() :
   }
   try {
     <COLON>
+    {return expr;}
   } catch (ParseException e) {
     errorMessage = "':' expected after case expression";
     errorLevel   = ERROR;
@@ -2159,11 +2351,11 @@ int SwitchLabel() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  {return token.beginLine;}
 |
   token = <_DEFAULT>
   try {
     <COLON>
+    {return null;}
   } catch (ParseException e) {
     errorMessage = "':' expected after 'default' keyword";
     errorLevel   = ERROR;
@@ -2171,20 +2363,43 @@ int SwitchLabel() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  {return token.beginLine;}
 }
 
-void IfStatement() :
+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 Token token;
   final int pos = jj_input_stream.getPosition();
+  Expression condition;
+  IfStatement ifStatement;
 }
 {
-  token = <IF> Condition("if") IfStatement0(pos,pos+token.image.length())
+  <IF> condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2)
+  {return ifStatement;}
 }
 
-void Condition(final String keyword) :
-{}
+
+Expression Condition(final String keyword) :
+{
+  final Expression condition;
+}
 {
   try {
     <LPAREN>
@@ -2195,9 +2410,10 @@ void Condition(final String keyword) :
     errorEnd   = errorStart +1;
     processParseException(e);
   }
-  Expression()
+  condition = Expression()
   try {
      <RPAREN>
+     {return condition;}
   } catch (ParseException e) {
     errorMessage = "')' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
@@ -2207,10 +2423,21 @@ void Condition(final String keyword) :
   }
 }
 
-void IfStatement0(final int start,final int end) :
-{}
+IfStatement IfStatement0(Expression condition, final int start,final int end) :
+{
+  Statement statement;
+  ElseIf elseifStatement;
+  Else elseStatement = null;
+  ArrayList stmts = new ArrayList();
+  ArrayList elseifs = new ArrayList();
+  int pos = SimpleCharStream.getPosition();
+}
 {
-  <COLON> (Statement() | htmlBlock())* (ElseIfStatementColon())* [ElseStatementColon()]
+  <COLON>
+  (  statement = Statement() {stmts.add(statement);}
+   | statement = htmlBlock() {stmts.add(statement);})*
+   (elseifStatement = ElseIfStatementColon() {elseifs.add(elseifStatement);})*
+   [elseStatement = ElseStatementColon()]
 
   {try {
   setMarker(fileToParse,
@@ -2233,6 +2460,11 @@ void IfStatement0(final int start,final int end) :
   }
   try {
     <SEMICOLON>
+    {return new IfStatement(condition,
+                            (ElseIf[]) elseifs.toArray(),
+                            elseStatement,
+                            pos,
+                            SimpleCharStream.getPosition());}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'endif' keyword";
     errorLevel   = ERROR;
@@ -2241,12 +2473,15 @@ void IfStatement0(final int start,final int end) :
     throw e;
   }
 |
-  (Statement() |  htmlBlock())
-  ( LOOKAHEAD(1) ElseIfStatement() )*
+  (statement = Statement() | statement = htmlBlock())
+  {stmts.add(statement);}
+  ( LOOKAHEAD(1) elseifStatement = ElseIfStatement() {elseifs.add(elseifStatement);})*
   [ LOOKAHEAD(1)
     <ELSE>
     try {
-      Statement()
+      {pos = SimpleCharStream.getPosition();}
+      statement = Statement()
+      {elseStatement = new Else(statement,pos,SimpleCharStream.getPosition());}
     } catch (ParseException e) {
       if (errorMessage != null) {
         throw e;
@@ -2258,39 +2493,72 @@ void IfStatement0(final int start,final int end) :
       throw e;
     }
   ]
+  {return new IfStatement(condition,
+                          (ElseIf[]) elseifs.toArray(),
+                          elseStatement,
+                          pos,
+                          SimpleCharStream.getPosition());}
 }
 
-void ElseIfStatementColon() :
-{}
+ElseIf ElseIfStatementColon() :
+{
+  Expression condition;
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <ELSEIF> Condition("elseif") <COLON> (Statement() | htmlBlock())*
+  <ELSEIF> condition = Condition("elseif")
+  <COLON> (  statement = Statement() {list.add(statement);}
+           | statement = htmlBlock() {list.add(statement);})*
+  {return new ElseIf(condition,(Statement[]) list.toArray(),pos,SimpleCharStream.getPosition());}
 }
 
-void ElseStatementColon() :
-{}
+Else ElseStatementColon() :
 {
-  <ELSE> <COLON> (Statement() | htmlBlock())*
+  Statement statement;
+  final ArrayList list = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <ELSE> <COLON> (  statement = Statement() {list.add(statement);}
+                  | statement = htmlBlock() {list.add(statement);})*
+  {return new Else((Statement[]) list.toArray(),pos,SimpleCharStream.getPosition());}
 }
 
-void ElseIfStatement() :
-{}
+ElseIf ElseIfStatement() :
 {
-  <ELSEIF> Condition("elseif") Statement()
+  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*/}
+  {return new ElseIf(condition,(Statement[]) list.toArray(),pos,SimpleCharStream.getPosition());}
 }
 
-void WhileStatement() :
+WhileStatement WhileStatement() :
 {
-  final Token token;
-  final int pos = jj_input_stream.getPosition();
+  final Expression condition;
+  final Statement action;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-  token = <WHILE> Condition("while") WhileStatement0(pos,pos + token.image.length())
+  <WHILE>
+    condition = Condition("while")
+    action    = WhileStatement0(pos,pos + 5)
+    {return new WhileStatement(condition,action,pos,SimpleCharStream.getPosition());}
 }
 
-void WhileStatement0(final int start, final int end) :
-{}
+Statement WhileStatement0(final int start, final int end) :
 {
-  <COLON> (Statement())*
+  Statement statement;
+  final ArrayList stmts = new ArrayList();
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <COLON> (statement = Statement() {stmts.add(statement);})*
   {try {
   setMarker(fileToParse,
             "Ugly syntax detected, you should while () {...} instead of while (): ... endwhile;",
@@ -2312,6 +2580,7 @@ void WhileStatement0(final int start, final int end) :
   }
   try {
     <SEMICOLON>
+    {return new Block((Statement[]) stmts.toArray(),pos,SimpleCharStream.getPosition());}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'endwhile' keyword";
     errorLevel   = ERROR;
@@ -2320,15 +2589,21 @@ void WhileStatement0(final int start, final int end) :
     throw e;
   }
 |
-  Statement()
+  statement = Statement()
+  {return statement;}
 }
 
-void DoStatement() :
-{}
+DoStatement DoStatement() :
+{
+  final Statement action;
+  final Expression condition;
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <DO> Statement() <WHILE> Condition("while")
+  <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;
@@ -2338,8 +2613,14 @@ void DoStatement() :
   }
 }
 
-void ForeachStatement() :
-{}
+ForeachStatement ForeachStatement() :
+{
+  Statement statement;
+  Expression expression;
+  final StringBuffer buff = new StringBuffer();
+  final int pos = SimpleCharStream.getPosition();
+  ArrayVariableDeclaration variable;
+}
 {
   <FOREACH>
     try {
@@ -2352,7 +2633,7 @@ void ForeachStatement() :
     throw e;
   }
   try {
-    Variable()
+    expression = Expression()
   } catch (ParseException e) {
     errorMessage = "variable expected";
     errorLevel   = ERROR;
@@ -2360,7 +2641,6 @@ void ForeachStatement() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  ( VariableSuffix() )*
   try {
     <AS>
   } catch (ParseException e) {
@@ -2371,7 +2651,7 @@ void ForeachStatement() :
     throw e;
   }
   try {
-    Variable()
+    variable = ArrayVariable()
   } catch (ParseException e) {
     errorMessage = "variable expected";
     errorLevel   = ERROR;
@@ -2379,7 +2659,6 @@ void ForeachStatement() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-  [ <ARRAYASSIGN> Expression() ]
   try {
     <RPAREN>
   } catch (ParseException e) {
@@ -2390,7 +2669,7 @@ void ForeachStatement() :
     throw e;
   }
   try {
-    Statement()
+    statement = Statement()
   } catch (ParseException e) {
     if (errorMessage != null) throw e;
     errorMessage = "statement expected";
@@ -2399,12 +2678,24 @@ void ForeachStatement() :
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
+  {return new ForeachStatement(expression,
+                               variable,
+                               statement,
+                               pos,
+                               SimpleCharStream.getPosition());}
+
 }
 
-void ForStatement() :
+ForStatement ForStatement() :
 {
 final Token token;
-final int pos = jj_input_stream.getPosition();
+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>
@@ -2417,11 +2708,16 @@ final int pos = jj_input_stream.getPosition();
     errorEnd   = jj_input_stream.getPosition() + 1;
     throw e;
   }
-     [ ForInit() ] <SEMICOLON> [ Expression() ] <SEMICOLON> [ StatementExpressionList() ] <RPAREN>
+     [ initializations = ForInit() ] <SEMICOLON>
+     [ condition = Expression() ] <SEMICOLON>
+     [ increments = StatementExpressionList() ] <RPAREN>
     (
-      Statement()
+      action = Statement()
+      {return new ForStatement(initializations,condition,increments,action,pos,SimpleCharStream.getPosition());}
     |
-      <COLON> (Statement())*
+      <COLON>
+      {startBlock = SimpleCharStream.getPosition();}
+      (action = Statement() {list.add(action);})*
       {
         try {
         setMarker(fileToParse,
@@ -2434,6 +2730,7 @@ final int pos = jj_input_stream.getPosition();
           PHPeclipsePlugin.log(e);
         }
       }
+      {endBlock = SimpleCharStream.getPosition();}
       try {
         <ENDFOR>
       } catch (ParseException e) {
@@ -2445,6 +2742,7 @@ final int pos = jj_input_stream.getPosition();
       }
       try {
         <SEMICOLON>
+        {return new ForStatement(initializations,condition,increments,new Block((Statement[])list.toArray(),startBlock,endBlock),pos,SimpleCharStream.getPosition());}
       } catch (ParseException e) {
         errorMessage = "';' expected after 'endfor' keyword";
         errorLevel   = ERROR;
@@ -2455,27 +2753,40 @@ final int pos = jj_input_stream.getPosition();
     )
 }
 
-void ForInit() :
-{}
+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;
+}
+{
+  expr = StatementExpression()   {list.add(expr);}
+  (<COMMA> StatementExpression() {list.add(expr);})*
+  {return (Statement[]) list.toArray();}
 }
 
-void ContinueStatement() :
-{}
+Continue ContinueStatement() :
 {
-  <CONTINUE> [ Expression() ]
+  Expression expr = null;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <CONTINUE> [ expr = Expression() ]
   try {
     <SEMICOLON>
+    {return new Continue(expr,pos,SimpleCharStream.getPosition());}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'continue' statement";
     errorLevel   = ERROR;
@@ -2485,12 +2796,16 @@ void ContinueStatement() :
   }
 }
 
-void ReturnStatement() :
-{}
+ReturnStatement ReturnStatement() :
+{
+  Expression expr = null;
+  final int pos = SimpleCharStream.getPosition();
+}
 {
-  <RETURN> [ Expression() ]
+  <RETURN> [ expr = Expression() ]
   try {
     <SEMICOLON>
+    {return new ReturnStatement(expr,pos,SimpleCharStream.getPosition());}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'return' statement";
     errorLevel   = ERROR;