You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/11/05 11:15:57 UTC

[GitHub] tmysik closed pull request #1009: Minor changes for the php.editor

tmysik closed pull request #1009: Minor changes for the php.editor
URL: https://github.com/apache/incubator-netbeans/pull/1009
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/csl/PHPTypeSearcher.java b/php/php.editor/src/org/netbeans/modules/php/editor/csl/PHPTypeSearcher.java
index dc40618221..2207381ab7 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/csl/PHPTypeSearcher.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/csl/PHPTypeSearcher.java
@@ -29,7 +29,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import javax.swing.Icon;
-import org.netbeans.api.project.FileOwnerQuery;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectInformation;
 import org.netbeans.api.project.ProjectUtils;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/elements/VariableElementImpl.java b/php/php.editor/src/org/netbeans/modules/php/editor/elements/VariableElementImpl.java
index 06002b37a0..e05b4e1c35 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/elements/VariableElementImpl.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/elements/VariableElementImpl.java
@@ -24,7 +24,6 @@
 import java.util.Set;
 import org.netbeans.modules.csl.api.OffsetRange;
 import org.netbeans.modules.parsing.spi.indexing.support.IndexResult;
-import org.netbeans.modules.php.api.editor.PhpClass;
 import org.netbeans.modules.php.api.editor.PhpType;
 import org.netbeans.modules.php.api.editor.PhpVariable;
 import org.netbeans.modules.php.editor.CodeUtils;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/indent/ui/FmtWrapping.java b/php/php.editor/src/org/netbeans/modules/php/editor/indent/ui/FmtWrapping.java
index 4235806e35..e756792a93 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/indent/ui/FmtWrapping.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/indent/ui/FmtWrapping.java
@@ -19,7 +19,6 @@
 
 package org.netbeans.modules.php.editor.indent.ui;
 
-import java.awt.Dimension;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.io.IOException;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
index 27de66d284..92a845afd9 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
@@ -19,7 +19,7 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.11a beta 20060608
-// Sun Oct 28 19:26:12 JST 2018
+// Sun Nov 04 22:15:39 JST 2018
 //----------------------------------------------------
 
 package org.netbeans.modules.php.editor.parser;
@@ -29,7 +29,7 @@
 import org.openide.util.Pair;
 
 /** CUP v0.11a beta 20060608 generated parser.
-  * @version Sun Oct 28 19:26:12 JST 2018
+  * @version Sun Nov 04 22:15:39 JST 2018
   */
 @org.netbeans.api.annotations.common.SuppressWarnings({"EI_EXPOSE_REP", "MS_PKGPROTECT", "BC_BAD_CAST_TO_CONCRETE_COLLECTION"})
 public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
@@ -1821,13 +1821,13 @@ protected void init_actions()
 }
 
 
-	protected final static Integer IMPLICIT_PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.IMPLICIT_PUBLIC);
-	protected final static Integer PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.PUBLIC);
-	protected final static Integer PRIVATE = Integer.valueOf(BodyDeclaration.Modifier.PRIVATE);
-	protected final static Integer PROTECTED = Integer.valueOf(BodyDeclaration.Modifier.PROTECTED);
-	protected final static Integer ABSTRACT = Integer.valueOf(BodyDeclaration.Modifier.ABSTRACT);
-	protected final static Integer FINAL = Integer.valueOf(BodyDeclaration.Modifier.FINAL);
-	protected final static Integer STATIC = Integer.valueOf(BodyDeclaration.Modifier.STATIC);
+    protected final static Integer IMPLICIT_PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.IMPLICIT_PUBLIC);
+    protected final static Integer PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.PUBLIC);
+    protected final static Integer PRIVATE = Integer.valueOf(BodyDeclaration.Modifier.PRIVATE);
+    protected final static Integer PROTECTED = Integer.valueOf(BodyDeclaration.Modifier.PROTECTED);
+    protected final static Integer ABSTRACT = Integer.valueOf(BodyDeclaration.Modifier.ABSTRACT);
+    protected final static Integer FINAL = Integer.valueOf(BodyDeclaration.Modifier.FINAL);
+    protected final static Integer STATIC = Integer.valueOf(BodyDeclaration.Modifier.STATIC);
 
     private ErrorStrategy defaultStrategy = new DefaultErrorStrategy();;
     private ErrorStrategy errorStrategy = defaultStrategy;
@@ -1909,13 +1909,13 @@ public VariableBase createDispatch(VariableBase dispatcher, Pair<Expression, Boo
         return dispatch;
     }
 
-	public VariableBase createDispatch(VariableBase dispatcher, VariableBase property, List dimensions) {
-		return createDispatch(dispatcher, Pair.of(property, false), null);
+    public VariableBase createDispatch(VariableBase dispatcher, VariableBase property, List dimensions) {
+        return createDispatch(dispatcher, Pair.of(property, false), null);
     }
 
     public VariableBase createDispatch(VariableBase dispatcher, VariableBase property) {
-		return createDispatch(dispatcher, property, null);
-	}
+        return createDispatch(dispatcher, property, null);
+    }
 
     public VariableBase createDispatch(boolean isStatic, VariableBase var, Expression memberProperty, int memberPropertyleft, int memberPropertyright,
             List<Expression> paramsList, int paramsListright, List propertyList, List aa) {
@@ -1991,7 +1991,7 @@ protected boolean error_recovery(boolean debug) throws java.lang.Exception {
      * @param info    an extra object reserved for use by specialized subclasses.
      */
     public void report_error(String message, Object info) {
-		 System.out.print("report_eror"  + message);
+        System.out.print("report_eror"  + message);
     }
 
     /**
@@ -2084,11 +2084,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List statementList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ASTPHP5Scanner phpAstLexer5 = (ASTPHP5Scanner) parser.getScanner();
-	List commentList = phpAstLexer5.getCommentList();
+    ASTPHP5Scanner phpAstLexer5 = (ASTPHP5Scanner) parser.getScanner();
+    List commentList = phpAstLexer5.getCommentList();
     int endOfProgram = statementListright > phpAstLexer5.getWhitespaceEndPosition() || phpAstLexer5.isEndedPhp() ? statementListright : phpAstLexer5.getWhitespaceEndPosition();
-	Program program = new Program(statementListleft, endOfProgram, statementList, commentList);
-	RESULT = program;
+    Program program = new Program(statementListleft, endOfProgram, statementList, commentList);
+    RESULT = program;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("thestart",0, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2116,9 +2116,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int nright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String n = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(new Identifier(nleft, nright, n));
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new Identifier(nleft, nright, n));
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("namespace_name",1, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2132,9 +2132,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int nright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String n = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(new Identifier(nleft, nright, "define"));
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new Identifier(nleft, nright, "define"));
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("namespace_name",1, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2151,8 +2151,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int nright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String n = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(new Identifier(nleft, nright, n));
-	RESULT = list;
+    list.add(new Identifier(nleft, nright, n));
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("namespace_name",1, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2166,7 +2166,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(listleft, listright, list, false, false);
+    RESULT = new NamespaceName(listleft, listright, list, false, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("namespace_name_access",2, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2183,7 +2183,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("namespace_name_access",2, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2200,7 +2200,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("namespace_name_access",2, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2214,7 +2214,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2228,7 +2228,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2242,7 +2242,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2256,7 +2256,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2270,7 +2270,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2284,7 +2284,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2298,7 +2298,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2312,7 +2312,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2326,7 +2326,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2340,7 +2340,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2354,7 +2354,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2368,7 +2368,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2382,7 +2382,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2396,7 +2396,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2410,7 +2410,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2424,7 +2424,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2438,7 +2438,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2452,7 +2452,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2466,7 +2466,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2480,7 +2480,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2494,7 +2494,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2508,7 +2508,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2522,7 +2522,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2536,7 +2536,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2550,7 +2550,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2564,7 +2564,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2578,7 +2578,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2592,7 +2592,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2606,7 +2606,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2620,7 +2620,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2634,7 +2634,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2648,7 +2648,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2662,7 +2662,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2676,7 +2676,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2690,7 +2690,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2704,7 +2704,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2718,7 +2718,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2732,7 +2732,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2746,7 +2746,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2760,7 +2760,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2774,7 +2774,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2788,7 +2788,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2802,7 +2802,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2816,7 +2816,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2830,7 +2830,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2844,7 +2844,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2858,7 +2858,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2872,7 +2872,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2886,7 +2886,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2900,7 +2900,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2914,7 +2914,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2928,7 +2928,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2942,7 +2942,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2956,7 +2956,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2970,7 +2970,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2984,7 +2984,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -2998,7 +2998,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3012,7 +3012,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3026,7 +3026,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3040,7 +3040,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3054,7 +3054,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3068,7 +3068,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3082,7 +3082,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3096,7 +3096,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3110,7 +3110,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3124,7 +3124,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reserved_non_modifiers_without_class",114, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3138,7 +3138,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Identifier reserved = (Identifier)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = reserved;
+    RESULT = reserved;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("semi_reserved_without_class",115, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3152,7 +3152,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String modifier = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("semi_reserved_without_class",115, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3166,7 +3166,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String modifier = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("semi_reserved_without_class",115, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3180,7 +3180,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String modifier = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("semi_reserved_without_class",115, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3194,7 +3194,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String modifier = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("semi_reserved_without_class",115, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3208,7 +3208,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String modifier = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("semi_reserved_without_class",115, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3222,7 +3222,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String modifier = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("semi_reserved_without_class",115, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3236,7 +3236,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int identright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Identifier ident = (Identifier)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = ident;
+    RESULT = ident;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("identifier",117, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3250,7 +3250,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String reserved = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("identifier",117, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3264,7 +3264,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int stringright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String string = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(stringleft, stringright, string);
+    RESULT = new Identifier(stringleft, stringright, string);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("identifier_without_class",116, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3278,7 +3278,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int defineright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String define = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(defineleft, defineright, define);
+    RESULT = new Identifier(defineleft, defineright, define);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("identifier_without_class",116, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3292,7 +3292,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int reservedright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Identifier reserved = (Identifier)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = reserved;
+    RESULT = reserved;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("identifier_without_class",116, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3309,24 +3309,24 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	if(statement != null) {
-		if (!(statement instanceof NamespaceDeclaration) && sList.size() > 0) {
-			Statement lastStatement = (Statement) ((LinkedList) sList).getLast();
-			if (lastStatement instanceof NamespaceDeclaration) {
-                                NamespaceDeclaration namespaceDeclaration = (NamespaceDeclaration) lastStatement;
-                                // there should be NO statement outside bracketed namespaces - it's PHP FATAL ERROR
-                                // (that statement doesn't belong to last bracketed namespace)
-                                if (!namespaceDeclaration.isBracketed()) {
-                                    namespaceDeclaration.addStatement(statement);
-                                }
-			} else {
-				sList.add(statement);
-			}
-		} else {
-			sList.add(statement);
-		}
-	}
-	RESULT = sList;
+    if(statement != null) {
+        if (!(statement instanceof NamespaceDeclaration) && sList.size() > 0) {
+            Statement lastStatement = (Statement) ((LinkedList) sList).getLast();
+            if (lastStatement instanceof NamespaceDeclaration) {
+                NamespaceDeclaration namespaceDeclaration = (NamespaceDeclaration) lastStatement;
+                // there should be NO statement outside bracketed namespaces - it's PHP FATAL ERROR
+                // (that statement doesn't belong to last bracketed namespace)
+                if (!namespaceDeclaration.isBracketed()) {
+                    namespaceDeclaration.addStatement(statement);
+                }
+            } else {
+                sList.add(statement);
+            }
+        } else {
+            sList.add(statement);
+        }
+    }
+    RESULT = sList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement_list",8, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3337,7 +3337,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement_list",8, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3351,7 +3351,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3365,7 +3365,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		FunctionDeclaration statement = (FunctionDeclaration)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3379,7 +3379,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3393,7 +3393,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int haltright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object halt = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new HaltCompiler(haltleft, haltright);
+    RESULT = new HaltCompiler(haltleft, haltright);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3413,8 +3413,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceDeclaration(sleft, eright,
-		new NamespaceName(listleft, listright, list, false, false), null, false);
+    RESULT = new NamespaceDeclaration(sleft, eright,
+        new NamespaceName(listleft, listright, list, false, false), null, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3440,9 +3440,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceDeclaration(sleft, eright,
-		new NamespaceName(listleft, listright, list, false, false),
-		new Block(tokenleft, eright, sList), true);
+    RESULT = new NamespaceDeclaration(sleft, eright,
+        new NamespaceName(listleft, listright, list, false, false),
+        new Block(tokenleft, eright, sList), true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3465,8 +3465,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceDeclaration(sleft, eright, null,
-		new Block(tokenleft, eright, sList), true);
+    RESULT = new NamespaceDeclaration(sleft, eright, null,
+        new Block(tokenleft, eright, sList), true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3486,7 +3486,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UseStatement(sleft, eright, list);
+    RESULT = new UseStatement(sleft, eright, list);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3506,7 +3506,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UseStatement(useleft, eright, list, UseStatement.Type.FUNCTION);
+    RESULT = new UseStatement(useleft, eright, list, UseStatement.Type.FUNCTION);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3526,7 +3526,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UseStatement(useleft, eright, list, UseStatement.Type.CONST);
+    RESULT = new UseStatement(useleft, eright, list, UseStatement.Type.CONST);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3543,7 +3543,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ConstantDeclaration(listleft, eright, ASTPHP5Parser.IMPLICIT_PUBLIC, list, true);
+    RESULT = new ConstantDeclaration(listleft, eright, ASTPHP5Parser.IMPLICIT_PUBLIC, list, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("top_statement",9, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3560,8 +3560,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int useDeclright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		UseStatementPart useDecl = (UseStatementPart)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(useDecl);
-	RESULT = list;
+    list.add(useDecl);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_declarations",7, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3588,9 +3588,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int useDeclright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		UseStatementPart useDecl = (UseStatementPart)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(useDecl);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(useDecl);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_declarations",7, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3604,8 +3604,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new SingleUseStatementPart(listleft, listright,
-		new NamespaceName(listleft, listright, list, false, false), null);
+    RESULT = new SingleUseStatementPart(listleft, listright,
+        new NamespaceName(listleft, listright, list, false, false), null);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_declaration",6, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3622,9 +3622,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int aliasNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String aliasName = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new SingleUseStatementPart(listleft, aliasNameright,
-		new NamespaceName(listleft, listright, list, false, false),
-		new Identifier(aliasNameleft, aliasNameright, aliasName));
+    RESULT = new SingleUseStatementPart(listleft, aliasNameright,
+        new NamespaceName(listleft, listright, list, false, false),
+        new Identifier(aliasNameleft, aliasNameright, aliasName));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_declaration",6, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3650,7 +3650,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int closeright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object close = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new GroupUseStatementPart(basensleft, closeright, new NamespaceName(basensleft, basensright, basens, false, false), parts);
+    RESULT = new GroupUseStatementPart(basensleft, closeright, new NamespaceName(basensleft, basensright, basens, false, false), parts);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_declaration",6, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3667,8 +3667,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new SingleUseStatementPart(sleft, listright,
-		new NamespaceName(sleft, listright, list, true, false), null);
+    RESULT = new SingleUseStatementPart(sleft, listright,
+        new NamespaceName(sleft, listright, list, true, false), null);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_declaration",6, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3688,9 +3688,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int aliasNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String aliasName = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new SingleUseStatementPart(sleft, aliasNameright,
-		new NamespaceName(sleft, listright, list, true, false),
-		new Identifier(aliasNameleft, aliasNameright, aliasName));
+    RESULT = new SingleUseStatementPart(sleft, aliasNameright,
+        new NamespaceName(sleft, listright, list, true, false),
+        new Identifier(aliasNameleft, aliasNameright, aliasName));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_declaration",6, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3719,7 +3719,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int closeright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object close = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new GroupUseStatementPart(sleft, closeright, new NamespaceName(basensleft, basensright, basens, true, false), parts);
+    RESULT = new GroupUseStatementPart(sleft, closeright, new NamespaceName(basensleft, basensright, basens, true, false), parts);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_declaration",6, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3733,7 +3733,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("group_namespace_parts",3, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3744,8 +3744,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("group_namespace_parts",3, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3762,8 +3762,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int partright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		SingleUseStatementPart part = (SingleUseStatementPart)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(part);
-	RESULT = list;
+    list.add(part);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_group_namespace_parts",4, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3777,9 +3777,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int partright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		SingleUseStatementPart part = (SingleUseStatementPart)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(part);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(part);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_group_namespace_parts",4, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3901,11 +3901,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	// Ignore null statements
-	if(statement != null) {
-		statementList.add(statement);
-	}
-	RESULT = statementList;
+    // Ignore null statements
+    if(statement != null) {
+        statementList.add(statement);
+    }
+    RESULT = statementList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("inner_statement_list",11, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3916,7 +3916,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("inner_statement_list",11, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3930,7 +3930,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("inner_statement",12, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3944,7 +3944,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		FunctionDeclaration statement = (FunctionDeclaration)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("inner_statement",12, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3958,7 +3958,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("inner_statement",12, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3972,7 +3972,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("statement",10, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -3989,7 +3989,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new GotoLabel(labelleft, eright, new Identifier(labelleft, labelright, label));
+    RESULT = new GotoLabel(labelleft, eright, new Identifier(labelleft, labelright, label));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("statement",10, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4009,8 +4009,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(tokenleft, endright, statementList);
-	RESULT = block;
+    Block block = new Block(tokenleft, endright, statementList);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4036,19 +4036,19 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int iffalseright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement iffalse = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Expression innerCondition = null;
-	Statement trueStatement = null;
-	Statement falseStatement = iffalse;
+    Expression innerCondition = null;
+    Statement trueStatement = null;
+    Statement falseStatement = iffalse;
 
-	for (int i=0 ; i < elseif[0].size() ; i++) {
-		innerCondition = (Expression)elseif[0].get(i);
-	 	trueStatement = (Statement)elseif[1].get(i);
-	 	int start = ((Integer)elseif[2].get(i)).intValue();
-		falseStatement = new IfStatement(start, iffalseright, innerCondition, trueStatement, falseStatement);
-	}
-	IfStatement ifStatement = new IfStatement(tokenleft, iffalseright, condition, iftrue, falseStatement);
+    for (int i=0 ; i < elseif[0].size() ; i++) {
+        innerCondition = (Expression)elseif[0].get(i);
+        trueStatement = (Statement)elseif[1].get(i);
+        int start = ((Integer)elseif[2].get(i)).intValue();
+        falseStatement = new IfStatement(start, iffalseright, innerCondition, trueStatement, falseStatement);
+    }
+    IfStatement ifStatement = new IfStatement(tokenleft, iffalseright, condition, iftrue, falseStatement);
 
-	RESULT = ifStatement;
+    RESULT = ifStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-6)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4080,20 +4080,20 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Expression innerCondition = null;
-	Statement trueStatement = null;
-	Statement falseStatement = iffalse;
+    Expression innerCondition = null;
+    Statement trueStatement = null;
+    Statement falseStatement = iffalse;
 
-	for (int i=0 ; i < elseif[0].size() ; i++) {
-		innerCondition = (Expression)elseif[0].get(i);
-	 	trueStatement = (Statement)elseif[1].get(i);
-	 	int start = ((Integer)elseif[2].get(i)).intValue();
-		falseStatement = new IfStatement(start, iffalseright, innerCondition, trueStatement, falseStatement);
-	}
-	Block block = new Block(colonleft, ifTrueStatementListright, ifTrueStatementList, false);
-	IfStatement ifStatement = new IfStatement(tokenleft, iffalseright, condition, block, falseStatement);
+    for (int i=0 ; i < elseif[0].size() ; i++) {
+        innerCondition = (Expression)elseif[0].get(i);
+        trueStatement = (Statement)elseif[1].get(i);
+        int start = ((Integer)elseif[2].get(i)).intValue();
+        falseStatement = new IfStatement(start, iffalseright, innerCondition, trueStatement, falseStatement);
+    }
+    Block block = new Block(colonleft, ifTrueStatementListright, ifTrueStatementList, false);
+    IfStatement ifStatement = new IfStatement(tokenleft, iffalseright, condition, block, falseStatement);
 
-	RESULT = ifStatement;
+    RESULT = ifStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-9)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4113,8 +4113,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	WhileStatement whileStatement = new WhileStatement(tokenleft, statementright, expr, statement);
-	RESULT = whileStatement;
+    WhileStatement whileStatement = new WhileStatement(tokenleft, statementright, expr, statement);
+    RESULT = whileStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4137,8 +4137,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	DoStatement doStatement = new DoStatement(tokenleft, endright, expr, statement);
-	RESULT = doStatement;
+    DoStatement doStatement = new DoStatement(tokenleft, endright, expr, statement);
+    RESULT = doStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-6)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4164,8 +4164,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ForStatement forStatement = new ForStatement(tokenleft, statementright, initializations, conditions, increasements, statement);
-	RESULT = forStatement;
+    ForStatement forStatement = new ForStatement(tokenleft, statementright, initializations, conditions, increasements, statement);
+    RESULT = forStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-8)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4185,8 +4185,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int caseBlockright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Block caseBlock = (Block)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	SwitchStatement switchStatement = new SwitchStatement(tokenleft, caseBlockright, expr, caseBlock);
-	RESULT = switchStatement;
+    SwitchStatement switchStatement = new SwitchStatement(tokenleft, caseBlockright, expr, caseBlock);
+    RESULT = switchStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4203,7 +4203,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new BreakStatement(tokenleft, endright);
+    RESULT = new BreakStatement(tokenleft, endright);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4223,7 +4223,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new BreakStatement(tokenleft, endright, expr);
+    RESULT = new BreakStatement(tokenleft, endright, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4240,7 +4240,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ContinueStatement(tokenleft, endright);
+    RESULT = new ContinueStatement(tokenleft, endright);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4260,7 +4260,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ContinueStatement(tokenleft, endright, expr);
+    RESULT = new ContinueStatement(tokenleft, endright, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4277,7 +4277,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ReturnStatement(tokenleft, endright);
+    RESULT = new ReturnStatement(tokenleft, endright);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4297,7 +4297,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ReturnStatement(tokenleft, endright, expr);
+    RESULT = new ReturnStatement(tokenleft, endright, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4317,7 +4317,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ReturnStatement(tokenleft, endright, expr);
+    RESULT = new ReturnStatement(tokenleft, endright, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4337,7 +4337,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ReturnStatement(tokenleft, endright, expr);
+    RESULT = new ReturnStatement(tokenleft, endright, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4357,8 +4357,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	GlobalStatement  global = new GlobalStatement(startleft, endright, list);
-	RESULT = global;
+    GlobalStatement global = new GlobalStatement(startleft, endright, list);
+    RESULT = global;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4378,8 +4378,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	StaticStatement s = new StaticStatement(startleft, endright, list);
-	RESULT = s;
+    StaticStatement s = new StaticStatement(startleft, endright, list);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4399,7 +4399,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new EchoStatement(startleft, endright, exprList);
+    RESULT = new EchoStatement(startleft, endright, exprList);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4413,8 +4413,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int htmlright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object html = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	InLineHtml inLineHtml = new InLineHtml(htmlleft, htmlright);
-	RESULT = inLineHtml;
+    InLineHtml inLineHtml = new InLineHtml(htmlleft, htmlright);
+    RESULT = inLineHtml;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4431,8 +4431,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ExpressionStatement expressionStatement = new ExpressionStatement(exprleft, endright, expr);
-	RESULT = expressionStatement;
+    ExpressionStatement expressionStatement = new ExpressionStatement(exprleft, endright, expr);
+    RESULT = expressionStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4452,13 +4452,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(expr);
-	Identifier id = new Identifier(startleft, startright, "use");
-	FunctionName functionName = new FunctionName(startleft, startright, id);
-	FunctionInvocation functionInvocation = new FunctionInvocation(startleft, exprright, functionName, list);
-	ExpressionStatement expressionStatement = new ExpressionStatement(startleft, endright, functionInvocation);
-	RESULT = expressionStatement;
+    List list = new LinkedList();
+    list.add(expr);
+    Identifier id = new Identifier(startleft, startright, "use");
+    FunctionName functionName = new FunctionName(startleft, startright, id);
+    FunctionInvocation functionInvocation = new FunctionInvocation(startleft, exprright, functionName, list);
+    ExpressionStatement expressionStatement = new ExpressionStatement(startleft, endright, functionInvocation);
+    RESULT = expressionStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4481,11 +4481,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier id = new Identifier(startleft, startright, "unset");
-	FunctionName functionName = new FunctionName(startleft, startright, id);
-	FunctionInvocation functionInvocation = new FunctionInvocation(startleft, closeParright, functionName, list);
-	ExpressionStatement expressionStatement = new ExpressionStatement(startleft, endright, functionInvocation);
-	RESULT = expressionStatement;
+    Identifier id = new Identifier(startleft, startright, "unset");
+    FunctionName functionName = new FunctionName(startleft, startright, id);
+    FunctionInvocation functionInvocation = new FunctionInvocation(startleft, closeParright, functionName, list);
+    ExpressionStatement expressionStatement = new ExpressionStatement(startleft, endright, functionInvocation);
+    RESULT = expressionStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4511,13 +4511,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ForEachStatement forEachStatement = null;
-	if (arg == null) {
-		forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, statement);
-	} else {
-		forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, arg, statement);
-	}
-	RESULT = forEachStatement;
+    ForEachStatement forEachStatement = null;
+    if (arg == null) {
+        forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, statement);
+    } else {
+        forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, arg, statement);
+    }
+    RESULT = forEachStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-7)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4543,13 +4543,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ForEachStatement forEachStatement = null;
-	if (arg == null) {
-		forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, statement);
-	} else {
-		forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, arg, statement);
-	}
-	RESULT = forEachStatement;
+    ForEachStatement forEachStatement = null;
+    if (arg == null) {
+        forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, statement);
+    } else {
+        forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, arg, statement);
+    }
+    RESULT = forEachStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-7)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4569,8 +4569,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	DeclareStatement declare = new DeclareStatement(startleft, statementright, lists[0], lists[1], statement);
-	RESULT = declare;
+    DeclareStatement declare = new DeclareStatement(startleft, statementright, lists[0], lists[1], statement);
+    RESULT = declare;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4584,7 +4584,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int tokenright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object token = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new EmptyStatement(tokenleft, tokenright);
+    RESULT = new EmptyStatement(tokenleft, tokenright);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4619,11 +4619,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int finallyBlockEndright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object finallyBlockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block tryBlock = new Block(tryBlockStartleft, tryBlockEndright, tryList);
+    Block tryBlock = new Block(tryBlockStartleft, tryBlockEndright, tryList);
     Block finallyBlock = new Block(finallyBlockStartleft, finallyBlockEndright, finallyList);
-	FinallyClause finallyClause = new FinallyClause(finally_wordleft, finallyBlockEndright, finallyBlock);
-	TryStatement tryStatement = new TryStatement(startleft, finallyBlockEndright, tryBlock, null, finallyClause);
-	RESULT = tryStatement;
+    FinallyClause finallyClause = new FinallyClause(finally_wordleft, finallyBlockEndright, finallyBlock);
+    TryStatement tryStatement = new TryStatement(startleft, finallyBlockEndright, tryBlock, null, finallyClause);
+    RESULT = tryStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-7)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4670,13 +4670,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int finallyBlockright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		FinallyClause finallyBlock = (FinallyClause)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block tryBlock = new Block(tryBlockStartleft, tryBlockEndright, tryList);
-	Block catchBlock = new Block(catchBlockStartleft, catchBlockEndright, catchList);
-	CatchClause catchClause = new CatchClause(catch_wordleft, catchBlockEndright, classNames, var, catchBlock);
-	((LinkedList) catchesList).addFirst(catchClause);
-	int end = finallyBlock == null ? catchesListright : finallyBlockright;
-	TryStatement tryStatement = new TryStatement(startleft, end, tryBlock, catchesList, finallyBlock);
-	RESULT = tryStatement;
+    Block tryBlock = new Block(tryBlockStartleft, tryBlockEndright, tryList);
+    Block catchBlock = new Block(catchBlockStartleft, catchBlockEndright, catchList);
+    CatchClause catchClause = new CatchClause(catch_wordleft, catchBlockEndright, classNames, var, catchBlock);
+    ((LinkedList) catchesList).addFirst(catchClause);
+    int end = finallyBlock == null ? catchesListright : finallyBlockright;
+    TryStatement tryStatement = new TryStatement(startleft, end, tryBlock, catchesList, finallyBlock);
+    RESULT = tryStatement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-13)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4696,7 +4696,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ThrowStatement(tokenleft, endright, expr);
+    RESULT = new ThrowStatement(tokenleft, endright, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4716,7 +4716,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new GotoStatement(sleft, eright, new Identifier(labelleft, labelright, label));
+    RESULT = new GotoStatement(sleft, eright, new Identifier(labelleft, labelright, label));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4730,8 +4730,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int theErrorright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object theError = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ASTError error = new ASTError(theErrorleft, theErrorright);
-	RESULT = error;
+    ASTError error = new ASTError(theErrorleft, theErrorright);
+    RESULT = error;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4745,7 +4745,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varCommentright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String varComment = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	// TODO: var comment should be added as parser.ast node
+    // TODO: var comment should be added as parser.ast node
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_statement",13, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4759,7 +4759,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("additional_catches",128, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4770,8 +4770,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("additional_catches",128, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4785,9 +4785,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int catch_statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		CatchClause catch_statement = (CatchClause)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(catch_statement);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(catch_statement);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_additional_catches",129, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4804,8 +4804,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int catch_statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		CatchClause catch_statement = (CatchClause)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(catch_statement);
-	RESULT = list;
+    list.add(catch_statement);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_additional_catches",129, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4834,10 +4834,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int catchBlockEndright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object catchBlockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block catchBlock = new Block(catchBlockStartleft, catchBlockEndright, catchList);
-	Variable variable = new Variable(varleft, varright, var);
-	CatchClause catchClause = new CatchClause(catch_wordleft, catchBlockEndright, classNames, variable, catchBlock);
-	RESULT = catchClause;
+    Block catchBlock = new Block(catchBlockStartleft, catchBlockEndright, catchList);
+    Variable variable = new Variable(varleft, varright, var);
+    CatchClause catchClause = new CatchClause(catch_wordleft, catchBlockEndright, classNames, variable, catchBlock);
+    RESULT = catchClause;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("additional_catch",130, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-7)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4872,8 +4872,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		Object finallyBlockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
     Block finallyBlock = new Block(finallyBlockStartleft, finallyBlockEndright, finallyList);
-	FinallyClause finallyClause = new FinallyClause(finally_wordleft, finallyBlockEndright, finallyBlock);
-	RESULT = finallyClause;
+    FinallyClause finallyClause = new FinallyClause(finally_wordleft, finallyBlockEndright, finallyBlock);
+    RESULT = finallyClause;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("additional_finally",135, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4890,8 +4890,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	((LinkedList) list).addFirst(className);
-	RESULT = list;
+    ((LinkedList) list).addFirst(className);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("catch_class_names",131, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4905,7 +4905,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("additional_catch_class_names",132, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4916,8 +4916,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("additional_catch_class_names",132, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4931,9 +4931,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(className);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(className);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_additional_catch_class_names",133, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4950,8 +4950,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(className);
-	RESULT = list;
+    list.add(className);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_additional_catch_class_names",133, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4965,7 +4965,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		NamespaceName className = (NamespaceName)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = className;
+    RESULT = className;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("additional_catch_class_name",134, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4979,9 +4979,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(var);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(var);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unset_variables",14, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -4998,8 +4998,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(var);
-	RESULT = list;
+    list.add(var);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unset_variables",14, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5013,7 +5013,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unset_variable",15, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5027,8 +5027,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_filename",16, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5048,8 +5048,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(startleft, endright, scalar, Scalar.Type.STRING);
-	RESULT = s;
+    Scalar s = new Scalar(startleft, endright, scalar, Scalar.Type.STRING);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_filename",16, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5063,7 +5063,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int functionDeclarationright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		FunctionDeclaration functionDeclaration = (FunctionDeclaration)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = functionDeclaration;
+    RESULT = functionDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_declaration_statement",125, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5077,7 +5077,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classDeclarationright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement classDeclaration = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = classDeclaration;
+    RESULT = classDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_declaration_statement",126, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5088,7 +5088,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Boolean RESULT =null;
 
-	RESULT = Boolean.FALSE;
+    RESULT = Boolean.FALSE;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("is_reference",43, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5099,7 +5099,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Boolean RESULT =null;
 
-	RESULT = Boolean.TRUE;
+    RESULT = Boolean.TRUE;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("is_reference",43, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5110,7 +5110,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Boolean RESULT =null;
 
-	RESULT = Boolean.FALSE;
+    RESULT = Boolean.FALSE;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("is_variadic",44, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5121,7 +5121,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Boolean RESULT =null;
 
-	RESULT = Boolean.TRUE;
+    RESULT = Boolean.TRUE;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("is_variadic",44, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5156,10 +5156,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int blockEndright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object blockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier functionId = new Identifier(functionNameleft, functionNameright, functionName);
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, blockEndright, functionId, paramList, returnType, block, isReference.booleanValue());
-	RESULT = functionDeclaration;
+    Identifier functionId = new Identifier(functionNameleft, functionNameright, functionName);
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, blockEndright, functionId, paramList, returnType, block, isReference.booleanValue());
+    RESULT = functionDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_function_declaration_statement",136, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-9)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5191,10 +5191,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int blockEndright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object blockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier classId = new Identifier(classNameleft, classNameright, className);
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	ClassDeclaration classDeclaration = new ClassDeclaration(modifierleft ,blockEndright, modifier, classId, superClass, interfaces, block);
-	RESULT = classDeclaration;
+    Identifier classId = new Identifier(classNameleft, classNameright, className);
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    ClassDeclaration classDeclaration = new ClassDeclaration(modifierleft ,blockEndright, modifier, classId, superClass, interfaces, block);
+    RESULT = classDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_class_declaration_statement",137, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-6)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5223,10 +5223,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int blockEndright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object blockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier classId = new Identifier(classNameleft, classNameright, className);
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	InterfaceDeclaration interfaceDeclaration = new InterfaceDeclaration(startleft ,blockEndright, classId, interfaces, block);
-	RESULT = interfaceDeclaration;
+    Identifier classId = new Identifier(classNameleft, classNameright, className);
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    InterfaceDeclaration interfaceDeclaration = new InterfaceDeclaration(startleft ,blockEndright, classId, interfaces, block);
+    RESULT = interfaceDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_class_declaration_statement",137, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5252,10 +5252,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int blockEndright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object blockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier traitId = new Identifier(traitNameleft, traitNameright, traitName);
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	TraitDeclaration traitDeclaration = new TraitDeclaration(startleft, blockEndright, traitId, block);
-	RESULT = traitDeclaration;
+    Identifier traitId = new Identifier(traitNameleft, traitNameright, traitName);
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    TraitDeclaration traitDeclaration = new TraitDeclaration(startleft, blockEndright, traitId, block);
+    RESULT = traitDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("unticked_class_declaration_statement",137, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5272,8 +5272,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int interfaceStatementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement interfaceStatement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(interfaceStatement);
-	RESULT = list;
+    list.add(interfaceStatement);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("interface_statement_list",100, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5284,8 +5284,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("interface_statement_list",100, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5305,10 +5305,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int constantStart = modifier == null ? listleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.IMPLICIT_PUBLIC : modifier;
-	ConstantDeclaration classConstantDeclaration = new ConstantDeclaration(constantStart, endright, modifier, list, false);
-	RESULT = classConstantDeclaration;
+    int constantStart = modifier == null ? listleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.IMPLICIT_PUBLIC : modifier;
+    ConstantDeclaration classConstantDeclaration = new ConstantDeclaration(constantStart, endright, modifier, list, false);
+    RESULT = classConstantDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("interface_statement",101, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5340,12 +5340,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int methodStart = modifier == null ? startleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
-        Block block = new Block(endleft, endright, Collections.EMPTY_LIST, false);
-	FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, endright, functionId, paramList, returnType, block, isReference.booleanValue());
-	MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, endright, modifier.intValue(), functionDeclaration, true);
-	RESULT = methodDeclaration;
+    int methodStart = modifier == null ? startleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
+    Block block = new Block(endleft, endright, Collections.EMPTY_LIST, false);
+    FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, endright, functionId, paramList, returnType, block, isReference.booleanValue());
+    MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, endright, modifier.intValue(), functionDeclaration, true);
+    RESULT = methodDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("interface_statement",101, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-8)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5376,8 +5376,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int traitStatementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement traitStatement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(traitStatement);
-	RESULT = list;
+    list.add(traitStatement);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("trait_statement_list",98, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5388,8 +5388,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("trait_statement_list",98, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5409,8 +5409,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
-	RESULT = fieldsDeclaration;
+    FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
+    RESULT = fieldsDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("trait_statement",99, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5442,11 +5442,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int bodyright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Block body = (Block)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int methodStart = modifier == null ? startleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
-	FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, bodyright, functionId, paramList, returnType, body, isReference.booleanValue());
-	MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, bodyright, modifier.intValue(), functionDeclaration, true);
-	RESULT = methodDeclaration;
+    int methodStart = modifier == null ? startleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
+    FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, bodyright, functionId, paramList, returnType, body, isReference.booleanValue());
+    MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, bodyright, modifier.intValue(), functionDeclaration, true);
+    RESULT = methodDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("trait_statement",99, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-8)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5480,7 +5480,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int bodyright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Block body = (Block)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UseTraitStatement(sleft, bodyright, list, body);
+    RESULT = new UseTraitStatement(sleft, bodyright, list, body);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("trait_statement",99, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5491,7 +5491,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               ClassDeclaration.Modifier RESULT =null;
 
-	RESULT = ClassDeclaration.Modifier.NONE;
+    RESULT = ClassDeclaration.Modifier.NONE;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_entry_type",138, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5502,7 +5502,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               ClassDeclaration.Modifier RESULT =null;
 
-	RESULT = ClassDeclaration.Modifier.ABSTRACT;
+    RESULT = ClassDeclaration.Modifier.ABSTRACT;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_entry_type",138, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5513,7 +5513,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               ClassDeclaration.Modifier RESULT =null;
 
-	RESULT = ClassDeclaration.Modifier.FINAL;
+    RESULT = ClassDeclaration.Modifier.FINAL;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_entry_type",138, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5524,7 +5524,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Expression RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("extends_from",139, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5538,7 +5538,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		NamespaceName className = (NamespaceName)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = className;
+    RESULT = className;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("extends_from",139, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5571,8 +5571,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("interface_extends_list",90, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5586,7 +5586,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("interface_extends_list",90, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5597,8 +5597,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("implements_list",140, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5612,7 +5612,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("implements_list",140, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5626,9 +5626,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		NamespaceName className = (NamespaceName)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(className);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(className);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("interface_list",141, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5645,8 +5645,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		NamespaceName className = (NamespaceName)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(className);
-	RESULT = list;
+    list.add(className);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("interface_list",141, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5657,7 +5657,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Expression RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("foreach_optional_arg",17, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5671,7 +5671,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression var = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("foreach_optional_arg",17, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5685,7 +5685,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("foreach_variable",18, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5702,8 +5702,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Reference reference = new Reference (startleft, varright, var);
-	RESULT = reference;
+    Reference reference = new Reference (startleft, varright, var);
+    RESULT = reference;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("foreach_variable",18, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5723,8 +5723,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
-	RESULT = vars;
+    ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
+    RESULT = vars;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("foreach_variable",18, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5744,8 +5744,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.NEW);
-	RESULT = vars;
+    ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.NEW);
+    RESULT = vars;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("foreach_variable",18, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5759,7 +5759,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("for_statement",19, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5776,8 +5776,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
 		List statementList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
 
-	Block block = new Block(startleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(startleft, statementListright, statementList, false);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("for_statement",19, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5791,7 +5791,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("foreach_statement",20, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5808,8 +5808,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
 		List statementList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
 
-	Block block = new Block(startleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(startleft, statementListright, statementList, false);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("foreach_statement",20, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5823,7 +5823,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("declare_statement",21, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5840,8 +5840,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
 		List statementList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
 
-	Block block = new Block(startleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(startleft, statementListright, statementList, false);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("declare_statement",21, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5858,15 +5858,15 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int valueright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression value = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List listKeys = new LinkedList();
-	List listValues = new LinkedList();
+    List listKeys = new LinkedList();
+    List listValues = new LinkedList();
 
-	Identifier id = new Identifier(keyleft, keyright, key);
-	listKeys.add(id);
-	listValues.add(value);
+    Identifier id = new Identifier(keyleft, keyright, key);
+    listKeys.add(id);
+    listValues.add(value);
 
-	List[] returnList = new List[] { listKeys, listValues };
-	RESULT = returnList;
+    List[] returnList = new List[] { listKeys, listValues };
+    RESULT = returnList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("declare_list",22, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5886,10 +5886,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int valueright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression value = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier id = new Identifier(keyleft, keyright, key);
-	lists[0].add(id);
-	lists[1].add(value);
-	RESULT = lists;
+    Identifier id = new Identifier(keyleft, keyright, key);
+    lists[0].add(id);
+    lists[1].add(value);
+    RESULT = lists;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("declare_list",22, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5909,8 +5909,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(startleft, endright, caseList);
-	RESULT = block;
+    Block block = new Block(startleft, endright, caseList);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("switch_case_list",23, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5930,8 +5930,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(startleft, endright, caseList);
-	RESULT = block;
+    Block block = new Block(startleft, endright, caseList);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("switch_case_list",23, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5951,8 +5951,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(startleft, endright, caseList, false);
-	RESULT = block;
+    Block block = new Block(startleft, endright, caseList, false);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("switch_case_list",23, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5972,8 +5972,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(startleft, endright, caseList, false);
-	RESULT = block;
+    Block block = new Block(startleft, endright, caseList, false);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("switch_case_list",23, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -5984,7 +5984,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList(); // of SwitchCase
+    RESULT = new LinkedList(); // of SwitchCase
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("case_list",24, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6007,12 +6007,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementsright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List statements = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	SwitchCase switchCase = new SwitchCase(tokenleft, statementsright, expr, statements, false);
-	if (caseList == null) {
-		caseList = new LinkedList(); // of switchCase
-	}
-	caseList.add(switchCase);
-	RESULT = caseList;
+    SwitchCase switchCase = new SwitchCase(tokenleft, statementsright, expr, statements, false);
+    if (caseList == null) {
+        caseList = new LinkedList(); // of switchCase
+    }
+    caseList.add(switchCase);
+    RESULT = caseList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("case_list",24, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6032,12 +6032,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementsright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List statements = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	SwitchCase switchCase = new SwitchCase(tokenleft, statementsright, null, statements, true);
-	if (caseList == null) {
-		caseList = new LinkedList(); // of SwitchCase
-	}
-	caseList.add(switchCase);
-	RESULT = caseList;
+    SwitchCase switchCase = new SwitchCase(tokenleft, statementsright, null, statements, true);
+    if (caseList == null) {
+        caseList = new LinkedList(); // of SwitchCase
+    }
+    caseList.add(switchCase);
+    RESULT = caseList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("case_list",24, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6069,7 +6069,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("while_statement",26, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6086,8 +6086,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
 		List statementList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
 
-	Block block = new Block(colonleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(colonleft, statementListright, statementList, false);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("while_statement",26, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6098,13 +6098,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List[] RESULT =null;
 
-	List listConditions = new LinkedList();
-	List listStatements = new LinkedList();
-	List listTokens = new LinkedList();
+    List listConditions = new LinkedList();
+    List listStatements = new LinkedList();
+    List listTokens = new LinkedList();
 
-	List[] returnList = new List[] { listConditions, listStatements, listTokens };
+    List[] returnList = new List[] { listConditions, listStatements, listTokens };
 
-	RESULT = returnList;
+    RESULT = returnList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("elseif_list",27, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6127,11 +6127,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int iftrueright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement iftrue = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	((LinkedList)elseifList[0]).addFirst(condition);
-	((LinkedList)elseifList[1]).addFirst(iftrue);
-	((LinkedList)elseifList[2]).addFirst(Integer.valueOf(tokenleft));
+    ((LinkedList)elseifList[0]).addFirst(condition);
+    ((LinkedList)elseifList[1]).addFirst(iftrue);
+    ((LinkedList)elseifList[2]).addFirst(Integer.valueOf(tokenleft));
 
-	RESULT = elseifList;
+    RESULT = elseifList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("elseif_list",27, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6142,13 +6142,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List[] RESULT =null;
 
-	List listConditions = new LinkedList();
-	List listStatements = new LinkedList();
-	List listTokens = new LinkedList();
+    List listConditions = new LinkedList();
+    List listStatements = new LinkedList();
+    List listTokens = new LinkedList();
 
-	List[] returnList = new List[] { listConditions, listStatements, listTokens };
+    List[] returnList = new List[] { listConditions, listStatements, listTokens };
 
-	RESULT = returnList;
+    RESULT = returnList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("new_elseif_list",28, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6174,12 +6174,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List statementList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(colonleft, statementListright, statementList, false);
-	((LinkedList)elseifList[0]).addFirst(condition);
-	((LinkedList)elseifList[1]).addFirst(block);
-	((LinkedList)elseifList[2]).addFirst(Integer.valueOf(tokenleft));
+    Block block = new Block(colonleft, statementListright, statementList, false);
+    ((LinkedList)elseifList[0]).addFirst(condition);
+    ((LinkedList)elseifList[1]).addFirst(block);
+    ((LinkedList)elseifList[2]).addFirst(Integer.valueOf(tokenleft));
 
-	RESULT = elseifList;
+    RESULT = elseifList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("new_elseif_list",28, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-6)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6190,7 +6190,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Statement RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("else_single",29, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6204,7 +6204,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = statement;
+    RESULT = statement;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("else_single",29, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6215,7 +6215,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Statement RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("new_else_single",30, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6232,8 +6232,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List statementList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(colonleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(colonleft, statementListright, statementList, false);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("new_else_single",30, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6247,7 +6247,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("parameter_list",31, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6258,8 +6258,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("parameter_list",31, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6273,9 +6273,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int parameterright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		FormalParameter parameter = (FormalParameter)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(parameter);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(parameter);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_parameter_list",34, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6292,8 +6292,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int parameterright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		FormalParameter parameter = (FormalParameter)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(parameter);
-	RESULT = list;
+    list.add(parameter);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_parameter_list",34, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6313,14 +6313,14 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int start = classType == null ? (isVariadic ? isVariadicleft : varleft) : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
+    int start = classType == null ? (isVariadic ? isVariadicleft : varleft) : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
         Expression argument = v;
         if (isVariadic) {
             argument = new Variadic(isVariadicleft, varright, v);
         }
-	FormalParameter parameter = new FormalParameter(start, varright, classType, argument);
-	RESULT = parameter;
+    FormalParameter parameter = new FormalParameter(start, varright, classType, argument);
+    RESULT = parameter;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("parameter",35, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6340,11 +6340,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int start = classType == null ? refleft : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
-	Reference ref_var = new Reference (refleft, varright, v);
-	FormalParameter parameter = new FormalParameter(start, varright, classType, ref_var);
-	RESULT = parameter;
+    int start = classType == null ? refleft : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
+    Reference ref_var = new Reference (refleft, varright, v);
+    FormalParameter parameter = new FormalParameter(start, varright, classType, ref_var);
+    RESULT = parameter;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("parameter",35, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6367,12 +6367,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int start = classType == null ? refleft : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
-	Variadic variadic = new Variadic(ellleft, varright, v);
-	Reference ref_var = new Reference (refleft, varright, variadic);
-	FormalParameter parameter = new FormalParameter(start, varright, classType, ref_var);
-	RESULT = parameter;
+    int start = classType == null ? refleft : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
+    Variadic variadic = new Variadic(ellleft, varright, v);
+    Reference ref_var = new Reference (refleft, varright, variadic);
+    FormalParameter parameter = new FormalParameter(start, varright, classType, ref_var);
+    RESULT = parameter;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("parameter",35, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6395,14 +6395,14 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression scalar = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int start = classType == null ? (isVariadic ? isVariadicleft : varleft) : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
+    int start = classType == null ? (isVariadic ? isVariadicleft : varleft) : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
         Expression argument = v;
         if (isVariadic) {
             argument = new Variadic(isVariadicleft, varright, v);
         }
-	FormalParameter parameter = new FormalParameter(start, scalarright, classType, argument, scalar);
-	RESULT = parameter;
+    FormalParameter parameter = new FormalParameter(start, scalarright, classType, argument, scalar);
+    RESULT = parameter;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("parameter",35, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6425,11 +6425,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression scalar = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int start = classType == null ? refleft : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
-	Reference ref_var = new Reference (refleft, varright, v);
-	FormalParameter parameter = new FormalParameter(start, scalarright, classType, ref_var, scalar);
-	RESULT = parameter;
+    int start = classType == null ? refleft : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
+    Reference ref_var = new Reference (refleft, varright, v);
+    FormalParameter parameter = new FormalParameter(start, scalarright, classType, ref_var, scalar);
+    RESULT = parameter;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("parameter",35, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6440,7 +6440,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Expression RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("optional_return_type",144, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6457,7 +6457,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = className;
+    RESULT = className;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("optional_return_type",144, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6477,7 +6477,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NullableType(nullableleft, classNameright, className);
+    RESULT = new NullableType(nullableleft, classNameright, className);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("optional_return_type",144, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6488,7 +6488,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Expression RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("optional_class_type",142, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6502,7 +6502,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = className;
+    RESULT = className;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("optional_class_type",142, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6519,7 +6519,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NullableType(startleft, classNameright, className);
+    RESULT = new NullableType(startleft, classNameright, className);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("optional_class_type",142, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6533,7 +6533,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		NamespaceName className = (NamespaceName)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = className;
+    RESULT = className;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_type",143, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6547,8 +6547,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int arrayright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String array = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier classId = new Identifier(arrayleft, arrayright, "array");
-	RESULT = classId;
+    Identifier classId = new Identifier(arrayleft, arrayright, "array");
+    RESULT = classId;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_type",143, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6562,8 +6562,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int callableright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String callable = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier classId = new Identifier(callableleft, callableright, "callable");
-	RESULT = classId;
+    Identifier classId = new Identifier(callableleft, callableright, "callable");
+    RESULT = classId;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_type",143, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6577,7 +6577,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int paramsListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
 		List paramsList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
 
-	RESULT = paramsList;
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call_parameter_list",36, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6588,7 +6588,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call_parameter_list",36, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6605,13 +6605,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression var = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List paramsList = new LinkedList();
-	Expression param = var;
+    List paramsList = new LinkedList();
+    Expression param = var;
         if (isVariadic) {
             param = new Variadic(isVariadicleft, varright, var);
         }
-	paramsList.add(param);
-	RESULT = paramsList;
+    paramsList.add(param);
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_function_call_parameter_list",37, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6628,13 +6628,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List paramsList = new LinkedList();
-	Expression param = var;
+    List paramsList = new LinkedList();
+    Expression param = var;
         if (isVariadic) {
             param = new Variadic(isVariadicleft, varright, var);
         }
-	paramsList.add(param);
-	RESULT = paramsList;
+    paramsList.add(param);
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_function_call_parameter_list",37, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6651,10 +6651,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List paramsList = new LinkedList();
-	Expression var_ref = new Reference(startleft, varright, var);
-	paramsList.add(var_ref);
-	RESULT = paramsList;
+    List paramsList = new LinkedList();
+    Expression var_ref = new Reference(startleft, varright, var);
+    paramsList.add(var_ref);
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_function_call_parameter_list",37, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6674,12 +6674,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression var = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        Expression param = var;
-        if (isVariadic) {
-            param = new Variadic(isVariadicleft, varright, var);
-        }
-	paramsList.add(param);
-	RESULT = paramsList;
+    Expression param = var;
+    if (isVariadic) {
+        param = new Variadic(isVariadicleft, varright, var);
+    }
+    paramsList.add(param);
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_function_call_parameter_list",37, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6699,12 +6699,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Expression param = var;
-        if (isVariadic) {
-            param = new Variadic(isVariadicleft, varright, var);
-        }
-	paramsList.add(param);
-	RESULT = paramsList;
+    Expression param = var;
+    if (isVariadic) {
+        param = new Variadic(isVariadicleft, varright, var);
+    }
+    paramsList.add(param);
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_function_call_parameter_list",37, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6724,9 +6724,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Expression var_ref = new Reference(startleft, varright, var);
-	paramsList.add(var_ref);
-	RESULT = paramsList;
+    Expression var_ref = new Reference(startleft, varright, var);
+    paramsList.add(var_ref);
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_function_call_parameter_list",37, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6743,8 +6743,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(var);
-	RESULT = list;
+    list.add(var);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("global_var_list",38, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6758,9 +6758,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(var);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(var);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("global_var_list",38, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6774,8 +6774,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable variable = new Variable(varleft, varright, var);
-	RESULT = variable;
+    Variable variable = new Variable(varleft, varright, var);
+    RESULT = variable;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("global_var",39, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6792,8 +6792,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ReflectionVariable ref = new ReflectionVariable(startleft, varright, var);
-	RESULT = ref;
+    ReflectionVariable ref = new ReflectionVariable(startleft, varright, var);
+    RESULT = ref;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("global_var",39, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6813,8 +6813,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ReflectionVariable var = new ReflectionVariable(startleft, endright, varName);
-	RESULT = var;
+    ReflectionVariable var = new ReflectionVariable(startleft, endright, varName);
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("global_var",39, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6831,9 +6831,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable v = new Variable(varleft, varright, var);
-	list.add(v);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    list.add(v);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_var_list",40, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6853,10 +6853,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable v = new Variable(varleft, varright, var);
-	Assignment assignment = new Assignment(varleft, exprright, v, Assignment.Type.EQUAL, expr);
-	list.add(assignment);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    Assignment assignment = new Assignment(varleft, exprright, v, Assignment.Type.EQUAL, expr);
+    list.add(assignment);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_var_list",40, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6870,10 +6870,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable v = new Variable(varleft, varright, var);
-	List list = new LinkedList();
-	list.add(v);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    List list = new LinkedList();
+    list.add(v);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_var_list",40, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6890,11 +6890,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable v = new Variable(varleft, varright, var);
-	Assignment assignment = new Assignment(varleft, exprright, v, Assignment.Type.EQUAL, expr);
-	List list = new LinkedList();
-	list.add(assignment);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    Assignment assignment = new Assignment(varleft, exprright, v, Assignment.Type.EQUAL, expr);
+    List list = new LinkedList();
+    list.add(assignment);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_var_list",40, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6911,8 +6911,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classStatementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement classStatement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(classStatement);
-	RESULT = list;
+    list.add(classStatement);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_statement_list",41, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6923,8 +6923,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_statement_list",41, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6944,8 +6944,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
-	RESULT = fieldsDeclaration;
+    FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
+    RESULT = fieldsDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_statement",42, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -6965,10 +6965,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int constantStart = modifier == null ? listleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.IMPLICIT_PUBLIC : modifier;
-	ConstantDeclaration classConstantDeclaration = new ConstantDeclaration(constantStart, endright, modifier, list, false);
-	RESULT = classConstantDeclaration;
+    int constantStart = modifier == null ? listleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.IMPLICIT_PUBLIC : modifier;
+    ConstantDeclaration classConstantDeclaration = new ConstantDeclaration(constantStart, endright, modifier, list, false);
+    RESULT = classConstantDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_statement",42, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7000,11 +7000,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int bodyright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Block body = (Block)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	int methodStart = modifier == null ? startleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
-	FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, bodyright, functionId, paramList, returnType, body, isReference.booleanValue());
-	MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, bodyright, modifier.intValue(), functionDeclaration, true);
-	RESULT = methodDeclaration;
+    int methodStart = modifier == null ? startleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
+    FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, bodyright, functionId, paramList, returnType, body, isReference.booleanValue());
+    MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, bodyright, modifier.intValue(), functionDeclaration, true);
+    RESULT = methodDeclaration;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_statement",42, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-8)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7038,7 +7038,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int bodyright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Block body = (Block)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UseTraitStatement(sleft, bodyright, list, body);
+    RESULT = new UseTraitStatement(sleft, bodyright, list, body);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_statement",42, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7055,8 +7055,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int useDeclright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		UseTraitStatementPart useDecl = (UseTraitStatementPart)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(useDecl);
-	RESULT = list;
+    list.add(useDecl);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_traits",91, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7070,9 +7070,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int useDeclright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		UseTraitStatementPart useDecl = (UseTraitStatementPart)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(useDecl);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(useDecl);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_traits",91, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7086,7 +7086,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UseTraitStatementPart(listleft, listright, new NamespaceName(listleft, listright, list, false, false));
+    RESULT = new UseTraitStatementPart(listleft, listright, new NamespaceName(listleft, listright, list, false, false));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_trait",102, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7103,7 +7103,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UseTraitStatementPart(sleft, listright, new NamespaceName(sleft, listright, list, true, false));
+    RESULT = new UseTraitStatementPart(sleft, listright, new NamespaceName(sleft, listright, list, true, false));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_trait",102, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7137,8 +7137,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(startleft, endright, statementList);
-	RESULT = block;
+    Block block = new Block(startleft, endright, statementList);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_traits_body",92, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7155,11 +7155,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int statementright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Statement statement = (Statement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	// Ignore null statements
-	if(statement != null) {
-		statementList.add(statement);
-	}
-	RESULT = statementList;
+    // Ignore null statements
+    if(statement != null) {
+        statementList.add(statement);
+    }
+    RESULT = statementList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_traits_body_statement_list",93, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7170,7 +7170,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("use_traits_body_statement_list",93, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7215,8 +7215,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	classNameList.add(className);
-	RESULT = classNameList;
+    classNameList.add(className);
+    RESULT = classNameList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_name_list",173, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7230,9 +7230,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List classNameList = new LinkedList();
-	classNameList.add(className);
-	RESULT = classNameList;
+    List classNameList = new LinkedList();
+    classNameList.add(className);
+    RESULT = classNameList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_name_list",173, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7402,7 +7402,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               TraitMethodAliasDeclaration.Modifier RESULT =null;
 
-	RESULT = TraitMethodAliasDeclaration.Modifier.PUBLIC;
+    RESULT = TraitMethodAliasDeclaration.Modifier.PUBLIC;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("traits_alias_modifier",97, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7413,7 +7413,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               TraitMethodAliasDeclaration.Modifier RESULT =null;
 
-	RESULT = TraitMethodAliasDeclaration.Modifier.PROTECTED;
+    RESULT = TraitMethodAliasDeclaration.Modifier.PROTECTED;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("traits_alias_modifier",97, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7424,7 +7424,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               TraitMethodAliasDeclaration.Modifier RESULT =null;
 
-	RESULT = TraitMethodAliasDeclaration.Modifier.PRIVATE;
+    RESULT = TraitMethodAliasDeclaration.Modifier.PRIVATE;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("traits_alias_modifier",97, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7435,7 +7435,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Block RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_body",122, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7455,8 +7455,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Block block = new Block(startleft, endright, statementList);
-	RESULT = block;
+    Block block = new Block(startleft, endright, statementList);
+    RESULT = block;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_body",122, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7467,7 +7467,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("constant_modifiers",120, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7481,7 +7481,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Integer modifier = (Integer)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = modifier;
+    RESULT = modifier;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("constant_modifiers",120, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7560,7 +7560,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = ASTPHP5Parser.PUBLIC;
+    RESULT = ASTPHP5Parser.PUBLIC;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable_modifiers",146, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7571,7 +7571,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7632,8 +7632,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7652,8 +7652,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7672,8 +7672,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7692,8 +7692,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7712,8 +7712,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7732,8 +7732,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7755,9 +7755,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7779,9 +7779,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7803,9 +7803,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7827,9 +7827,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7851,9 +7851,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7875,9 +7875,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_modifiers",121, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7899,7 +7899,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = ASTPHP5Parser.PUBLIC;
+    RESULT = ASTPHP5Parser.PUBLIC;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("ppp_modifiers",155, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7910,7 +7910,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = ASTPHP5Parser.PROTECTED;
+    RESULT = ASTPHP5Parser.PROTECTED;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("ppp_modifiers",155, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7921,7 +7921,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = ASTPHP5Parser.PRIVATE;
+    RESULT = ASTPHP5Parser.PRIVATE;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("ppp_modifiers",155, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7932,7 +7932,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = ASTPHP5Parser.ABSTRACT;
+    RESULT = ASTPHP5Parser.ABSTRACT;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("af_modifiers",156, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7943,7 +7943,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = ASTPHP5Parser.FINAL;
+    RESULT = ASTPHP5Parser.FINAL;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("af_modifiers",156, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7960,9 +7960,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable varId = new Variable(varleft, varright, var);
-	list.add(new ASTNode[] {varId, null});
-	RESULT = list;
+    Variable varId = new Variable(varleft, varright, var);
+    list.add(new ASTNode[] {varId, null});
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_variable_declaration",113, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7982,9 +7982,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable varId = new Variable(varleft, varright, var);
-	list.add(new ASTNode[] {varId, expr});
-	RESULT = list;
+    Variable varId = new Variable(varleft, varright, var);
+    list.add(new ASTNode[] {varId, expr});
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_variable_declaration",113, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -7998,10 +7998,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	Variable varId = new Variable(varleft, varright, var);
-	list.add(new ASTNode[] {varId, null});
-	RESULT = list;
+    List list = new LinkedList();
+    Variable varId = new Variable(varleft, varright, var);
+    list.add(new ASTNode[] {varId, null});
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_variable_declaration",113, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8018,10 +8018,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	Variable varId = new Variable(varleft, varright, var);
-	list.add(new ASTNode[] {varId, expr});
-	RESULT = list;
+    List list = new LinkedList();
+    Variable varId = new Variable(varleft, varright, var);
+    list.add(new ASTNode[] {varId, expr});
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_variable_declaration",113, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8041,9 +8041,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier constId = new Identifier(constNameleft, constNameright, constName);
-	list.add(new ASTNode[] {constId, expr});
-	RESULT = list;
+    Identifier constId = new Identifier(constNameleft, constNameright, constName);
+    list.add(new ASTNode[] {constId, expr});
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("constant_declaration",119, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8060,10 +8060,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	Identifier constId = new Identifier(constNameleft, constNameright, constName);
-	list.add(new ASTNode[] {constId, expr});
-	RESULT = list;
+    List list = new LinkedList();
+    Identifier constId = new Identifier(constNameleft, constNameright, constName);
+    list.add(new ASTNode[] {constId, expr});
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("constant_declaration",119, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8083,8 +8083,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(new ASTNode[] {constName, expr});
-	RESULT = list;
+    list.add(new ASTNode[] {constName, expr});
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_constant_declaration",118, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8101,9 +8101,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(new ASTNode[] {constId, expr});
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new ASTNode[] {constId, expr});
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_constant_declaration",118, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8120,8 +8120,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	exprList.add(expr);
-	RESULT = exprList;
+    exprList.add(expr);
+    RESULT = exprList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("echo_expr_list",45, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8135,9 +8135,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List exprList = new LinkedList();
-	exprList.add(expr);
-	RESULT = exprList;
+    List exprList = new LinkedList();
+    exprList.add(expr);
+    RESULT = exprList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("echo_expr_list",45, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8148,7 +8148,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("for_expr",46, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8162,7 +8162,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List exprList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = exprList;
+    RESULT = exprList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("for_expr",46, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8179,8 +8179,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	exprList.add(expr);
-	RESULT = exprList;
+    exprList.add(expr);
+    RESULT = exprList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_for_expr",47, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8194,9 +8194,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List exprList = new LinkedList();
-	exprList.add(expr);
-	RESULT = exprList;
+    List exprList = new LinkedList();
+    exprList.add(expr);
+    RESULT = exprList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_for_expr",47, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8224,7 +8224,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ClassInstanceCreation ex = (ClassInstanceCreation)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = ex;
+    RESULT = ex;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable",48, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8244,8 +8244,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int ctorright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List ctor = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(startleft, ctorright, className, ctor);
-	RESULT = classInstanceCreation;
+    ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(startleft, ctorright, className, ctor);
+    RESULT = classInstanceCreation;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable",48, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8262,8 +8262,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	CloneExpression clone = new CloneExpression(startleft, exprright, expr);
-	RESULT = clone;
+    CloneExpression clone = new CloneExpression(startleft, exprright, expr);
+    RESULT = clone;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable",48, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8286,9 +8286,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ListVariable vars = new ListVariable(startleft, closeright, varList, ListVariable.SyntaxType.OLD);
-	Assignment list = new Assignment(startleft, exprright, vars, Assignment.Type.EQUAL, expr);
-	RESULT = list;
+    ListVariable vars = new ListVariable(startleft, closeright, varList, ListVariable.SyntaxType.OLD);
+    Assignment list = new Assignment(startleft, exprright, vars, Assignment.Type.EQUAL, expr);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8311,9 +8311,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ListVariable vars = new ListVariable(startleft, closeright, varList, ListVariable.SyntaxType.NEW);
-	Assignment list = new Assignment(startleft, exprright, vars, Assignment.Type.EQUAL, expr);
-	RESULT = list;
+    ListVariable vars = new ListVariable(startleft, closeright, varList, ListVariable.SyntaxType.NEW);
+    Assignment list = new Assignment(startleft, exprright, vars, Assignment.Type.EQUAL, expr);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8330,7 +8330,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var, Assignment.Type.EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var, Assignment.Type.EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8350,7 +8350,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int refvarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase refvar = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, refvarright, var, Assignment.Type.EQUAL, new Reference(reftokenleft, refvarright, refvar));
+    RESULT = new Assignment(varleft, refvarright, var, Assignment.Type.EQUAL, new Reference(reftokenleft, refvarright, refvar));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8376,10 +8376,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int ctorright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List ctor = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(startleft, ctorright, className, ctor);
-	Reference reference = new Reference(reftokenleft, ctorright, classInstanceCreation);
-	Assignment assignment = new Assignment(varleft, ctorright, var, Assignment.Type.EQUAL, reference);
-	RESULT = assignment;
+    ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(startleft, ctorright, className, ctor);
+    Reference reference = new Reference(reftokenleft, ctorright, classInstanceCreation);
+    Assignment assignment = new Assignment(varleft, ctorright, var, Assignment.Type.EQUAL, reference);
+    RESULT = assignment;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8396,7 +8396,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.POW_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.POW_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8413,7 +8413,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.PLUS_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.PLUS_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8430,7 +8430,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MINUS_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MINUS_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8447,7 +8447,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MUL_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MUL_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8464,7 +8464,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.DIV_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.DIV_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8481,7 +8481,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.CONCAT_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.CONCAT_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8498,7 +8498,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MOD_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MOD_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8515,7 +8515,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.AND_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.AND_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8532,7 +8532,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.OR_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.OR_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8549,7 +8549,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.XOR_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.XOR_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8566,7 +8566,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.SL_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.SL_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8583,7 +8583,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.SR_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.SR_EQUAL, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8600,7 +8600,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int tokenright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object token = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new PostfixExpression(varleft, tokenright, var , PostfixExpression.Operator.INC);
+    RESULT = new PostfixExpression(varleft, tokenright, var , PostfixExpression.Operator.INC);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8617,7 +8617,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new PrefixExpression(tokenleft, varright, var , PrefixExpression.Operator.INC);
+    RESULT = new PrefixExpression(tokenleft, varright, var , PrefixExpression.Operator.INC);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8634,7 +8634,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int tokenright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object token = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new PostfixExpression(varleft, tokenright, var , PostfixExpression.Operator.DEC);
+    RESULT = new PostfixExpression(varleft, tokenright, var , PostfixExpression.Operator.DEC);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8651,7 +8651,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new PrefixExpression(tokenleft, varright, var , PrefixExpression.Operator.DEC);
+    RESULT = new PrefixExpression(tokenleft, varright, var , PrefixExpression.Operator.DEC);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8668,7 +8668,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_OR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8685,7 +8685,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_AND, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8702,7 +8702,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_OR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8719,7 +8719,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_AND, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8736,7 +8736,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_XOR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_XOR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8753,7 +8753,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.OR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8770,7 +8770,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.AND, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8787,7 +8787,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.XOR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.XOR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8804,7 +8804,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.CONCAT, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.CONCAT, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8821,7 +8821,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.POW, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.POW, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8838,7 +8838,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.PLUS, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.PLUS, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8855,7 +8855,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MINUS, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MINUS, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8872,7 +8872,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MUL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MUL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8889,7 +8889,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.DIV, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.DIV, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8906,7 +8906,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MOD, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MOD, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8923,7 +8923,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8940,7 +8940,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8957,7 +8957,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.PLUS);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.PLUS);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8974,7 +8974,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.MINUS);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.MINUS);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -8991,7 +8991,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.NOT);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.NOT);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9008,7 +9008,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.TILDA);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.TILDA);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9025,7 +9025,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_IDENTICAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_IDENTICAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9042,7 +9042,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_IDENTICAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_IDENTICAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9059,7 +9059,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_EQUAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9076,7 +9076,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_EQUAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9093,7 +9093,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.RGREATER, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.RGREATER, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9110,7 +9110,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_SMALLER_OR_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_SMALLER_OR_EQUAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9140,7 +9140,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.LGREATER, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.LGREATER, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9157,7 +9157,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_GREATER_OR_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_GREATER_OR_EQUAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9174,7 +9174,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SPACESHIP, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SPACESHIP, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9191,7 +9191,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ClassName className = (ClassName)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new InstanceOfExpression(exprleft, classNameright, expr , className);
+    RESULT = new InstanceOfExpression(exprleft, classNameright, expr , className);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9225,7 +9225,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int ifFalseright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression ifFalse = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ConditionalExpression(conditionleft, ifFalseright, condition, ConditionalExpression.OperatorType.QUESTION_MARK, ifTrue, ifFalse);
+    RESULT = new ConditionalExpression(conditionleft, ifFalseright, condition, ConditionalExpression.OperatorType.QUESTION_MARK, ifTrue, ifFalse);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9242,7 +9242,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int ifFalseright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression ifFalse = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.ELVIS, null, ifFalse);
+    RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.ELVIS, null, ifFalse);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9259,7 +9259,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int ifFalseright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression ifFalse = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.COALESCE, null, ifFalse);
+    RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.COALESCE, null, ifFalse);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9273,7 +9273,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9290,7 +9290,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.INT);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.INT);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9307,7 +9307,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.REAL);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.REAL);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9324,7 +9324,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.STRING);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.STRING);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9341,7 +9341,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.ARRAY);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.ARRAY);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9358,7 +9358,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.OBJECT);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.OBJECT);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9375,7 +9375,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.BOOL);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.BOOL);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9392,7 +9392,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.UNSET);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.UNSET);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9409,14 +9409,14 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List expList = new LinkedList();
-	if (expr != null) {
-		expList.add(expr);
-	}
-	Identifier id = new Identifier(startleft, startright, start);
-	FunctionName name = new FunctionName(startleft, startright, id);
-	FunctionInvocation result = new FunctionInvocation(startleft, exprright, name, expList);
-	RESULT = result;
+    List expList = new LinkedList();
+    if (expr != null) {
+        expList.add(expr);
+    }
+    Identifier id = new Identifier(startleft, startright, start);
+    FunctionName name = new FunctionName(startleft, startright, id);
+    FunctionInvocation result = new FunctionInvocation(startleft, exprright, name, expList);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9433,8 +9433,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	IgnoreError ignoreError = new IgnoreError(startleft, exprright, expr);
-	RESULT = ignoreError;
+    IgnoreError ignoreError = new IgnoreError(startleft, exprright, expr);
+    RESULT = ignoreError;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9448,7 +9448,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression scalar = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = scalar;
+    RESULT = scalar;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9462,7 +9462,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int arrayright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression array = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = array;
+    RESULT = array;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9482,8 +9482,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	BackTickExpression backTickExpression = new BackTickExpression(startleft, endright, list);
-	RESULT = backTickExpression;
+    BackTickExpression backTickExpression = new BackTickExpression(startleft, endright, list);
+    RESULT = backTickExpression;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9500,14 +9500,14 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List expList = new LinkedList();
-	if (expr != null) {
-		expList.add(expr);
-	}
-	Identifier id = new Identifier(startleft, startright, "print");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	FunctionInvocation result = new FunctionInvocation(startleft, exprright, name, expList);
-	RESULT = result;
+    List expList = new LinkedList();
+    if (expr != null) {
+        expList.add(expr);
+    }
+    Identifier id = new Identifier(startleft, startright, "print");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    FunctionInvocation result = new FunctionInvocation(startleft, exprright, name, expList);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9542,8 +9542,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int blockEndright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object blockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new LambdaFunctionDeclaration(sleft, blockEndright, paramList, returnType, varsList,
-		new Block(blockStartleft, blockEndright, list), isReference.booleanValue(), false);
+    RESULT = new LambdaFunctionDeclaration(sleft, blockEndright, paramList, returnType, varsList,
+        new Block(blockStartleft, blockEndright, list), isReference.booleanValue(), false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-9)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9581,8 +9581,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int blockEndright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object blockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new LambdaFunctionDeclaration(sleft, blockEndright, paramList, returnType, varsList,
-		new Block(blockStartleft, blockEndright, list), isReference.booleanValue(), true);
+    RESULT = new LambdaFunctionDeclaration(sleft, blockEndright, paramList, returnType, varsList,
+        new Block(blockStartleft, blockEndright, list), isReference.booleanValue(), true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_without_variable_and_class_instance",49, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-10)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9607,7 +9607,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("lexical_vars",32, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9627,7 +9627,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("lexical_vars",32, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9644,9 +9644,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable v = new Variable(varleft, varright, var);
-	list.add(v);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    list.add(v);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("lexical_var_list",33, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9666,8 +9666,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(new Reference (refleft, varright, new Variable(varleft, varright, var)));
-	RESULT = list;
+    list.add(new Reference (refleft, varright, new Variable(varleft, varright, var)));
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("lexical_var_list",33, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9681,9 +9681,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(new Variable(varleft, varright, var));
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new Variable(varleft, varright, var));
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("lexical_var_list",33, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9700,9 +9700,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String var = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(new Reference (refleft, varright, new Variable(varleft, varright, var)));
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new Reference (refleft, varright, new Variable(varleft, varright, var)));
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("lexical_var_list",33, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9722,9 +9722,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new FunctionInvocation(listleft, eright,
-		new FunctionName(listleft, listright,
-			new NamespaceName(listleft, listright, list, false, false)), parameters);
+    RESULT = new FunctionInvocation(listleft, eright,
+        new FunctionName(listleft, listright,
+            new NamespaceName(listleft, listright, list, false, false)), parameters);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9747,9 +9747,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new FunctionInvocation(sleft, eright,
-		new FunctionName(sleft, listright,
-			new NamespaceName(sleft, listright, list, false, true)), parameters);
+    RESULT = new FunctionInvocation(sleft, eright,
+        new FunctionName(sleft, listright,
+            new NamespaceName(sleft, listright, list, false, true)), parameters);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9772,9 +9772,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new FunctionInvocation(sleft, eright,
-		new FunctionName(sleft, listright,
-			new NamespaceName(sleft, listright, list, true, false)), parameters);
+    RESULT = new FunctionInvocation(sleft, eright,
+        new FunctionName(sleft, listright,
+            new NamespaceName(sleft, listright, list, true, false)), parameters);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9797,9 +9797,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(fnleft, eright,
-			new FunctionName(fnleft, fnright, fn), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(fnleft, eright,
+            new FunctionName(fnleft, fnright, fn), parameters));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9822,9 +9822,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(reflectionNameleft, eright,
-			new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(reflectionNameleft, eright,
+            new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9854,9 +9854,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
     ReflectionVariable reflectionVariable = new ReflectionVariable(oleft, cright, expr);
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(oleft, eright,
-			new FunctionName(oleft, cright, reflectionVariable), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(oleft, eright,
+            new FunctionName(oleft, cright, reflectionVariable), parameters));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-7)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9879,9 +9879,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(fnleft, eright,
-			new FunctionName(fnleft, fnright, fn), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(fnleft, eright,
+            new FunctionName(fnleft, fnright, fn), parameters));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9904,9 +9904,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(reflectionNameleft, eright,
-			new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(reflectionNameleft, eright,
+            new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9935,10 +9935,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ReflectionVariable reflectionVariable = new ReflectionVariable(oleft, cright, expr);
+    ReflectionVariable reflectionVariable = new ReflectionVariable(oleft, cright, expr);
     RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(oleft, eright,
-			new FunctionName(oleft, cright, reflectionVariable), parameters));
+        new FunctionInvocation(oleft, eright,
+            new FunctionName(oleft, cright, reflectionVariable), parameters));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-7)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9958,8 +9958,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new FunctionInvocation(reflectionNameleft, eright,
-		new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters);
+    RESULT = new FunctionInvocation(reflectionNameleft, eright,
+        new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -9979,8 +9979,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new FunctionInvocation(startleft, eright,
-		new FunctionName(startleft, startright, start), parameters);
+    RESULT = new FunctionInvocation(startleft, eright,
+        new FunctionName(startleft, startright, start), parameters);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10017,8 +10017,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new FunctionInvocation(callleft, eright,
-		new FunctionName(callleft, callright, call), parameters);
+    RESULT = new FunctionInvocation(callleft, eright,
+        new FunctionName(callleft, callright, call), parameters);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("function_call",51, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10032,7 +10032,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ParenthesisExpression expr = (ParenthesisExpression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("callable_expr",50, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10046,7 +10046,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int dereferencableVariableright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase dereferencableVariable = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = dereferencableVariable;
+    RESULT = dereferencableVariable;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("callable_expr",50, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10060,7 +10060,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int fmaright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase fma = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = fma;
+    RESULT = fma;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("callable_expr",50, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10080,8 +10080,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	AnonymousObjectVariable anonymous= new AnonymousObjectVariable(startleft, endright, cls);
-	RESULT = anonymous;
+    AnonymousObjectVariable anonymous= new AnonymousObjectVariable(startleft, endright, cls);
+    RESULT = anonymous;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("callable_expr",50, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10107,9 +10107,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(nleft, ctorright, className, ctor);
-	AnonymousObjectVariable anonymous = new AnonymousObjectVariable(startleft, endright, classInstanceCreation);
-	RESULT = anonymous;
+    ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(nleft, ctorright, className, ctor);
+    AnonymousObjectVariable anonymous = new AnonymousObjectVariable(startleft, endright, classInstanceCreation);
+    RESULT = anonymous;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("callable_expr",50, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10123,7 +10123,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
+    RESULT = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("callable_expr",50, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10137,7 +10137,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int arrayright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression array = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = array;
+    RESULT = array;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("callable_expr",50, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10151,7 +10151,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int sright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String s = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Identifier(sleft, sright, "static");
+    RESULT = new Identifier(sleft, sright, "static");
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_name",111, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10165,7 +10165,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(listleft, listright, list, false, false);
+    RESULT = new NamespaceName(listleft, listright, list, false, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_name",111, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10182,7 +10182,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_name",111, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10199,7 +10199,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_name",111, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10213,7 +10213,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(listleft, listright, list, false, false);
+    RESULT = new NamespaceName(listleft, listright, list, false, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("fully_qualified_class_name",112, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10230,7 +10230,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("fully_qualified_class_name",112, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10247,7 +10247,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("fully_qualified_class_name",112, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10261,7 +10261,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression className = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ClassName(classNameleft, classNameright, className);
+    RESULT = new ClassName(classNameleft, classNameright, className);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_name_reference",157, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10275,7 +10275,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ClassName className = (ClassName)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = className;
+    RESULT = className;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_name_reference",157, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10295,23 +10295,23 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int propertyListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List propertyList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	// then get the aggregated list of properties (->...->...->...)
-	LinkedList list = (LinkedList) propertyList;
-	list.addFirst(firstVarProperty);
-
-	// now create the dispatch(es) nodes
-	VariableBase dispatch = null;
-	VariableBase dispatcher = var;
-	Iterator listIt = list.iterator();
-	while (listIt.hasNext()) {
-		VariableBase property = (VariableBase)listIt.next();
-		dispatch = parser.createDispatch(dispatcher, property);
-		dispatcher = dispatch;
-	}
+    // then get the aggregated list of properties (->...->...->...)
+    LinkedList list = (LinkedList) propertyList;
+    list.addFirst(firstVarProperty);
+
+    // now create the dispatch(es) nodes
+    VariableBase dispatch = null;
+    VariableBase dispatcher = var;
+    Iterator listIt = list.iterator();
+    while (listIt.hasNext()) {
+        VariableBase property = (VariableBase)listIt.next();
+        dispatch = parser.createDispatch(dispatcher, property);
+        dispatcher = dispatch;
+    }
 
-	// create class name from the dispatch
-	ClassName name = new ClassName(varleft, propertyListright, dispatch);
-	RESULT = name;
+    // create class name from the dispatch
+    ClassName name = new ClassName(varleft, propertyListright, dispatch);
+    RESULT = name;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("dynamic_class_name_reference",160, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10325,8 +10325,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	 ClassName name = new ClassName(varleft, varright, var);
-	 RESULT = name;
+     ClassName name = new ClassName(varleft, varright, var);
+     RESULT = name;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("dynamic_class_name_reference",160, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10343,8 +10343,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	variables.add(var);
-	RESULT = variables;
+    variables.add(var);
+    RESULT = variables;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("dynamic_class_name_variable_properties",164, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10355,7 +10355,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("dynamic_class_name_variable_properties",164, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10369,7 +10369,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("dynamic_class_name_variable_property",165, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10380,7 +10380,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Expression RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("exit_expr",52, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10391,7 +10391,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Expression RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("exit_expr",52, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10405,7 +10405,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
 
-	RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("exit_expr",52, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10416,7 +10416,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("ctor_arguments",53, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10430,7 +10430,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int paramsListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
 		List paramsList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
 
-	RESULT = paramsList;
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("ctor_arguments",53, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10444,8 +10444,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.INT);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.INT);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10459,8 +10459,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.REAL);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.REAL);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10474,8 +10474,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10489,8 +10489,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, "__LINE__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__LINE__", Scalar.Type.SYSTEM);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10504,8 +10504,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, "__FILE__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__FILE__", Scalar.Type.SYSTEM);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10519,7 +10519,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Scalar(scalarleft, scalarright, "__DIR__", Scalar.Type.SYSTEM);
+    RESULT = new Scalar(scalarleft, scalarright, "__DIR__", Scalar.Type.SYSTEM);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10533,8 +10533,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, "__CLASS__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__CLASS__", Scalar.Type.SYSTEM);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10548,8 +10548,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, "__TRAIT__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__TRAIT__", Scalar.Type.SYSTEM);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10563,8 +10563,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, "__METHOD__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__METHOD__", Scalar.Type.SYSTEM);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10578,8 +10578,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar s = new Scalar(scalarleft, scalarright, "__FUNCTION__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__FUNCTION__", Scalar.Type.SYSTEM);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10593,7 +10593,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Scalar(scalarleft, scalarright, "__NAMESPACE__", Scalar.Type.SYSTEM);
+    RESULT = new Scalar(scalarleft, scalarright, "__NAMESPACE__", Scalar.Type.SYSTEM);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10613,8 +10613,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        Scalar s = new Scalar(startleft, endright, scalar, Scalar.Type.STRING);
-        RESULT = s;
+    Scalar s = new Scalar(startleft, endright, scalar, Scalar.Type.STRING);
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10631,8 +10631,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        Scalar s = new Scalar(startleft, endright, "", Scalar.Type.STRING); //NOI18N
-        RESULT = s;
+    Scalar s = new Scalar(startleft, endright, "", Scalar.Type.STRING); //NOI18N
+    RESULT = s;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("common_scalar",54, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10646,7 +10646,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression scalar = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = scalar;
+    RESULT = scalar;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_scalar_value",56, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10660,17 +10660,17 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	if (list.size() == 1) {
-            String itemName = ((Identifier)list.get(0)).getName();
-            String itemNameLower = itemName.toLowerCase();
-            if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) { //NOI18N
-                RESULT = new Scalar(listleft, listright, itemName, Scalar.Type.STRING);
-            } else {
-                RESULT = new NamespaceName(listleft, listright, list, false, false);
-            }
-	} else {
+    if (list.size() == 1) {
+        String itemName = ((Identifier)list.get(0)).getName();
+        String itemNameLower = itemName.toLowerCase();
+        if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) { //NOI18N
+            RESULT = new Scalar(listleft, listright, itemName, Scalar.Type.STRING);
+        } else {
             RESULT = new NamespaceName(listleft, listright, list, false, false);
-	}
+        }
+    } else {
+        RESULT = new NamespaceName(listleft, listright, list, false, false);
+    }
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_scalar_value",56, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10687,7 +10687,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_scalar_value",56, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10704,7 +10704,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_scalar_value",56, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10718,7 +10718,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classConstantright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		StaticConstantAccess classConstant = (StaticConstantAccess)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = classConstant;
+    RESULT = classConstant;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_scalar_value",56, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10732,7 +10732,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int docright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Quote doc = (Quote)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = doc;
+    RESULT = doc;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_scalar_value",56, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10746,7 +10746,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int operationright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression operation = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = operation;
+    RESULT = operation;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_scalar_value",56, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10839,7 +10839,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.PLUS, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.PLUS, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10856,7 +10856,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MINUS, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MINUS, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10873,7 +10873,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MUL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MUL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10890,7 +10890,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.POW, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.POW, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10907,7 +10907,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.DIV, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.DIV, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10937,7 +10937,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MOD, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MOD, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10954,7 +10954,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.NOT);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.NOT);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10971,7 +10971,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.TILDA);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.TILDA);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -10988,7 +10988,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.OR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11005,7 +11005,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.AND, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11022,7 +11022,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.XOR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.XOR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11039,7 +11039,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11056,7 +11056,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11073,7 +11073,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.CONCAT, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.CONCAT, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11090,7 +11090,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_XOR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_XOR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11107,7 +11107,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_AND, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11124,7 +11124,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_OR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11141,7 +11141,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_AND, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11158,7 +11158,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_OR, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11175,7 +11175,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_IDENTICAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_IDENTICAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11192,7 +11192,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_IDENTICAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_IDENTICAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11209,7 +11209,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_EQUAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11226,7 +11226,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_EQUAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11243,7 +11243,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.RGREATER, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.RGREATER, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11260,7 +11260,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.LGREATER, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.LGREATER, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11277,7 +11277,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_SMALLER_OR_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_SMALLER_OR_EQUAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11294,7 +11294,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_GREATER_OR_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_GREATER_OR_EQUAL, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11311,7 +11311,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int expr2right = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr2 = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SPACESHIP, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SPACESHIP, expr2);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11328,7 +11328,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int ifFalseright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression ifFalse = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.ELVIS, null, ifFalse);
+    RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.ELVIS, null, ifFalse);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11348,7 +11348,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int ifFalseright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression ifFalse = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new ConditionalExpression(conditionleft, ifFalseright, condition, ConditionalExpression.OperatorType.QUESTION_MARK, ifTrue, ifFalse);
+    RESULT = new ConditionalExpression(conditionleft, ifFalseright, condition, ConditionalExpression.OperatorType.QUESTION_MARK, ifTrue, ifFalse);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11365,7 +11365,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int ifFalseright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression ifFalse = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-        RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.COALESCE, null, ifFalse);
+    RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.COALESCE, null, ifFalse);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11382,8 +11382,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	UnaryOperation op = new UnaryOperation(startleft, exprright, expr, UnaryOperation.Operator.PLUS);
-	RESULT = op;
+    UnaryOperation op = new UnaryOperation(startleft, exprright, expr, UnaryOperation.Operator.PLUS);
+    RESULT = op;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11400,8 +11400,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	UnaryOperation op = new UnaryOperation(startleft, exprright, expr, UnaryOperation.Operator.MINUS);
-	RESULT = op;
+    UnaryOperation op = new UnaryOperation(startleft, exprright, expr, UnaryOperation.Operator.MINUS);
+    RESULT = op;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11415,7 +11415,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
 
-        RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_operation",57, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11429,7 +11429,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression scalar = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = scalar;
+    RESULT = scalar;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_scalar",55, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11446,7 +11446,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int constantright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression constant = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
+    RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_class_constant",166, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11460,7 +11460,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int arrayAccessright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression arrayAccess = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = arrayAccess;
+    RESULT = arrayAccess;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_reference_constant",167, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11474,7 +11474,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int constantNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Identifier constantName = (Identifier)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = constantName;
+    RESULT = constantName;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_reference_constant",167, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11497,7 +11497,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ExpressionArrayAccess(arrayAccessleft, endright, arrayAccess, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(arrayAccessleft, endright, arrayAccess, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_class_constant_array_access",170, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11520,7 +11520,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ExpressionArrayAccess(constantNameleft, endright, constantName, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(constantNameleft, endright, constantName, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_class_constant_array_access",170, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11543,7 +11543,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ExpressionArrayAccess(arrayAccessleft, endright, arrayAccess, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(arrayAccessleft, endright, arrayAccess, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_constant_array_access",169, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11566,7 +11566,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ExpressionArrayAccess(constantNameleft, endright, new Identifier(constantNameleft, constantNameright, constantName), new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(constantNameleft, endright, new Identifier(constantNameleft, constantNameright, constantName), new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_constant_array_access",169, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11589,7 +11589,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ExpressionArrayAccess(namespaceleft, endright, namespace, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(namespaceleft, endright, namespace, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_constant_array_access",169, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11646,8 +11646,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.OLD);
-	RESULT = expr;
+    Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.OLD);
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_array_creation",171, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11667,8 +11667,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.NEW);
-	RESULT = expr;
+    Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.NEW);
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_array_creation",171, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11682,7 +11682,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String scalar = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
+    RESULT = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("scalar",58, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11696,7 +11696,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int classConstantright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		StaticConstantAccess classConstant = (StaticConstantAccess)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = classConstant;
+    RESULT = classConstant;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("scalar",58, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11710,17 +11710,17 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	if (list.size() == 1) {
-            String itemName = ((Identifier)list.get(0)).getName();
-            String itemNameLower = itemName.toLowerCase();
-            if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) { //NOI18N
-                RESULT = new Scalar(listleft, listright, itemName, Scalar.Type.STRING);
-            } else {
-                RESULT = new NamespaceName(listleft, listright, list, false, false);
-            }
-	} else {
+    if (list.size() == 1) {
+        String itemName = ((Identifier)list.get(0)).getName();
+        String itemNameLower = itemName.toLowerCase();
+        if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) { //NOI18N
+            RESULT = new Scalar(listleft, listright, itemName, Scalar.Type.STRING);
+        } else {
             RESULT = new NamespaceName(listleft, listright, list, false, false);
-	}
+        }
+    } else {
+        RESULT = new NamespaceName(listleft, listright, list, false, false);
+    }
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("scalar",58, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11737,7 +11737,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("scalar",58, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11754,7 +11754,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("scalar",58, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11768,7 +11768,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int scalarright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression scalar = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = scalar;
+    RESULT = scalar;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("scalar",58, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11788,8 +11788,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Quote quote = new Quote(startleft, endright, list, Quote.Type.QUOTE);
-	RESULT = quote;
+    Quote quote = new Quote(startleft, endright, list, Quote.Type.QUOTE);
+    RESULT = quote;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("scalar",58, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11803,7 +11803,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int docright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Quote doc = (Quote)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = doc;
+    RESULT = doc;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("scalar",58, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11835,8 +11835,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_array_pair_list",59, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11850,7 +11850,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_array_pair_list",59, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11888,9 +11888,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int valueright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression value = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
-	list.add(element);
-	RESULT = list;
+    ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
+    list.add(element);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_static_array_pair_list",61, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11907,9 +11907,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int valueright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression value = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ArrayElement element = new ArrayElement(valueleft, valueright, value);
-	list.add(element);
-	RESULT = list;
+    ArrayElement element = new ArrayElement(valueleft, valueright, value);
+    list.add(element);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_static_array_pair_list",61, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11926,10 +11926,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int valueright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression value = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
-	list.add(element);
-	RESULT = list;
+    List list = new LinkedList();
+    ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
+    list.add(element);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_static_array_pair_list",61, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -11943,10 +11943,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int valueright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression value = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	ArrayElement element = new ArrayElement(valueleft, valueright, value);
-	list.add(element);
-	RESULT = list;
+    List list = new LinkedList();
+    ArrayElement element = new ArrayElement(valueleft, valueright, value);
+    list.add(element);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_static_array_pair_list",61, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12173,7 +12173,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_with_yields",63, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12187,7 +12187,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_with_yields",63, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12201,7 +12201,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("expr_with_yields",63, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12263,7 +12263,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int propertyListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List propertyList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = parser.createDispatch(false, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    RESULT = parser.createDispatch(false, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("field_or_method_access",104, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12289,7 +12289,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int propertyListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List propertyList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("field_or_method_access",104, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12315,7 +12315,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int propertyListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List propertyList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("field_or_method_access",104, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12341,9 +12341,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int propertyListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List propertyList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	// e.g. ($uvs = new UVS())->method();
-	DereferencableVariable var = new DereferencableVariable(peleft, peright, pe.getExpression());
-	RESULT = parser.createDispatch(false, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    // e.g. ($uvs = new UVS())->method();
+    DereferencableVariable var = new DereferencableVariable(peleft, peright, pe.getExpression());
+    RESULT = parser.createDispatch(false, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("field_or_method_access",104, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12369,9 +12369,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int propertyListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List propertyList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	// e.g. ($uvs = new UVS())::staticMethod();
-	DereferencableVariable var = new DereferencableVariable(peleft, peright, pe.getExpression());
-	RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    // e.g. ($uvs = new UVS())::staticMethod();
+    DereferencableVariable var = new DereferencableVariable(peleft, peright, pe.getExpression());
+    RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("field_or_method_access",104, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12385,7 +12385,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int accright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase acc = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = acc;
+    RESULT = acc;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable",127, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12399,7 +12399,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable",127, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12416,8 +12416,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int variablePropertyright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Pair<Expression,Boolean> variableProperty = (Pair<Expression,Boolean>)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	variables.add(variableProperty);
-	RESULT = variables;
+    variables.add(variableProperty);
+    RESULT = variables;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable_properties",124, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12428,7 +12428,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable_properties",124, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12482,7 +12482,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int paramsListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
 		List paramsList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
 
-	RESULT = paramsList;
+    RESULT = paramsList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_or_not",123, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12493,7 +12493,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("method_or_not",123, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12632,7 +12632,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable_without_objects",148, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12649,13 +12649,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	// the ref_count counts the number of reflection (DOLLAR sign) so now we should
-	// accomulate the dolars into reflection variables
-	Variable finalVar = var;
-	for (int i=0; i<ref_count.intValue(); i++) {
-		finalVar = new ReflectionVariable(ref_countright - i - 1, varright, finalVar);
-	}
-	RESULT = finalVar;
+    // the ref_count counts the number of reflection (DOLLAR sign) so now we should
+    // accomulate the dolars into reflection variables
+    Variable finalVar = var;
+    for (int i=0; i<ref_count.intValue(); i++) {
+        finalVar = new ReflectionVariable(ref_countright - i - 1, varright, finalVar);
+    }
+    RESULT = finalVar;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable_without_objects",148, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12685,7 +12685,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticFieldAccess(classNameleft, varright, className, var);
+    RESULT = new StaticFieldAccess(classNameleft, varright, className, var);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_member",150, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12702,7 +12702,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticFieldAccess(classNameleft, varright, className, var);
+    RESULT = new StaticFieldAccess(classNameleft, varright, className, var);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_member",150, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12716,7 +12716,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable_class_name",69, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12839,7 +12839,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int adright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ArrayDimension ad = (ArrayDimension)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ExpressionArrayAccess(namespaceleft, adright, namespace, ad);
+    RESULT = new ExpressionArrayAccess(namespaceleft, adright, namespace, ad);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("constant_array_access",106, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12893,8 +12893,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.OLD);
-	RESULT = expr;
+    Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.OLD);
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_creation",107, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12915,7 +12915,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
     Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.NEW);
-	RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_creation",107, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12929,7 +12929,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("base_variable",162, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -12943,7 +12943,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int variableright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase variable = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = variable;
+    RESULT = variable;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("base_variable",162, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13031,13 +13031,13 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	// the ref_count counts the number of reflection (DOLLAR sign) so now we should
-	// accomulate the dolars into reflection variables
-	VariableBase finalVar = var;
-	for (int i=0; i<ref_count.intValue(); i++) {
-		finalVar = new ReflectionVariable(ref_countright - i - 1, varright, finalVar);
-	}
-	RESULT = finalVar;
+    // the ref_count counts the number of reflection (DOLLAR sign) so now we should
+    // accomulate the dolars into reflection variables
+    VariableBase finalVar = var;
+    for (int i=0; i<ref_count.intValue(); i++) {
+        finalVar = new ReflectionVariable(ref_countright - i - 1, varright, finalVar);
+    }
+    RESULT = finalVar;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("base_variable_without_reference_variable",163, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13051,7 +13051,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int staticFieldAccessright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase staticFieldAccess = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = staticFieldAccess;
+    RESULT = staticFieldAccess;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("base_variable_without_reference_variable",163, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13065,7 +13065,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int arrayCreationWithAccessright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase arrayCreationWithAccess = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = arrayCreationWithAccess;
+    RESULT = arrayCreationWithAccess;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("base_variable_without_reference_variable",163, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13079,7 +13079,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int dereferencableVariableright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase dereferencableVariable = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = dereferencableVariable;
+    RESULT = dereferencableVariable;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("base_variable_without_reference_variable",163, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13152,8 +13152,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int adright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ArrayDimension ad = (ArrayDimension)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable var = new ArrayAccess(varNameleft, adright, varName, ad);
-	RESULT = var;
+    Variable var = new ArrayAccess(varNameleft, adright, varName, ad);
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reference_variable",68, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13197,8 +13197,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ReflectionVariable var = new ReflectionVariable(startleft, endright, expr);
-	RESULT = var;
+    ReflectionVariable var = new ReflectionVariable(startleft, endright, expr);
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("compound_variable",70, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13209,7 +13209,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Expression RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("dim_offset",71, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13223,7 +13223,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = expr;
+    RESULT = expr;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("dim_offset",71, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13237,7 +13237,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_property",75, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13251,7 +13251,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression var = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("static_property",75, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13265,7 +13265,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("object_property",76, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13279,7 +13279,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("object_property",76, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13296,8 +13296,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int adright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ArrayDimension ad = (ArrayDimension)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable varArray = new ArrayAccess(varleft, adright, var, ad);
-	RESULT = varArray;
+    Variable varArray = new ArrayAccess(varleft, adright, var, ad);
+    RESULT = varArray;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("object_dim_list",77, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13323,7 +13323,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String varName = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Variable(varNameleft, varNameright, varName);
+    RESULT = new Variable(varNameleft, varNameright, varName);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable_name",78, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13343,7 +13343,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ReflectionVariable(startleft, endright, expr);
+    RESULT = new ReflectionVariable(startleft, endright, expr);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("variable_name",78, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13354,7 +13354,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               Integer RESULT =null;
 
-	RESULT = Integer.valueOf(1);
+    RESULT = Integer.valueOf(1);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("simple_indirect_reference",79, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13368,7 +13368,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int refright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
 		Integer ref = (Integer)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
 
-	RESULT = Integer.valueOf(1 + ref.intValue());
+    RESULT = Integer.valueOf(1 + ref.intValue());
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("simple_indirect_reference",79, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13382,7 +13382,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = list;
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_pair_list",80, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13399,10 +13399,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int pairright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ArrayElement pair = (ArrayElement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	if(pair != null) {
-		list.add(pair);
-	}
-	RESULT = list;
+    if(pair != null) {
+        list.add(pair);
+    }
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_array_pair_list",83, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13416,11 +13416,11 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int pairright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ArrayElement pair = (ArrayElement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	if(pair != null) {
-		list.add(pair);
-	}
-	RESULT = list;
+    List list = new LinkedList();
+    if(pair != null) {
+        list.add(pair);
+    }
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("non_empty_array_pair_list",83, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13431,7 +13431,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               ArrayElement RESULT =null;
 
-	RESULT = null;
+    RESULT = null;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("possible_array_pair",81, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13445,7 +13445,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int pairright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ArrayElement pair = (ArrayElement)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = pair;
+    RESULT = pair;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("possible_array_pair",81, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13462,8 +13462,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int valueright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression value = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
-	RESULT = element;
+    ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
+    RESULT = element;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_pair",82, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13477,8 +13477,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ArrayElement element = new ArrayElement(exprleft, exprright, expr);
-	RESULT = element;
+    ArrayElement element = new ArrayElement(exprleft, exprright, expr);
+    RESULT = element;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_pair",82, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13498,9 +13498,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Reference value = new Reference(startleft, varright, var);
-	ArrayElement element = new ArrayElement(exprleft, varright, expr, value);
-	RESULT = element;
+    Reference value = new Reference(startleft, varright, var);
+    ArrayElement element = new ArrayElement(exprleft, varright, expr, value);
+    RESULT = element;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_pair",82, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13517,9 +13517,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Reference ref = new Reference(startleft, varright, var);
-	ArrayElement element = new ArrayElement(startleft, varright, ref);
-	RESULT = element;
+    Reference ref = new Reference(startleft, varright, var);
+    ArrayElement element = new ArrayElement(startleft, varright, ref);
+    RESULT = element;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_pair",82, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13542,9 +13542,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ListVariable value = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
-	ArrayElement element = new ArrayElement(exprleft, endright, expr, value);
-	RESULT = element;
+    ListVariable value = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
+    ArrayElement element = new ArrayElement(exprleft, endright, expr, value);
+    RESULT = element;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_pair",82, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13564,9 +13564,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
-        ArrayElement element = new ArrayElement(startleft, endright, vars);
-	RESULT = element;
+    ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
+    ArrayElement element = new ArrayElement(startleft, endright, vars);
+    RESULT = element;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("array_pair",82, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13583,8 +13583,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	list.add(var);
-	RESULT = list;
+    list.add(var);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_list",84, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13601,9 +13601,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int stringright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String string = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar scalar = new Scalar(stringleft, stringright, string, string == null ? Scalar.Type.UNKNOWN : Scalar.Type.STRING);
-	list.add(scalar);
-	RESULT = list;
+    Scalar scalar = new Scalar(stringleft, stringright, string, string == null ? Scalar.Type.UNKNOWN : Scalar.Type.STRING);
+    list.add(scalar);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_list",84, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13614,7 +13614,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
             {
               List RESULT =null;
 
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_list",84, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13628,7 +13628,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var",85, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13651,8 +13651,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable var = new ArrayAccess(varNameleft, endright, varName, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
-	RESULT = var;
+    Variable var = new ArrayAccess(varNameleft, endright, varName, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var",85, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13669,9 +13669,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int stringright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String string = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable property = new Variable(stringleft, stringright, string);
-	VariableBase dispatch = parser.createDispatch(var, property);
-	RESULT = dispatch;
+    Variable property = new Variable(stringleft, stringright, string);
+    VariableBase dispatch = parser.createDispatch(var, property);
+    RESULT = dispatch;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var",85, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13691,8 +13691,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ReflectionVariable var = new ReflectionVariable(startleft, endright, expr);
-	RESULT = var;
+    ReflectionVariable var = new ReflectionVariable(startleft, endright, expr);
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var",85, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13721,9 +13721,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Variable var = new Variable(varNameleft, varNameright, varName);
-	Variable indexedVar = new ArrayAccess(startleft, endright, var, new ArrayDimension(oleft, cright, index, ArrayDimension.Type.VARIABLE_ARRAY));
-	RESULT = indexedVar;
+    Variable var = new Variable(varNameleft, varNameright, varName);
+    Variable indexedVar = new ArrayAccess(startleft, endright, var, new ArrayDimension(oleft, cright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = indexedVar;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var",85, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-5)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13743,8 +13743,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	ReflectionVariable ref = new ReflectionVariable(startleft, endright, var);
-	RESULT = ref;
+    ReflectionVariable ref = new ReflectionVariable(startleft, endright, var);
+    RESULT = ref;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var",85, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13758,8 +13758,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int stringright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String string = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier id = new Identifier(stringleft, stringright, string);
-	RESULT = id;
+    Identifier id = new Identifier(stringleft, stringright, string);
+    RESULT = id;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var_offset",86, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13773,8 +13773,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int numright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String num = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Scalar scalar = new Scalar(numleft,numright, num, Scalar.Type.REAL);
-	RESULT = scalar;
+    Scalar scalar = new Scalar(numleft,numright, num, Scalar.Type.REAL);
+    RESULT = scalar;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var_offset",86, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13788,7 +13788,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Variable var = (Variable)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("encaps_var_offset",86, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13808,10 +13808,10 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier id = new Identifier(startleft, startright, "isset");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	FunctionInvocation result = new FunctionInvocation(startleft, endright, name, varList);
-	RESULT = result;
+    Identifier id = new Identifier(startleft, startright, "isset");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    FunctionInvocation result = new FunctionInvocation(startleft, endright, name, varList);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("internal_functions_in_yacc",87, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13831,12 +13831,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier id = new Identifier(startleft, startright, "empty");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	LinkedList varList = new LinkedList();
-	varList.add(var);
-	FunctionInvocation result = new FunctionInvocation(startleft, endright, name, varList);
-	RESULT = result;
+    Identifier id = new Identifier(startleft, startright, "empty");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    LinkedList varList = new LinkedList();
+    varList.add(var);
+    FunctionInvocation result = new FunctionInvocation(startleft, endright, name, varList);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("internal_functions_in_yacc",87, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13856,12 +13856,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier id = new Identifier(startleft, startright, "empty");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	LinkedList exprList = new LinkedList();
-	exprList.add(expr);
-	FunctionInvocation result = new FunctionInvocation(startleft, endright, name, exprList);
-	RESULT = result;
+    Identifier id = new Identifier(startleft, startright, "empty");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    LinkedList exprList = new LinkedList();
+    exprList.add(expr);
+    FunctionInvocation result = new FunctionInvocation(startleft, endright, name, exprList);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("internal_functions_in_yacc",87, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13878,8 +13878,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Include result = new Include(includeleft, exprright, expr, Include.Type.INCLUDE);
-	RESULT = result;
+    Include result = new Include(includeleft, exprright, expr, Include.Type.INCLUDE);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("internal_functions_in_yacc",87, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13896,8 +13896,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Include result = new Include(includeleft, exprright, expr, Include.Type.INCLUDE_ONCE);
-	RESULT = result;
+    Include result = new Include(includeleft, exprright, expr, Include.Type.INCLUDE_ONCE);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("internal_functions_in_yacc",87, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13917,12 +13917,12 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Identifier id = new Identifier(startleft, startright, "eval");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	LinkedList exprList = new LinkedList();
-	exprList.add(expr);
-	FunctionInvocation result = new FunctionInvocation(startleft, endright, name, exprList);
-	RESULT = result;
+    Identifier id = new Identifier(startleft, startright, "eval");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    LinkedList exprList = new LinkedList();
+    exprList.add(expr);
+    FunctionInvocation result = new FunctionInvocation(startleft, endright, name, exprList);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("internal_functions_in_yacc",87, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13939,8 +13939,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Include result = new Include(includeleft, exprright, expr, Include.Type.REQUIRE);
-	RESULT = result;
+    Include result = new Include(includeleft, exprright, expr, Include.Type.REQUIRE);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("internal_functions_in_yacc",87, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13957,8 +13957,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int exprright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression expr = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	Include result = new Include(includeleft, exprright, expr, Include.Type.REQUIRE_ONCE);
-	RESULT = result;
+    Include result = new Include(includeleft, exprright, expr, Include.Type.REQUIRE_ONCE);
+    RESULT = result;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("internal_functions_in_yacc",87, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13972,9 +13972,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression var = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	List list = new LinkedList();
-	list.add(var);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(var);
+    RESULT = list;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("isset_variables",151, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -13991,8 +13991,8 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression var = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	varList.add(var);
-	RESULT = varList;
+    varList.add(var);
+    RESULT = varList;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("isset_variables",151, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14006,7 +14006,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		VariableBase var = (VariableBase)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = var;
+    RESULT = var;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("isset_variable",152, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14020,7 +14020,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int arrayAccessright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression arrayAccess = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = arrayAccess;
+    RESULT = arrayAccess;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("isset_variable",152, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14037,7 +14037,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int arrayAccessright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression arrayAccess = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticConstantAccess(classNameleft, arrayAccessright, className, arrayAccess);
+    RESULT = new StaticConstantAccess(classNameleft, arrayAccessright, className, arrayAccess);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("isset_variable",152, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14054,7 +14054,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int arrayAccessright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression arrayAccess = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticConstantAccess(classNameleft, arrayAccessright, className, arrayAccess);
+    RESULT = new StaticConstantAccess(classNameleft, arrayAccessright, className, arrayAccess);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("isset_variable",152, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14071,7 +14071,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int constantright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression constant = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
+    RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_constant",158, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14088,7 +14088,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int constantright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Expression constant = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
+    RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_constant",158, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14105,7 +14105,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int adright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		ArrayDimension ad = (ArrayDimension)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new ExpressionArrayAccess(constantleft, adright, constant, ad);
+    RESULT = new ExpressionArrayAccess(constantleft, adright, constant, ad);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reference_constant",159, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14119,7 +14119,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int constantNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Identifier constantName = (Identifier)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = constantName;
+    RESULT = constantName;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("reference_constant",159, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14133,7 +14133,7 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		int varNameright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		String varName = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
-	RESULT = new Variable(varNameleft, varNameright, varName);
+    RESULT = new Variable(varNameleft, varNameright, varName);
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("tracked_variable",153, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
@@ -14193,9 +14193,9 @@ else if (CUP$ASTPHP5Parser$act_num < 700) {
 		Object blockEnd = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
     final int counter = parser.incrementAndGetAnonymousClassCounter();
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	ClassInstanceCreation classInstance = ClassInstanceCreation.anonymous(parser.getFileName(), counter, startleft, blockEndright, cleft, ctor, superClass, interfaces, block);
-	RESULT = classInstance;
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    ClassInstanceCreation classInstance = ClassInstanceCreation.anonymous(parser.getFileName(), counter, startleft, blockEndright, cleft, ctor, superClass, interfaces, block);
+    RESULT = classInstance;
 
               CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("anonymous_class",109, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-7)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Scanner.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Scanner.java
index a7f6ff7039..f22d0a711c 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Scanner.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Scanner.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 18/10/28 6:34 */
+/* The following code was generated by JFlex 1.4.3 on 18/11/04 22:16 */
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java_cup.runtime.*;
-import org.netbeans.modules.php.editor.*;
 import org.netbeans.modules.php.editor.parser.astnodes.*;
 import org.netbeans.modules.web.common.api.ByteStack;
 
@@ -33,7 +32,7 @@
 /**
  * This class is a scanner generated by
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 18/10/28 6:34 from the specification file
+ * on 18/11/04 22:16 from the specification file
  * <tt>/home/junichi11/NetBeansProjects/incubator-netbeans/php/php.editor/tools/ASTPHP5Scanner.flex</tt>
  */
 public class ASTPHP5Scanner implements Scanner {
@@ -1439,19 +1438,19 @@ public int getState() {
     }
 
     public void setInScriptingState() {
-		yybegin(ST_IN_SCRIPTING);
-	}
+        yybegin(ST_IN_SCRIPTING);
+    }
 
-	public void resetCommentList() {
-		commentList.clear();
-	}
+    public void resetCommentList() {
+        commentList.clear();
+    }
 
-	public List getCommentList() {
-		return commentList;
-	}
+    public List getCommentList() {
+        return commentList;
+    }
 
-	protected void addComment(Comment.Type type) {
-		int leftPosition = getTokenStartPosition();
+    protected void addComment(Comment.Type type) {
+        int leftPosition = getTokenStartPosition();
         //System.out.println("#####AddCommnet start: " + commentStartPosition + " end: " + (leftPosition + getTokenLength()) + ", type: " + type);
         Comment comm;
         if (type == Comment.Type.TYPE_PHPDOC) {
@@ -1468,12 +1467,12 @@ else if(type == Comment.Type.TYPE_VARTYPE) {
         else {
             comm = new Comment(commentStartPosition, leftPosition + getTokenLength(), /*ast,*/ type);
         }
-		commentList.add(comm);
-	}
+        commentList.add(comm);
+    }
 
-	public void setUseAspTagsAsPhp(boolean useAspTagsAsPhp) {
-		asp_tags = useAspTagsAsPhp;
-	}
+    public void setUseAspTagsAsPhp(boolean useAspTagsAsPhp) {
+        asp_tags = useAspTagsAsPhp;
+    }
 
     private void pushState(int state) {
         stack.push(zzLexicalState);
@@ -1505,11 +1504,11 @@ private void handleCommentStart() {
     }
 
     private void handleLineCommentEnd() {
-         addComment(Comment.Type.TYPE_SINGLE_LINE);
+        addComment(Comment.Type.TYPE_SINGLE_LINE);
     }
 
     private void handleMultilineCommentEnd() {
-    	addComment(Comment.Type.TYPE_MULTILINE);
+        addComment(Comment.Type.TYPE_MULTILINE);
     }
 
     private void handlePHPDocEnd() {
@@ -1517,8 +1516,8 @@ private void handlePHPDocEnd() {
     }
 
     private void handleVarComment() {
-    	commentStartPosition = getTokenStartPosition();
-    	addComment(Comment.Type.TYPE_VARTYPE);
+        commentStartPosition = getTokenStartPosition();
+        addComment(Comment.Type.TYPE_VARTYPE);
     }
 
     private Symbol createFullSymbol(int symbolNumber) {
@@ -1595,42 +1594,42 @@ private boolean isEndHereOrNowdoc(String hereOrNowdoc) {
     }
 
     public int[] getParamenters(){
-    	return new int[]{zzMarkedPos, zzPushbackPos, zzCurrentPos, zzStartRead, zzEndRead, yyline};
+        return new int[]{zzMarkedPos, zzPushbackPos, zzCurrentPos, zzStartRead, zzEndRead, yyline};
     }
 
-	private boolean parsePHPDoc(){
-		/*final IDocumentorLexer documentorLexer = getDocumentorLexer(zzReader);
-		if(documentorLexer == null){
-			return false;
-		}
-		yypushback(zzMarkedPos - zzStartRead);
-		int[] parameters = getParamenters();
-		documentorLexer.reset(zzReader, zzBuffer, parameters);
-		Object phpDocBlock = documentorLexer.parse();
-		commentList.add(phpDocBlock);
-		reset(zzReader, documentorLexer.getBuffer(), documentorLexer.getParamenters());*/
-
-                //System.out.println("#######ParsePHPDoc()");
-		//return true;
-                return false;
-	}
+    private boolean parsePHPDoc(){
+        /*final IDocumentorLexer documentorLexer = getDocumentorLexer(zzReader);
+        if(documentorLexer == null){
+            return false;
+        }
+        yypushback(zzMarkedPos - zzStartRead);
+        int[] parameters = getParamenters();
+        documentorLexer.reset(zzReader, zzBuffer, parameters);
+        Object phpDocBlock = documentorLexer.parse();
+        commentList.add(phpDocBlock);
+        reset(zzReader, documentorLexer.getBuffer(), documentorLexer.getParamenters());*/
+
+        //System.out.println("#######ParsePHPDoc()");
+        //return true;
+        return false;
+    }
 
 
-	/*protected IDocumentorLexer getDocumentorLexer(java.io.Reader  reader) {
-		return null;
-	}*/
+    /*protected IDocumentorLexer getDocumentorLexer(java.io.Reader  reader) {
+        return null;
+    }*/
 
-	public void reset(java.io.Reader  reader, char[] buffer, int[] parameters){
-		this.zzReader = reader;
-		this.zzBuffer = buffer;
-		this.zzMarkedPos = parameters[0];
-		this.zzPushbackPos = parameters[1];
-		this.zzCurrentPos = parameters[2];
-		this.zzStartRead = parameters[3];
-		this.zzEndRead = parameters[4];
-		this.yyline = parameters[5];
-		this.yychar = this.zzStartRead - this.zzPushbackPos;
-	}
+    public void reset(java.io.Reader  reader, char[] buffer, int[] parameters){
+        this.zzReader = reader;
+        this.zzBuffer = buffer;
+        this.zzMarkedPos = parameters[0];
+        this.zzPushbackPos = parameters[1];
+        this.zzCurrentPos = parameters[2];
+        this.zzStartRead = parameters[3];
+        this.zzEndRead = parameters[4];
+        this.yyline = parameters[5];
+        this.yychar = this.zzStartRead - this.zzPushbackPos;
+    }
 
 
 
@@ -1986,15 +1985,19 @@ else if (zzAtEOF) {
       zzMarkedPos = zzMarkedPosL;
 
       switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+        case 59:
+          { //    yymore();
+          }
+        case 210: break;
         case 208:
           { comment = yytext();
     handleVarComment();
           }
-        case 210: break;
+        case 211: break;
         case 191:
           { return createFullSymbol(ASTPHP5Symbols.T_INTERFACE);
           }
-        case 211: break;
+        case 212: break;
         case 156:
           { int removeChars = (yytext().charAt(0) == 'b')?4:3;
     heredoc = yytext().substring(removeChars).trim();    // for 'b<<<' or '<<<'
@@ -2004,24 +2007,18 @@ else if (zzAtEOF) {
     yybegin(ST_START_HEREDOC);
     return createSymbol(ASTPHP5Symbols.T_START_HEREDOC);
           }
-        case 212: break;
+        case 213: break;
         case 26:
           { return createSymbol(ASTPHP5Symbols.T_OR);
           }
-        case 213: break;
+        case 214: break;
         case 154:
           { return createFullSymbol(ASTPHP5Symbols.T_PRINT);
           }
-        case 214: break;
+        case 215: break;
         case 178:
           { return createSymbol(ASTPHP5Symbols.T_UNSET_CAST);
           }
-        case 215: break;
-        case 35:
-          { handleCommentStart();
-	yybegin(ST_ONE_LINE_COMMENT);
-//	yymore();
-          }
         case 216: break;
         case 1:
           { return createSymbol(ASTPHP5Symbols.T_INLINE_HTML);
@@ -2031,24 +2028,14 @@ else if (zzAtEOF) {
           { return createSymbol(ASTPHP5Symbols.T_RGREATER);
           }
         case 218: break;
-        case 128:
-          { yypushback(1);
-	pushState(ST_VAR_OFFSET);
-	return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
-          }
-        case 219: break;
         case 165:
           { return createFullSymbol(ASTPHP5Symbols.T_GLOBAL);
           }
-        case 220: break;
-        case 59:
-          { //	yymore();
-          }
-        case 221: break;
+        case 219: break;
         case 22:
           { return createSymbol(ASTPHP5Symbols.T_TIMES);
           }
-        case 222: break;
+        case 220: break;
         case 111:
           { String text = yytext();
     if ((text.charAt(1)=='%' && asp_tags)
@@ -2059,21 +2046,21 @@ else if (zzAtEOF) {
         return createSymbol(ASTPHP5Symbols.T_INLINE_HTML);
     }
           }
-        case 223: break;
+        case 221: break;
         case 76:
           { return createSymbol(ASTPHP5Symbols.T_MINUS_EQUAL);
           }
-        case 224: break;
+        case 222: break;
         case 94:
           { return createSymbol(ASTPHP5Symbols.T_BOOLEAN_OR);
           }
-        case 225: break;
+        case 223: break;
         case 12:
           { pushState(ST_IN_SCRIPTING);
     bracket++;
     return createSymbol(ASTPHP5Symbols.T_CURLY_OPEN);
           }
-        case 226: break;
+        case 224: break;
         case 46:
           { /* <ST_END_NOWDOC>{LABEL}";"?[\n\r] */
     nowdoc=null;
@@ -2089,83 +2076,95 @@ else if (zzAtEOF) {
     yypushback(back);
     return createSymbol(ASTPHP5Symbols.T_END_NOWDOC);
           }
-        case 227: break;
-        case 42:
-          { yypushback(1);
-	yybegin(ST_HEREDOC);
-          }
-        case 228: break;
+        case 225: break;
         case 19:
           { return createSymbol(ASTPHP5Symbols.T_CLOSE_PARENTHESE);
           }
-        case 229: break;
+        case 226: break;
         case 47:
           { yypushback(yylength());
     popState();
           }
-        case 230: break;
+        case 227: break;
         case 20:
           { return createSymbol(ASTPHP5Symbols.T_NOT);
           }
-        case 231: break;
-        case 157:
-          { yypushback(3);
-	pushState(ST_LOOKING_FOR_PROPERTY);
-	return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
-          }
-        case 232: break;
+        case 228: break;
         case 28:
           { return createSymbol(ASTPHP5Symbols.T_QUESTION_MARK);
           }
-        case 233: break;
+        case 229: break;
         case 122:
           { return createFullSymbol(ASTPHP5Symbols.T_VAR);
           }
-        case 234: break;
+        case 230: break;
+        case 56:
+          { popState();
+    return createSymbol(ASTPHP5Symbols.T_CLOSE_RECT);
+          }
+        case 231: break;
         case 205:
           { return createFullSymbol(ASTPHP5Symbols.T_FUNC_C);
           }
-        case 235: break;
+        case 232: break;
         case 144:
           { return createFullSymbol(ASTPHP5Symbols.T_TRAIT);
           }
-        case 236: break;
+        case 233: break;
         case 162:
           { return createFullSymbol(ASTPHP5Symbols.T_STATIC);
           }
-        case 237: break;
+        case 234: break;
         case 134:
           { return createFullSymbol(ASTPHP5Symbols.T_EVAL);
           }
-        case 238: break;
+        case 235: break;
         case 164:
           { return createFullSymbol(ASTPHP5Symbols.T_RETURN);
           }
-        case 239: break;
+        case 236: break;
         case 147:
           { return createFullSymbol(ASTPHP5Symbols.T_UNSET);
           }
-        case 240: break;
+        case 237: break;
+        case 127:
+          { if (!parsePHPDoc()) {
+        handleCommentStart();
+        yybegin(ST_DOCBLOCK);
+    }
+          }
+        case 238: break;
         case 87:
           { return createSymbol(ASTPHP5Symbols.T_DIV_EQUAL);
           }
-        case 241: break;
+        case 239: break;
         case 48:
           { popState();
     return createFullSymbol(ASTPHP5Symbols.T_STRING);
           }
-        case 242: break;
+        case 240: break;
         case 202:
           { return createFullSymbol(ASTPHP5Symbols.T_METHOD_C);
           }
-        case 243: break;
+        case 241: break;
         case 198:
           { return createFullSymbol(ASTPHP5Symbols.T_ENDFOREACH);
           }
-        case 244: break;
+        case 242: break;
+        case 38:
+          { /*<ST_BACKQUOTE>{BACKQUOTE_CHARS}+*/
+    return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+          }
+        case 243: break;
         case 173:
           { return createFullSymbol(ASTPHP5Symbols.T_FINALLY);
           }
+        case 244: break;
+        case 101:
+          { yypushback(1);
+    /*<ST_BACKQUOTE>{BACKQUOTE_CHARS}*("{""{"+|"$""$"+|(("{"+|"$"+)[`]))*/
+    return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+          }
         case 245: break;
         case 83:
           { return createSymbol(ASTPHP5Symbols.T_IS_SMALLER_OR_EQUAL);
@@ -2211,38 +2210,28 @@ else if (zzAtEOF) {
           { return createSymbol(ASTPHP5Symbols.T_IS_NOT_IDENTICAL);
           }
         case 255: break;
+        case 42:
+          { yypushback(1);
+    yybegin(ST_HEREDOC);
+          }
+        case 256: break;
         case 161:
           { /* not a keyword, hust for recognize constans.*/
     return createFullSymbol(ASTPHP5Symbols.T_DEFINE);
           }
-        case 256: break;
-        case 60:
-          { String yytext = yytext();
-	switch (yytext.charAt(yytext.length() - 1)) {
-		case '?':
-		case '%':
-		case '>':
-			yypushback(1);
-			break;
-		default:
-			handleLineCommentEnd();
-			yybegin(ST_IN_SCRIPTING);
-	}
-//	yymore();
-          }
         case 257: break;
+        case 45:
+          { yypushback(1);
+    yybegin(ST_NOWDOC);
+          }
+        case 258: break;
         case 93:
           { return createSymbol(ASTPHP5Symbols.T_OR_EQUAL);
           }
-        case 258: break;
+        case 259: break;
         case 142:
           { return createFullSymbol(ASTPHP5Symbols.T_BREAK);
           }
-        case 259: break;
-        case 209:
-          { yybegin(ST_HALTED_COMPILER);
-	return createSymbol(ASTPHP5Symbols.T_HALT_COMPILER);
-          }
         case 260: break;
         case 102:
           { /* {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? */
@@ -2300,9 +2289,9 @@ else if (zzAtEOF) {
           { return createFullSymbol(ASTPHP5Symbols.T_SWITCH);
           }
         case 263: break;
-        case 56:
-          { popState();
-	return createSymbol(ASTPHP5Symbols.T_CLOSE_RECT);
+        case 36:
+          { /*<ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}+*/
+    return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
           }
         case 264: break;
         case 32:
@@ -2355,18 +2344,18 @@ else if (zzAtEOF) {
           { return createFullSymbol(ASTPHP5Symbols.T_CLASS_C);
           }
         case 276: break;
-        case 109:
-          { handlePHPDocEnd();
-     yybegin(ST_IN_SCRIPTING);
-          }
-        case 277: break;
         case 207:
           { return createFullSymbol(ASTPHP5Symbols.T_NS_C);
           }
-        case 278: break;
+        case 277: break;
         case 155:
           { return createSymbol(ASTPHP5Symbols.T_INT_CAST);
           }
+        case 278: break;
+        case 109:
+          { handlePHPDocEnd();
+    yybegin(ST_IN_SCRIPTING);
+          }
         case 279: break;
         case 160:
           { return createFullSymbol(ASTPHP5Symbols.T_ELSEIF);
@@ -2434,19 +2423,19 @@ else if (zzAtEOF) {
     yybegin(ST_IN_SCRIPTING);
           }
         case 294: break;
+        case 128:
+          { yypushback(1);
+    pushState(ST_VAR_OFFSET);
+    return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
+          }
+        case 295: break;
         case 159:
           { return createFullSymbol(ASTPHP5Symbols.T_ENDFOR);
           }
-        case 295: break;
+        case 296: break;
         case 3:
           { return createFullSymbol(ASTPHP5Symbols.T_LNUMBER);
           }
-        case 296: break;
-        case 101:
-          { yypushback(1);
-        /*<ST_BACKQUOTE>{BACKQUOTE_CHARS}*("{""{"+|"$""$"+|(("{"+|"$"+)[`]))*/
-	return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
-          }
         case 297: break;
         case 41:
           { /* <ST_HEREDOC> "$" | "{" */
@@ -2558,11 +2547,26 @@ else if (zzAtEOF) {
         }
           }
         case 317: break;
+        case 60:
+          { String yytext = yytext();
+    switch (yytext.charAt(yytext.length() - 1)) {
+        case '?':
+        case '%':
+        case '>':
+            yypushback(1);
+            break;
+        default:
+            handleLineCommentEnd();
+            yybegin(ST_IN_SCRIPTING);
+    }
+//    yymore();
+          }
+        case 318: break;
         case 99:
           { pushState(ST_LOOKING_FOR_VARNAME);
     return createSymbol(ASTPHP5Symbols.T_DOLLAR_OPEN_CURLY_BRACES);
           }
-        case 318: break;
+        case 319: break;
         case 34:
           { /* This is a temporary fix which is dependant on flex and it's implementation */
     if (!stack.isEmpty()) {
@@ -2571,15 +2575,15 @@ else if (zzAtEOF) {
     bracket--;
     return createSymbol(ASTPHP5Symbols.T_CURLY_CLOSE);
           }
-        case 319: break;
+        case 320: break;
         case 89:
           { return createSymbol(ASTPHP5Symbols.T_MOD_EQUAL);
           }
-        case 320: break;
+        case 321: break;
         case 23:
           { return createSymbol(ASTPHP5Symbols.T_DIV);
           }
-        case 321: break;
+        case 322: break;
         case 103:
           { /* <ST_START_HEREDOC>{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? */
     int trailingNewLineLength = 1;
@@ -2602,43 +2606,39 @@ else if (zzAtEOF) {
         yybegin(ST_HEREDOC);
     }
           }
-        case 322: break;
+        case 323: break;
         case 31:
           { return createSymbol(ASTPHP5Symbols.T_CLOSE_RECT);
           }
-        case 323: break;
+        case 324: break;
         case 124:
           { return createSymbol(ASTPHP5Symbols.T_SPACESHIP);
           }
-        case 324: break;
+        case 325: break;
         case 6:
           { return createSymbol(ASTPHP5Symbols.T_PLUS);
           }
-        case 325: break;
+        case 326: break;
         case 150:
           { return createFullSymbol(ASTPHP5Symbols.T_CLASS);
           }
-        case 326: break;
+        case 327: break;
         case 118:
           { return createFullSymbol(ASTPHP5Symbols.T_FOR);
           }
-        case 327: break;
-        case 79:
-          { return createSymbol(ASTPHP5Symbols.T_IS_GREATER_OR_EQUAL);
-          }
         case 328: break;
-        case 74:
-          { return createFullSymbol(ASTPHP5Symbols.T_DO);
+        case 157:
+          { yypushback(3);
+    pushState(ST_LOOKING_FOR_PROPERTY);
+    return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
           }
         case 329: break;
-        case 38:
-          { /*<ST_BACKQUOTE>{BACKQUOTE_CHARS}+*/
-	return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+        case 79:
+          { return createSymbol(ASTPHP5Symbols.T_IS_GREATER_OR_EQUAL);
           }
         case 330: break;
-        case 36:
-          { /*<ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}+*/
-	return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+        case 74:
+          { return createFullSymbol(ASTPHP5Symbols.T_DO);
           }
         case 331: break;
         case 92:
@@ -2686,28 +2686,12 @@ else if (zzAtEOF) {
           { return createFullSymbol(ASTPHP5Symbols.T_INSTANCEOF);
           }
         case 340: break;
-        case 180:
-          { int bprefix = (yytext().charAt(0) != '<') ? 1 : 0;
-        int startString=3+bprefix;
-        /* 3 is <<<, 2 is quotes, 1 is newline */
-        nowdoc_len = yylength()-bprefix-3-2-1-(yytext().charAt(yylength()-2)=='\r'?1:0);
-        while ((yytext().charAt(startString) == ' ') || (yytext().charAt(startString) == '\t')) {
-            startString++;
-            nowdoc_len--;
-        }
-        // first quate
-        startString++;
-        nowdoc = yytext().substring(startString,nowdoc_len+startString);
-        yybegin(ST_START_NOWDOC);
-        return createSymbol(ASTPHP5Symbols.T_START_NOWDOC);
-          }
-        case 341: break;
         case 49:
           { yypushback(yylength());
     popState();
     pushState(ST_IN_SCRIPTING);
           }
-        case 342: break;
+        case 341: break;
         case 158:
           { isEndedPhp = false;
     whitespaceEndPosition = getTokenStartPosition() + yylength();
@@ -2715,42 +2699,48 @@ else if (zzAtEOF) {
     //return T_OPEN_TAG;
     //return createSymbol(ASTPHP5Symbols.T_OPEN_TAG);
           }
-        case 343: break;
+        case 342: break;
         case 67:
           { return createSymbol(ASTPHP5Symbols.T_PLUS_EQUAL);
           }
-        case 344: break;
+        case 343: break;
         case 8:
           { whitespaceEndPosition = getTokenStartPosition() + yylength();
           }
-        case 345: break;
+        case 344: break;
         case 176:
           { return createFullSymbol(ASTPHP5Symbols.T_PRIVATE);
           }
-        case 346: break;
+        case 345: break;
         case 204:
           { return createFullSymbol(ASTPHP5Symbols.T_REQUIRE_ONCE);
           }
-        case 347: break;
+        case 346: break;
         case 174:
           { return createFullSymbol(ASTPHP5Symbols.T_FOREACH);
           }
-        case 348: break;
+        case 347: break;
         case 151:
           { return createFullSymbol(ASTPHP5Symbols.T_CLONE);
           }
-        case 349: break;
+        case 348: break;
         case 143:
           { return createFullSymbol(ASTPHP5Symbols.T_ISSET);
           }
-        case 350: break;
+        case 349: break;
         case 18:
           { return createSymbol(ASTPHP5Symbols.T_OPEN_PARENTHESE);
           }
-        case 351: break;
+        case 350: break;
         case 166:
           { return createFullSymbol(ASTPHP5Symbols.T_PUBLIC);
           }
+        case 351: break;
+        case 35:
+          { handleCommentStart();
+    yybegin(ST_ONE_LINE_COMMENT);
+//    yymore();
+          }
         case 352: break;
         case 121:
           { return createSymbol(ASTPHP5Symbols.T_SR_EQUAL);
@@ -2770,20 +2760,18 @@ else if (zzAtEOF) {
           { return createFullSymbol(ASTPHP5Symbols.T_EMPTY);
           }
         case 355: break;
+        case 209:
+          { yybegin(ST_HALTED_COMPILER);
+    return createSymbol(ASTPHP5Symbols.T_HALT_COMPILER);
+          }
+        case 356: break;
         case 82:
           { return createSymbol(ASTPHP5Symbols.T_IS_NOT_EQUAL);
           }
-        case 356: break;
+        case 357: break;
         case 85:
           { return createSymbol(ASTPHP5Symbols.T_MUL_EQUAL);
           }
-        case 357: break;
-        case 127:
-          { if (!parsePHPDoc()) {
-handleCommentStart();
-yybegin(ST_DOCBLOCK);
-}
-          }
         case 358: break;
         case 105:
           { /* <ST_START_NOWDOC>{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? */
@@ -2819,28 +2807,32 @@ else if (zzAtEOF) {
           { return createFullSymbol(ASTPHP5Symbols.T_FINAL);
           }
         case 362: break;
-        case 131:
-          { int len = yylength();
-        yypushback(2); // go back to mark end of comment in the next token
-        comment = yytext();
-          }
-        case 363: break;
         case 187:
           { return createSymbol(ASTPHP5Symbols.T_OBJECT_CAST);
           }
-        case 364: break;
+        case 363: break;
         case 167:
           { return createSymbol(ASTPHP5Symbols.T_BOOL_CAST);
           }
-        case 365: break;
+        case 364: break;
         case 39:
           { yybegin(ST_IN_SCRIPTING);
     return createSymbol(ASTPHP5Symbols.T_BACKQUATE);
           }
-        case 366: break;
+        case 365: break;
         case 7:
           { return createSymbol(ASTPHP5Symbols.T_NS_SEPARATOR);
           }
+        case 366: break;
+        case 110:
+          { if (asp_tags || yytext().charAt(0)!='%') { /* asp comment? */
+        isEndedPhp = true;
+        handleLineCommentEnd();
+        yypushback(yylength());
+        yybegin(ST_IN_SCRIPTING);
+        //return T_COMMENT;
+    }
+          }
         case 367: break;
         case 186:
           { return createSymbol(ASTPHP5Symbols.T_STRING_CAST);
@@ -2850,21 +2842,14 @@ else if (zzAtEOF) {
           { return createFullSymbol(ASTPHP5Symbols.T_LOGICAL_XOR);
           }
         case 369: break;
-        case 52:
-          { yypushback(1);
-	popState();
-        /*<ST_VAR_OFFSET>[ \n\r\t\\'#]*/
-	return createSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
-          }
-        case 370: break;
         case 64:
           { return createFullSymbol(ASTPHP5Symbols.T_DNUMBER);
           }
-        case 371: break;
+        case 370: break;
         case 24:
           { return createSymbol(ASTPHP5Symbols.T_PRECENT);
           }
-        case 372: break;
+        case 371: break;
         case 206:
           { comment = yytext();
     handleVarComment();
@@ -2872,13 +2857,13 @@ else if (zzAtEOF) {
     // but it needs some changes in parser grammar. see issue #154967
     //return createFullSymbol(ASTPHP5Symbols.T_VAR_COMMENT);
           }
-        case 373: break;
+        case 372: break;
         case 96:
           { isEndedPhp = true;
     yybegin(YYINITIAL);
     return createSymbol(ASTPHP5Symbols.T_SEMICOLON);  /* implicit ';' at php-end tag */
           }
-        case 374: break;
+        case 373: break;
         case 90:
           { if (asp_tags) {
         yybegin(YYINITIAL);
@@ -2887,19 +2872,19 @@ else if (zzAtEOF) {
         return createSymbol(ASTPHP5Symbols.T_INLINE_HTML);
     }
           }
-        case 375: break;
+        case 374: break;
         case 183:
           { return createFullSymbol(ASTPHP5Symbols.T_FUNCTION);
           }
-        case 376: break;
+        case 375: break;
         case 181:
           { return createFullSymbol(ASTPHP5Symbols.T_ENDWHILE);
           }
-        case 377: break;
+        case 376: break;
         case 27:
           { return createSymbol(ASTPHP5Symbols.T_KOVA);
           }
-        case 378: break;
+        case 377: break;
         case 43:
           { /* <ST_END_HEREDOC>{TABS_AND_SPACES}{LABEL}";"? */
     heredoc=null;
@@ -2913,23 +2898,29 @@ else if (zzAtEOF) {
     yypushback(back);
     return createSymbol(ASTPHP5Symbols.T_END_HEREDOC);
           }
-        case 379: break;
+        case 378: break;
         case 10:
           { yybegin(ST_DOUBLE_QUOTES);
     return createSymbol(ASTPHP5Symbols.T_QUATE);
           }
-        case 380: break;
+        case 379: break;
         case 185:
           { return createFullSymbol(ASTPHP5Symbols.T_CONTINUE);
           }
-        case 381: break;
+        case 380: break;
         case 115:
           { return createSymbol(ASTPHP5Symbols.T_IS_IDENTICAL);
           }
-        case 382: break;
+        case 381: break;
         case 72:
           { return createSymbol(ASTPHP5Symbols.T_DOUBLE_ARROW);
           }
+        case 382: break;
+        case 131:
+          { int len = yylength();
+    yypushback(2); // go back to mark end of comment in the next token
+    comment = yytext();
+          }
         case 383: break;
         case 195:
           { return createFullSymbol(ASTPHP5Symbols.T_TRAIT_C);
@@ -2959,19 +2950,16 @@ else if (zzAtEOF) {
           { return createFullSymbol(ASTPHP5Symbols.T_DIR);
           }
         case 390: break;
-        case 110:
-          { if (asp_tags || yytext().charAt(0)!='%') { /* asp comment? */
-        isEndedPhp = true;
-	    handleLineCommentEnd();
-        yypushback(yylength());
-		yybegin(ST_IN_SCRIPTING);
-		//return T_COMMENT;
-	}
-          }
-        case 391: break;
         case 194:
           { return createFullSymbol(ASTPHP5Symbols.T_PROTECTED);
           }
+        case 391: break;
+        case 52:
+          { yypushback(1);
+    popState();
+    /*<ST_VAR_OFFSET>[ \n\r\t\\'#]*/
+    return createSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+          }
         case 392: break;
         case 65:
           { return createSymbol(ASTPHP5Symbols.T_CONCAT_EQUAL);
@@ -2990,46 +2978,57 @@ else if (zzAtEOF) {
           { return createSymbol(ASTPHP5Symbols.T_INC);
           }
         case 396: break;
-        case 45:
-          { yypushback(1);
-	yybegin(ST_NOWDOC);
-          }
-        case 397: break;
         case 75:
           { return createFullSymbol(ASTPHP5Symbols.T_LOGICAL_OR);
           }
-        case 398: break;
+        case 397: break;
         case 84:
           { return createSymbol(ASTPHP5Symbols.T_SL);
           }
-        case 399: break;
+        case 398: break;
         case 68:
           { return createFullSymbol(ASTPHP5Symbols.T_AS);
           }
-        case 400: break;
+        case 399: break;
         case 203:
           { return createFullSymbol(ASTPHP5Symbols.T_INCLUDE_ONCE);
           }
-        case 401: break;
+        case 400: break;
         case 126:
           { return createSymbol(ASTPHP5Symbols.T_POW_EQUAL);
           }
-        case 402: break;
+        case 401: break;
         case 71:
           { return createSymbol(ASTPHP5Symbols.T_IS_EQUAL);
           }
-        case 403: break;
+        case 402: break;
         case 33:
           { return createSymbol(ASTPHP5Symbols.T_AT);
           }
-        case 404: break;
+        case 403: break;
         case 53:
           { return createSymbol(ASTPHP5Symbols.T_QUATE);
           }
-        case 405: break;
+        case 404: break;
         case 189:
           { return createFullSymbol(ASTPHP5Symbols.T_LINE);
           }
+        case 405: break;
+        case 180:
+          { int bprefix = (yytext().charAt(0) != '<') ? 1 : 0;
+    int startString=3+bprefix;
+    /* 3 is <<<, 2 is quotes, 1 is newline */
+    nowdoc_len = yylength()-bprefix-3-2-1-(yytext().charAt(yylength()-2)=='\r'?1:0);
+    while ((yytext().charAt(startString) == ' ') || (yytext().charAt(startString) == '\t')) {
+        startString++;
+        nowdoc_len--;
+    }
+    // first quate
+    startString++;
+    nowdoc = yytext().substring(startString,nowdoc_len+startString);
+    yybegin(ST_START_NOWDOC);
+    return createSymbol(ASTPHP5Symbols.T_START_NOWDOC);
+          }
         case 406: break;
         case 169:
           { return createFullSymbol(ASTPHP5Symbols.T_EXTENDS);
@@ -3086,12 +3085,12 @@ else if (zzAtEOF) {
             switch (zzLexicalState) {
             case ST_DOCBLOCK: {
               if (yytext().length() > 0) {
-                yypushback(1);  // backup eof
-                comment = yytext();
-              }
-              else {
-                return createSymbol(ASTPHP5Symbols.EOF);
-              }
+        yypushback(1);  // backup eof
+        comment = yytext();
+    }
+    else {
+        return createSymbol(ASTPHP5Symbols.EOF);
+    }
             }
             case 787: break;
             default:
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java
index 69dc479e9e..3ad4faba17 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java
@@ -19,7 +19,7 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.11a beta 20060608
-// Sun Oct 28 19:26:12 JST 2018
+// Sun Nov 04 22:15:39 JST 2018
 //----------------------------------------------------
 
 package org.netbeans.modules.php.editor.parser;
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/brackets/brackets.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/brackets/brackets.java
index 7aa1e1896b..b5811a06d4 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/brackets/brackets.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/brackets/brackets.java
@@ -20,9 +20,6 @@
 package org.netbeans.test.php.brackets;
 
 import org.netbeans.test.php.GeneralPHP;
-import org.netbeans.jemmy.JemmyException;
-import org.netbeans.jellytools.modules.editor.CompletionJListOperator;
-import java.util.List;
 
 /**
  *
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCC.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCC.java
index 289c8711b8..d72dc4d9a4 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCC.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCC.java
@@ -23,7 +23,6 @@
 import java.util.List;
 import junit.framework.Test;
 import org.netbeans.jellytools.EditorOperator;
-import org.netbeans.jellytools.HelpOperator;
 import org.netbeans.jellytools.modules.editor.CompletionJListOperator;
 import org.netbeans.jemmy.EventTool;
 import org.netbeans.jemmy.Timeouts;
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCInDetail.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCInDetail.java
index af88dc352c..c14d6052c6 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCInDetail.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCInDetail.java
@@ -19,12 +19,9 @@
 package org.netbeans.test.php.cc;
 
 import java.awt.event.InputEvent;
-import java.util.Iterator;
-import java.util.List;
 import org.netbeans.jellytools.EditorOperator;
 import org.netbeans.junit.NbModuleSuite;
 import junit.framework.Test;
-import org.openide.util.Exceptions;
 
 /**
  *
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCReturnAnotation.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCReturnAnotation.java
index 36c9015f56..07854c89d4 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCReturnAnotation.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCReturnAnotation.java
@@ -19,20 +19,10 @@
 package org.netbeans.test.php.cc;
 
 import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.util.List;
-import static junit.framework.Assert.fail;
 import junit.framework.Test;
 import org.netbeans.jellytools.EditorOperator;
-import org.netbeans.jellytools.HelpOperator;
-import org.netbeans.jellytools.modules.editor.CompletionJListOperator;
-import org.netbeans.jemmy.EventTool;
-import org.netbeans.jemmy.Timeouts;
-import org.netbeans.jemmy.operators.JEditorPaneOperator;
-import org.netbeans.jemmy.operators.WindowOperator;
 import org.netbeans.junit.NbModuleSuite;
 import org.netbeans.test.php.GeneralPHP;
-import static org.netbeans.test.php.cc.testCC.TEST_PHP_NAME;
 
 /**
  *
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCSmarty.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCSmarty.java
index c44d12ad87..2b2abb2317 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCSmarty.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/cc/testCCSmarty.java
@@ -17,7 +17,6 @@
  * under the License.
  */
 package org.netbeans.test.php.cc;
-import java.awt.event.InputEvent;
 import junit.framework.Test;
 import org.netbeans.jellytools.EditorOperator;
 import org.netbeans.jemmy.EventTool;
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/folds/folds.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/folds/folds.java
index f6f4beb406..f9ef8d7d14 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/folds/folds.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/folds/folds.java
@@ -20,9 +20,6 @@
 package org.netbeans.test.php.folds;
 
 import org.netbeans.test.php.GeneralPHP;
-import org.netbeans.jemmy.JemmyException;
-import org.netbeans.jellytools.modules.editor.CompletionJListOperator;
-import java.util.List;
 
 /**
  *
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/formatting/formatting.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/formatting/formatting.java
index 72379aea37..fd937de919 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/formatting/formatting.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/formatting/formatting.java
@@ -19,11 +19,6 @@
 
 package org.netbeans.test.php.formatting;
 
-import java.awt.event.KeyEvent;
-import org.netbeans.jellytools.MainWindowOperator;
-import org.netbeans.jemmy.operators.JComboBoxOperator;
-import org.netbeans.jemmy.operators.JDialogOperator;
-import org.netbeans.jemmy.operators.JMenuBarOperator;
 import org.netbeans.test.php.GeneralPHP;
 
 /**
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/operators/testNewPHPProjectNameLocationStepOperator.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/operators/testNewPHPProjectNameLocationStepOperator.java
index 1f6ad7818e..0784bb9623 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/operators/testNewPHPProjectNameLocationStepOperator.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/operators/testNewPHPProjectNameLocationStepOperator.java
@@ -18,9 +18,6 @@
  */
 package org.netbeans.test.php.operators;
 
-import java.awt.Component;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
 import java.io.File;
 import junit.framework.Test;
 import org.netbeans.jellytools.Bundle;
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP53CodeCompletionTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP53CodeCompletionTest.java
index 46383f84ec..9d6eeb4e13 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP53CodeCompletionTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHP53CodeCompletionTest.java
@@ -22,7 +22,6 @@
 import org.netbeans.modules.php.editor.completion.PHPCodeCompletionTestBase;
 import java.io.File;
 import java.util.Collections;
-import org.netbeans.modules.php.editor.*;
 import java.util.Map;
 import org.netbeans.api.java.classpath.ClassPath;
 import org.netbeans.modules.php.project.api.PhpSourcePath;
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion194836Test.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion194836Test.java
index 7748d56a3d..1aed1b1a0d 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion194836Test.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion194836Test.java
@@ -19,9 +19,7 @@
 package org.netbeans.modules.php.editor.completion;
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import org.netbeans.api.java.classpath.ClassPath;
 import org.netbeans.modules.php.project.api.PhpSourcePath;
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/TestUtilities.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/TestUtilities.java
index 6e805841c8..5719345f58 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/TestUtilities.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/TestUtilities.java
@@ -24,19 +24,8 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.zip.GZIPInputStream;
 
 import org.openide.filesystems.FileObject;
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHPLexerUtils.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHPLexerUtils.java
index 7b6bea2963..d1fd1b1156 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHPLexerUtils.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHPLexerUtils.java
@@ -22,7 +22,6 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileWriter;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/model/impl/ModelPerformanceTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/model/impl/ModelPerformanceTest.java
index 688d6acbdb..c47ab51afa 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/model/impl/ModelPerformanceTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/model/impl/ModelPerformanceTest.java
@@ -18,18 +18,10 @@
  */
 package org.netbeans.modules.php.editor.model.impl;
 
-import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Date;
-import java.util.concurrent.Future;
-import static junit.framework.Assert.assertTrue;
-import org.netbeans.modules.parsing.api.ParserManager;
-import org.netbeans.modules.parsing.api.ResultIterator;
 import org.netbeans.modules.parsing.api.Source;
-import org.netbeans.modules.parsing.api.UserTask;
 import org.netbeans.modules.php.editor.model.Model;
-import org.netbeans.modules.php.editor.parser.PHPParseResult;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.Exceptions;
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/api/UtilsTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/api/UtilsTest.java
index 223ab9642d..71284d6c13 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/api/UtilsTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/api/UtilsTest.java
@@ -19,7 +19,6 @@
 
 package org.netbeans.modules.php.editor.parser.api;
 
-import java.io.FileReader;
 import java.io.StringReader;
 import java_cup.runtime.Symbol;
 import junit.framework.TestCase;
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/typinghooks/PhpTypedBreakInterceptorTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/typinghooks/PhpTypedBreakInterceptorTest.java
index 5d17e105e6..9890ff6370 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/typinghooks/PhpTypedBreakInterceptorTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/typinghooks/PhpTypedBreakInterceptorTest.java
@@ -20,10 +20,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.prefs.Preferences;
 import javax.swing.JEditorPane;
 import javax.swing.text.Document;
-import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
 import org.netbeans.modules.php.editor.indent.CodeStyle;
 import org.netbeans.modules.php.editor.indent.FmtOptions;
 
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/typinghooks/PhpTypedTextInterceptorTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/typinghooks/PhpTypedTextInterceptorTest.java
index 371639839f..994b082d46 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/typinghooks/PhpTypedTextInterceptorTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/typinghooks/PhpTypedTextInterceptorTest.java
@@ -23,9 +23,6 @@
 import javax.swing.JEditorPane;
 import javax.swing.text.Caret;
 import javax.swing.text.DefaultEditorKit;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
 import org.netbeans.editor.BaseDocument;
 import org.netbeans.modules.csl.api.Formatter;
 import org.netbeans.modules.php.editor.indent.CodeStyle;
diff --git a/php/php.editor/tools/ASTPHP5Parser.cup b/php/php.editor/tools/ASTPHP5Parser.cup
index f3357572a2..38f2ab0b2c 100644
--- a/php/php.editor/tools/ASTPHP5Parser.cup
+++ b/php/php.editor/tools/ASTPHP5Parser.cup
@@ -25,13 +25,13 @@ import org.openide.util.Pair;
 parser code {:
     private static short[][] getActionTable() {}
 
-	protected final static Integer IMPLICIT_PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.IMPLICIT_PUBLIC);
-	protected final static Integer PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.PUBLIC);
-	protected final static Integer PRIVATE = Integer.valueOf(BodyDeclaration.Modifier.PRIVATE);
-	protected final static Integer PROTECTED = Integer.valueOf(BodyDeclaration.Modifier.PROTECTED);
-	protected final static Integer ABSTRACT = Integer.valueOf(BodyDeclaration.Modifier.ABSTRACT);
-	protected final static Integer FINAL = Integer.valueOf(BodyDeclaration.Modifier.FINAL);
-	protected final static Integer STATIC = Integer.valueOf(BodyDeclaration.Modifier.STATIC);
+    protected final static Integer IMPLICIT_PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.IMPLICIT_PUBLIC);
+    protected final static Integer PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.PUBLIC);
+    protected final static Integer PRIVATE = Integer.valueOf(BodyDeclaration.Modifier.PRIVATE);
+    protected final static Integer PROTECTED = Integer.valueOf(BodyDeclaration.Modifier.PROTECTED);
+    protected final static Integer ABSTRACT = Integer.valueOf(BodyDeclaration.Modifier.ABSTRACT);
+    protected final static Integer FINAL = Integer.valueOf(BodyDeclaration.Modifier.FINAL);
+    protected final static Integer STATIC = Integer.valueOf(BodyDeclaration.Modifier.STATIC);
 
     private ErrorStrategy defaultStrategy = new DefaultErrorStrategy();;
     private ErrorStrategy errorStrategy = defaultStrategy;
@@ -113,13 +113,13 @@ parser code {:
         return dispatch;
     }
 
-	public VariableBase createDispatch(VariableBase dispatcher, VariableBase property, List dimensions) {
-		return createDispatch(dispatcher, Pair.of(property, false), null);
+    public VariableBase createDispatch(VariableBase dispatcher, VariableBase property, List dimensions) {
+        return createDispatch(dispatcher, Pair.of(property, false), null);
     }
 
     public VariableBase createDispatch(VariableBase dispatcher, VariableBase property) {
-		return createDispatch(dispatcher, property, null);
-	}
+        return createDispatch(dispatcher, property, null);
+    }
 
     public VariableBase createDispatch(boolean isStatic, VariableBase var, Expression memberProperty, int memberPropertyleft, int memberPropertyright,
             List<Expression> paramsList, int paramsListright, List propertyList, List aa) {
@@ -195,7 +195,7 @@ parser code {:
      * @param info    an extra object reserved for use by specialized subclasses.
      */
     public void report_error(String message, Object info) {
-		 System.out.print("report_eror"  + message);
+        System.out.print("report_eror"  + message);
     }
 
     /**
@@ -234,79 +234,79 @@ parser code {:
 
 /* terminals */
 
-terminal  String T_EXIT;
-terminal  String T_IF;
-terminal  String T_LNUMBER;
-terminal  String T_DNUMBER;
-terminal  String T_STRING;
-terminal  String T_STRING_VARNAME;
-terminal  String T_VARIABLE;
-terminal  String T_NUM_STRING;
-terminal  T_INLINE_HTML;
-terminal  String T_ENCAPSED_AND_WHITESPACE;
-terminal  String T_CONSTANT_ENCAPSED_STRING;
-terminal  String T_ECHO;
-terminal  String T_DO;
-terminal  String T_WHILE;
-terminal  String T_ENDWHILE;
-terminal  String T_FOR;
-terminal  String T_ENDFOR;
-terminal  String T_FOREACH;
-terminal  String T_ENDFOREACH;
-terminal  String T_DECLARE;
-terminal  String T_ENDDECLARE;
-terminal  String T_INSTANCEOF;
-terminal  String T_CLONE;
-terminal  String T_AS;
-terminal  String T_SWITCH;
-terminal  String T_ENDSWITCH;
-terminal  String T_CASE;
-terminal  String T_DEFAULT;
-terminal  String T_BREAK;
-terminal  String T_CONTINUE;
-terminal  String T_GOTO;
-terminal  String T_FUNCTION;
-terminal  String T_CONST;
-terminal  String T_RETURN;
-terminal  String T_YIELD;
-terminal  T_YIELD_FROM;
-terminal  String T_TRY;
-terminal  String T_CATCH;
-terminal  String T_THROW;
-terminal  String T_FINALLY;
-terminal  String T_USE;
-terminal  String T_GLOBAL;
-terminal  String T_VAR;
-terminal  String T_UNSET;
-terminal  String T_ISSET;
-terminal  String T_EMPTY;
-terminal  T_HALT_COMPILER;
-terminal  String T_CLASS;
-terminal  String T_INTERFACE;
-terminal  String T_EXTENDS;
-terminal  String T_IMPLEMENTS;
-terminal  T_OBJECT_OPERATOR;
-terminal  T_DOUBLE_ARROW;
-terminal  String T_LIST;
-terminal  String T_ARRAY;
-terminal  String T_CALLABLE;
-terminal  String T_CLASS_C;
-terminal  String T_TRAIT_C;
-terminal  String T_METHOD_C;
-terminal  String T_FUNC_C;
-terminal  String T_LINE;
-terminal  String T_FILE;
-terminal  T_START_HEREDOC;
-terminal  T_END_HEREDOC;
-terminal  T_DOLLAR_OPEN_CURLY_BRACES;
-terminal  T_CURLY_OPEN_WITH_DOLAR;
-terminal  T_CURLY_OPEN;
-terminal  T_CURLY_CLOSE;
-terminal  T_PAAMAYIM_NEKUDOTAYIM;
-terminal  String T_NAMESPACE;
-terminal  String T_NS_C;
-terminal  String T_DIR;
-terminal  T_NS_SEPARATOR;
+terminal String T_EXIT;
+terminal String T_IF;
+terminal String T_LNUMBER;
+terminal String T_DNUMBER;
+terminal String T_STRING;
+terminal String T_STRING_VARNAME;
+terminal String T_VARIABLE;
+terminal String T_NUM_STRING;
+terminal T_INLINE_HTML;
+terminal String T_ENCAPSED_AND_WHITESPACE;
+terminal String T_CONSTANT_ENCAPSED_STRING;
+terminal String T_ECHO;
+terminal String T_DO;
+terminal String T_WHILE;
+terminal String T_ENDWHILE;
+terminal String T_FOR;
+terminal String T_ENDFOR;
+terminal String T_FOREACH;
+terminal String T_ENDFOREACH;
+terminal String T_DECLARE;
+terminal String T_ENDDECLARE;
+terminal String T_INSTANCEOF;
+terminal String T_CLONE;
+terminal String T_AS;
+terminal String T_SWITCH;
+terminal String T_ENDSWITCH;
+terminal String T_CASE;
+terminal String T_DEFAULT;
+terminal String T_BREAK;
+terminal String T_CONTINUE;
+terminal String T_GOTO;
+terminal String T_FUNCTION;
+terminal String T_CONST;
+terminal String T_RETURN;
+terminal String T_YIELD;
+terminal T_YIELD_FROM;
+terminal String T_TRY;
+terminal String T_CATCH;
+terminal String T_THROW;
+terminal String T_FINALLY;
+terminal String T_USE;
+terminal String T_GLOBAL;
+terminal String T_VAR;
+terminal String T_UNSET;
+terminal String T_ISSET;
+terminal String T_EMPTY;
+terminal T_HALT_COMPILER;
+terminal String T_CLASS;
+terminal String T_INTERFACE;
+terminal String T_EXTENDS;
+terminal String T_IMPLEMENTS;
+terminal T_OBJECT_OPERATOR;
+terminal T_DOUBLE_ARROW;
+terminal String T_LIST;
+terminal String T_ARRAY;
+terminal String T_CALLABLE;
+terminal String T_CLASS_C;
+terminal String T_TRAIT_C;
+terminal String T_METHOD_C;
+terminal String T_FUNC_C;
+terminal String T_LINE;
+terminal String T_FILE;
+terminal T_START_HEREDOC;
+terminal T_END_HEREDOC;
+terminal T_DOLLAR_OPEN_CURLY_BRACES;
+terminal T_CURLY_OPEN_WITH_DOLAR;
+terminal T_CURLY_OPEN;
+terminal T_CURLY_CLOSE;
+terminal T_PAAMAYIM_NEKUDOTAYIM;
+terminal String T_NAMESPACE;
+terminal String T_NS_C;
+terminal String T_DIR;
+terminal T_NS_SEPARATOR;
 terminal String T_VAR_COMMENT;
 terminal String T_DEFINE;
 
@@ -574,600 +574,600 @@ precedence right T_STATIC, T_ABSTRACT, T_FINAL, T_PRIVATE, T_PROTECTED, T_PUBLIC
 thestart ::=
 top_statement_list:statementList
 {:
-	ASTPHP5Scanner phpAstLexer5 = (ASTPHP5Scanner) parser.getScanner();
-	List commentList = phpAstLexer5.getCommentList();
+    ASTPHP5Scanner phpAstLexer5 = (ASTPHP5Scanner) parser.getScanner();
+    List commentList = phpAstLexer5.getCommentList();
     int endOfProgram = statementListright > phpAstLexer5.getWhitespaceEndPosition() || phpAstLexer5.isEndedPhp() ? statementListright : phpAstLexer5.getWhitespaceEndPosition();
-	Program program = new Program(statementListleft, endOfProgram, statementList, commentList);
-	RESULT = program;
+    Program program = new Program(statementListleft, endOfProgram, statementList, commentList);
+    RESULT = program;
 :}
 ;
 
 namespace_name ::=
 T_STRING:n
 {:
-	List list = new LinkedList();
-	list.add(new Identifier(nleft, nright, n));
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new Identifier(nleft, nright, n));
+    RESULT = list;
 :}
 
 |
 T_DEFINE:n
 {:
-	List list = new LinkedList();
-	list.add(new Identifier(nleft, nright, "define"));
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new Identifier(nleft, nright, "define"));
+    RESULT = list;
 :}
 
 |
 namespace_name:list T_NS_SEPARATOR T_STRING:n
 {:
-	list.add(new Identifier(nleft, nright, n));
-	RESULT = list;
+    list.add(new Identifier(nleft, nright, n));
+    RESULT = list;
 :}
 ;
 
 namespace_name_access ::=
 namespace_name:list
 {:
-	RESULT = new NamespaceName(listleft, listright, list, false, false);
+    RESULT = new NamespaceName(listleft, listright, list, false, false);
 :}
 
 | T_NAMESPACE:s T_NS_SEPARATOR namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 :}
 ;
 
 reserved_non_modifiers_without_class ::=
 T_INCLUDE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_INCLUDE_ONCE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_EVAL:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_REQUIRE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_REQUIRE_ONCE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_LOGICAL_OR:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_LOGICAL_XOR:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_LOGICAL_AND:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_INSTANCEOF:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_NEW:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_CLONE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_EXIT:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_IF:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ELSEIF:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ELSE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ENDIF:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ECHO:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_DO:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_WHILE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ENDWHILE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_FOR:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ENDFOR:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_FOREACH:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ENDFOREACH:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_DECLARE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ENDDECLARE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_AS:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_TRY:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_CATCH:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_FINALLY:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_THROW:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_USE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_INSTEADOF:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_GLOBAL:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_VAR:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_UNSET:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ISSET:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_EMPTY:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_CONTINUE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_GOTO:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_FUNCTION:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_CONST:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_RETURN:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_PRINT:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_YIELD:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_LIST:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_SWITCH:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ENDSWITCH:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_CASE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_DEFAULT:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_BREAK:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_ARRAY:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_CALLABLE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_EXTENDS:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_IMPLEMENTS:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_NAMESPACE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_TRAIT:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_INTERFACE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 /*
 | T_CLASS:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 */
 
 | T_CLASS_C:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_TRAIT_C:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_FUNC_C:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_METHOD_C:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_LINE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_FILE:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_DIR:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 
 | T_NS_C:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 ;
 
 semi_reserved_without_class ::=
 reserved_non_modifiers_without_class:reserved
 {:
-	RESULT = reserved;
+    RESULT = reserved;
 :}
 
 | T_STATIC:modifier
 {:
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 :}
 
 | T_ABSTRACT:modifier
 {:
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 :}
 
 | T_FINAL:modifier
 {:
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 :}
 
 | T_PRIVATE:modifier
 {:
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 :}
 
 | T_PROTECTED:modifier
 {:
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 :}
 
 | T_PUBLIC:modifier
 {:
-	RESULT = new Identifier(modifierleft, modifierright, modifier, true);
+    RESULT = new Identifier(modifierleft, modifierright, modifier, true);
 :}
 ;
 
 identifier ::=
 identifier_without_class:ident
 {:
-	RESULT = ident;
+    RESULT = ident;
 :}
 
 | T_CLASS:reserved
 {:
-	RESULT = new Identifier(reservedleft, reservedright, reserved, true);
+    RESULT = new Identifier(reservedleft, reservedright, reserved, true);
 :}
 ;
 
 identifier_without_class ::=
 T_STRING:string
 {:
-	RESULT = new Identifier(stringleft, stringright, string);
+    RESULT = new Identifier(stringleft, stringright, string);
 :}
 
 | T_DEFINE:define
 {:
-	RESULT = new Identifier(defineleft, defineright, define);
+    RESULT = new Identifier(defineleft, defineright, define);
 :}
 
 | semi_reserved_without_class:reserved
 {:
-	RESULT = reserved;
+    RESULT = reserved;
 :}
 ;
 
 top_statement_list ::=
 top_statement_list:sList top_statement:statement
 {:
-	if(statement != null) {
-		if (!(statement instanceof NamespaceDeclaration) && sList.size() > 0) {
-			Statement lastStatement = (Statement) ((LinkedList) sList).getLast();
-			if (lastStatement instanceof NamespaceDeclaration) {
-                                NamespaceDeclaration namespaceDeclaration = (NamespaceDeclaration) lastStatement;
-                                // there should be NO statement outside bracketed namespaces - it's PHP FATAL ERROR
-                                // (that statement doesn't belong to last bracketed namespace)
-                                if (!namespaceDeclaration.isBracketed()) {
-                                    namespaceDeclaration.addStatement(statement);
-                                }
-			} else {
-				sList.add(statement);
-			}
-		} else {
-			sList.add(statement);
-		}
-	}
-	RESULT = sList;
+    if(statement != null) {
+        if (!(statement instanceof NamespaceDeclaration) && sList.size() > 0) {
+            Statement lastStatement = (Statement) ((LinkedList) sList).getLast();
+            if (lastStatement instanceof NamespaceDeclaration) {
+                NamespaceDeclaration namespaceDeclaration = (NamespaceDeclaration) lastStatement;
+                // there should be NO statement outside bracketed namespaces - it's PHP FATAL ERROR
+                // (that statement doesn't belong to last bracketed namespace)
+                if (!namespaceDeclaration.isBracketed()) {
+                    namespaceDeclaration.addStatement(statement);
+                }
+            } else {
+                sList.add(statement);
+            }
+        } else {
+            sList.add(statement);
+        }
+    }
+    RESULT = sList;
 :}
 
 | /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 ;
 
 top_statement ::=
 statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | function_declaration_statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | class_declaration_statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | T_HALT_COMPILER:halt
 {:
-	RESULT = new HaltCompiler(haltleft, haltright);
+    RESULT = new HaltCompiler(haltleft, haltright);
 :}
 
 | T_NAMESPACE:s namespace_name:list T_SEMICOLON:e
 {:
-	RESULT = new NamespaceDeclaration(sleft, eright,
-		new NamespaceName(listleft, listright, list, false, false), null, false);
+    RESULT = new NamespaceDeclaration(sleft, eright,
+        new NamespaceName(listleft, listright, list, false, false), null, false);
 :}
 
 | T_NAMESPACE:s namespace_name:list T_CURLY_OPEN:token top_statement_list:sList T_CURLY_CLOSE:e
 {:
-	RESULT = new NamespaceDeclaration(sleft, eright,
-		new NamespaceName(listleft, listright, list, false, false),
-		new Block(tokenleft, eright, sList), true);
+    RESULT = new NamespaceDeclaration(sleft, eright,
+        new NamespaceName(listleft, listright, list, false, false),
+        new Block(tokenleft, eright, sList), true);
 :}
 
 | T_NAMESPACE:s T_CURLY_OPEN:token top_statement_list:sList T_CURLY_CLOSE:e
 {:
-	RESULT = new NamespaceDeclaration(sleft, eright, null,
-		new Block(tokenleft, eright, sList), true);
+    RESULT = new NamespaceDeclaration(sleft, eright, null,
+        new Block(tokenleft, eright, sList), true);
 :}
 
 | T_USE:s use_declarations:list T_SEMICOLON:e
 {:
-	RESULT = new UseStatement(sleft, eright, list);
+    RESULT = new UseStatement(sleft, eright, list);
 :}
 
 | T_USE:use T_FUNCTION use_declarations:list T_SEMICOLON:e
 {:
-	RESULT = new UseStatement(useleft, eright, list, UseStatement.Type.FUNCTION);
+    RESULT = new UseStatement(useleft, eright, list, UseStatement.Type.FUNCTION);
 :}
 
 | T_USE:use T_CONST use_declarations:list T_SEMICOLON:e
 {:
-	RESULT = new UseStatement(useleft, eright, list, UseStatement.Type.CONST);
+    RESULT = new UseStatement(useleft, eright, list, UseStatement.Type.CONST);
 :}
 
 | constant_declaration:list T_SEMICOLON:e
 {:
-	RESULT = new ConstantDeclaration(listleft, eright, ASTPHP5Parser.IMPLICIT_PUBLIC, list, true);
+    RESULT = new ConstantDeclaration(listleft, eright, ASTPHP5Parser.IMPLICIT_PUBLIC, list, true);
 :}
 ;
 
 use_declarations ::=
 use_declarations:list T_COMMA use_declaration:useDecl
 {:
-	list.add(useDecl);
-	RESULT = list;
+    list.add(useDecl);
+    RESULT = list;
 :}
 
 | use_declaration:useDecl
 {:
-	List list = new LinkedList();
-	list.add(useDecl);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(useDecl);
+    RESULT = list;
 :}
 ;
 
 use_declaration ::=
 namespace_name:list
 {:
-	RESULT = new SingleUseStatementPart(listleft, listright,
-		new NamespaceName(listleft, listright, list, false, false), null);
+    RESULT = new SingleUseStatementPart(listleft, listright,
+        new NamespaceName(listleft, listright, list, false, false), null);
 :}
 
 | namespace_name:list T_AS T_STRING:aliasName
 {:
-	RESULT = new SingleUseStatementPart(listleft, aliasNameright,
-		new NamespaceName(listleft, listright, list, false, false),
-		new Identifier(aliasNameleft, aliasNameright, aliasName));
+    RESULT = new SingleUseStatementPart(listleft, aliasNameright,
+        new NamespaceName(listleft, listright, list, false, false),
+        new Identifier(aliasNameleft, aliasNameright, aliasName));
 :}
 
 | namespace_name:basens T_NS_SEPARATOR:s T_CURLY_OPEN:open group_namespace_parts:parts T_CURLY_CLOSE:close
 {:
-	RESULT = new GroupUseStatementPart(basensleft, closeright, new NamespaceName(basensleft, basensright, basens, false, false), parts);
+    RESULT = new GroupUseStatementPart(basensleft, closeright, new NamespaceName(basensleft, basensright, basens, false, false), parts);
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list
 {:
-	RESULT = new SingleUseStatementPart(sleft, listright,
-		new NamespaceName(sleft, listright, list, true, false), null);
+    RESULT = new SingleUseStatementPart(sleft, listright,
+        new NamespaceName(sleft, listright, list, true, false), null);
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list T_AS T_STRING:aliasName
 {:
-	RESULT = new SingleUseStatementPart(sleft, aliasNameright,
-		new NamespaceName(sleft, listright, list, true, false),
-		new Identifier(aliasNameleft, aliasNameright, aliasName));
+    RESULT = new SingleUseStatementPart(sleft, aliasNameright,
+        new NamespaceName(sleft, listright, list, true, false),
+        new Identifier(aliasNameleft, aliasNameright, aliasName));
 :}
 
 | T_NS_SEPARATOR:s namespace_name:basens T_NS_SEPARATOR:ss T_CURLY_OPEN:open group_namespace_parts:parts T_CURLY_CLOSE:close
 {:
-	RESULT = new GroupUseStatementPart(sleft, closeright, new NamespaceName(basensleft, basensright, basens, true, false), parts);
+    RESULT = new GroupUseStatementPart(sleft, closeright, new NamespaceName(basensleft, basensright, basens, true, false), parts);
 :}
 ;
 
@@ -1175,28 +1175,28 @@ namespace_name:list
 group_namespace_parts ::=
 non_empty_group_namespace_parts:list possible_comma
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 
 | /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 ;
 
 non_empty_group_namespace_parts ::=
 non_empty_group_namespace_parts:list T_COMMA group_namespace_part:part
 {:
-	list.add(part);
-	RESULT = list;
+    list.add(part);
+    RESULT = list;
 :}
 
 | group_namespace_part:part
 {:
-	List list = new LinkedList();
-	list.add(part);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(part);
+    RESULT = list;
 :}
 ;
 
@@ -1235,302 +1235,302 @@ namespace_name:part
 inner_statement_list ::=
 inner_statement_list:statementList inner_statement:statement
 {:
-	// Ignore null statements
-	if(statement != null) {
-		statementList.add(statement);
-	}
-	RESULT = statementList;
+    // Ignore null statements
+    if(statement != null) {
+        statementList.add(statement);
+    }
+    RESULT = statementList;
 :}
 
 | /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 ;
 
 inner_statement ::=
 statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | function_declaration_statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | class_declaration_statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 ;
 
 statement ::=
 unticked_statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 | T_STRING:label T_NEKUDOTAIM:e
 {:
-	RESULT = new GotoLabel(labelleft, eright, new Identifier(labelleft, labelright, label));
+    RESULT = new GotoLabel(labelleft, eright, new Identifier(labelleft, labelright, label));
 :}
 ;
 
 unticked_statement ::=
 T_CURLY_OPEN:token inner_statement_list:statementList T_CURLY_CLOSE:end
 {:
-	Block block = new Block(tokenleft, endright, statementList);
-	RESULT = block;
+    Block block = new Block(tokenleft, endright, statementList);
+    RESULT = block;
 :}
 
 | T_IF:token T_OPEN_PARENTHESE expr:condition T_CLOSE_PARENTHESE statement:iftrue elseif_list:elseif else_single:iffalse
 {:
-	Expression innerCondition = null;
-	Statement trueStatement = null;
-	Statement falseStatement = iffalse;
+    Expression innerCondition = null;
+    Statement trueStatement = null;
+    Statement falseStatement = iffalse;
 
-	for (int i=0 ; i < elseif[0].size() ; i++) {
-		innerCondition = (Expression)elseif[0].get(i);
-	 	trueStatement = (Statement)elseif[1].get(i);
-	 	int start = ((Integer)elseif[2].get(i)).intValue();
-		falseStatement = new IfStatement(start, iffalseright, innerCondition, trueStatement, falseStatement);
-	}
-	IfStatement ifStatement = new IfStatement(tokenleft, iffalseright, condition, iftrue, falseStatement);
+    for (int i=0 ; i < elseif[0].size() ; i++) {
+        innerCondition = (Expression)elseif[0].get(i);
+        trueStatement = (Statement)elseif[1].get(i);
+        int start = ((Integer)elseif[2].get(i)).intValue();
+        falseStatement = new IfStatement(start, iffalseright, innerCondition, trueStatement, falseStatement);
+    }
+    IfStatement ifStatement = new IfStatement(tokenleft, iffalseright, condition, iftrue, falseStatement);
 
-	RESULT = ifStatement;
+    RESULT = ifStatement;
 :}
 
 | T_IF:token T_OPEN_PARENTHESE expr:condition T_CLOSE_PARENTHESE T_NEKUDOTAIM:colon inner_statement_list:ifTrueStatementList new_elseif_list:elseif new_else_single:iffalse T_ENDIF T_SEMICOLON:end
 {:
-	Expression innerCondition = null;
-	Statement trueStatement = null;
-	Statement falseStatement = iffalse;
+    Expression innerCondition = null;
+    Statement trueStatement = null;
+    Statement falseStatement = iffalse;
 
-	for (int i=0 ; i < elseif[0].size() ; i++) {
-		innerCondition = (Expression)elseif[0].get(i);
-	 	trueStatement = (Statement)elseif[1].get(i);
-	 	int start = ((Integer)elseif[2].get(i)).intValue();
-		falseStatement = new IfStatement(start, iffalseright, innerCondition, trueStatement, falseStatement);
-	}
-	Block block = new Block(colonleft, ifTrueStatementListright, ifTrueStatementList, false);
-	IfStatement ifStatement = new IfStatement(tokenleft, iffalseright, condition, block, falseStatement);
+    for (int i=0 ; i < elseif[0].size() ; i++) {
+        innerCondition = (Expression)elseif[0].get(i);
+        trueStatement = (Statement)elseif[1].get(i);
+        int start = ((Integer)elseif[2].get(i)).intValue();
+        falseStatement = new IfStatement(start, iffalseright, innerCondition, trueStatement, falseStatement);
+    }
+    Block block = new Block(colonleft, ifTrueStatementListright, ifTrueStatementList, false);
+    IfStatement ifStatement = new IfStatement(tokenleft, iffalseright, condition, block, falseStatement);
 
-	RESULT = ifStatement;
+    RESULT = ifStatement;
 :}
 
 | T_WHILE:token T_OPEN_PARENTHESE expr:expr T_CLOSE_PARENTHESE while_statement:statement
 {:
-	WhileStatement whileStatement = new WhileStatement(tokenleft, statementright, expr, statement);
-	RESULT = whileStatement;
+    WhileStatement whileStatement = new WhileStatement(tokenleft, statementright, expr, statement);
+    RESULT = whileStatement;
 :}
 
 | T_DO:token statement:statement T_WHILE T_OPEN_PARENTHESE expr:expr T_CLOSE_PARENTHESE T_SEMICOLON:end
 {:
-	DoStatement doStatement = new DoStatement(tokenleft, endright, expr, statement);
-	RESULT = doStatement;
+    DoStatement doStatement = new DoStatement(tokenleft, endright, expr, statement);
+    RESULT = doStatement;
 :}
 
 | T_FOR:token T_OPEN_PARENTHESE for_expr:initializations T_SEMICOLON for_expr:conditions T_SEMICOLON for_expr:increasements T_CLOSE_PARENTHESE for_statement:statement
 {:
-	ForStatement forStatement = new ForStatement(tokenleft, statementright, initializations, conditions, increasements, statement);
-	RESULT = forStatement;
+    ForStatement forStatement = new ForStatement(tokenleft, statementright, initializations, conditions, increasements, statement);
+    RESULT = forStatement;
 :}
 
 | T_SWITCH:token T_OPEN_PARENTHESE expr:expr T_CLOSE_PARENTHESE switch_case_list:caseBlock
 {:
-	SwitchStatement switchStatement = new SwitchStatement(tokenleft, caseBlockright, expr, caseBlock);
-	RESULT = switchStatement;
+    SwitchStatement switchStatement = new SwitchStatement(tokenleft, caseBlockright, expr, caseBlock);
+    RESULT = switchStatement;
 :}
 
 | T_BREAK:token T_SEMICOLON:end
 {:
-	RESULT = new BreakStatement(tokenleft, endright);
+    RESULT = new BreakStatement(tokenleft, endright);
 :}
 
 | T_BREAK:token expr:expr T_SEMICOLON:end
 {:
-	RESULT = new BreakStatement(tokenleft, endright, expr);
+    RESULT = new BreakStatement(tokenleft, endright, expr);
 :}
 
 | T_CONTINUE:token T_SEMICOLON:end
 {:
-	RESULT = new ContinueStatement(tokenleft, endright);
+    RESULT = new ContinueStatement(tokenleft, endright);
 :}
 
 | T_CONTINUE:token expr:expr T_SEMICOLON:end
 {:
-	RESULT = new ContinueStatement(tokenleft, endright, expr);
+    RESULT = new ContinueStatement(tokenleft, endright, expr);
 :}
 
 | T_RETURN:token T_SEMICOLON:end
 {:
-	RESULT = new ReturnStatement(tokenleft, endright);
+    RESULT = new ReturnStatement(tokenleft, endright);
 :}
 
 | T_RETURN:token expr_without_variable:expr T_SEMICOLON:end
 {:
-	RESULT = new ReturnStatement(tokenleft, endright, expr);
+    RESULT = new ReturnStatement(tokenleft, endright, expr);
 :}
 
 | T_RETURN:token variable:expr T_SEMICOLON:end
 {:
-	RESULT = new ReturnStatement(tokenleft, endright, expr);
+    RESULT = new ReturnStatement(tokenleft, endright, expr);
 :}
 
 | T_RETURN:token yield_from_expr:expr T_SEMICOLON:end
 {:
-	RESULT = new ReturnStatement(tokenleft, endright, expr);
+    RESULT = new ReturnStatement(tokenleft, endright, expr);
 :}
 
 | T_GLOBAL:start global_var_list:list T_SEMICOLON:end
 {:
-	GlobalStatement  global = new GlobalStatement(startleft, endright, list);
-	RESULT = global;
+    GlobalStatement global = new GlobalStatement(startleft, endright, list);
+    RESULT = global;
 :}
 
 | T_STATIC:start static_var_list:list T_SEMICOLON:end
 {:
-	StaticStatement s = new StaticStatement(startleft, endright, list);
-	RESULT = s;
+    StaticStatement s = new StaticStatement(startleft, endright, list);
+    RESULT = s;
 :}
 
 | T_ECHO:start echo_expr_list:exprList T_SEMICOLON:end
 {:
-	RESULT = new EchoStatement(startleft, endright, exprList);
+    RESULT = new EchoStatement(startleft, endright, exprList);
 :}
 
 | T_INLINE_HTML:html
 {:
-	InLineHtml inLineHtml = new InLineHtml(htmlleft, htmlright);
-	RESULT = inLineHtml;
+    InLineHtml inLineHtml = new InLineHtml(htmlleft, htmlright);
+    RESULT = inLineHtml;
 :}
 
 | expr_with_yields:expr T_SEMICOLON:end
 {:
-	ExpressionStatement expressionStatement = new ExpressionStatement(exprleft, endright, expr);
-	RESULT = expressionStatement;
+    ExpressionStatement expressionStatement = new ExpressionStatement(exprleft, endright, expr);
+    RESULT = expressionStatement;
 :}
 
 | T_USE:start use_filename:expr T_SEMICOLON:end
 {:
-	List list = new LinkedList();
-	list.add(expr);
-	Identifier id = new Identifier(startleft, startright, "use");
-	FunctionName functionName = new FunctionName(startleft, startright, id);
-	FunctionInvocation functionInvocation = new FunctionInvocation(startleft, exprright, functionName, list);
-	ExpressionStatement expressionStatement = new ExpressionStatement(startleft, endright, functionInvocation);
-	RESULT = expressionStatement;
+    List list = new LinkedList();
+    list.add(expr);
+    Identifier id = new Identifier(startleft, startright, "use");
+    FunctionName functionName = new FunctionName(startleft, startright, id);
+    FunctionInvocation functionInvocation = new FunctionInvocation(startleft, exprright, functionName, list);
+    ExpressionStatement expressionStatement = new ExpressionStatement(startleft, endright, functionInvocation);
+    RESULT = expressionStatement;
 :}
 
 | T_UNSET:start T_OPEN_PARENTHESE unset_variables:list possible_comma T_CLOSE_PARENTHESE:closePar T_SEMICOLON:end
 {:
-	Identifier id = new Identifier(startleft, startright, "unset");
-	FunctionName functionName = new FunctionName(startleft, startright, id);
-	FunctionInvocation functionInvocation = new FunctionInvocation(startleft, closeParright, functionName, list);
-	ExpressionStatement expressionStatement = new ExpressionStatement(startleft, endright, functionInvocation);
-	RESULT = expressionStatement;
+    Identifier id = new Identifier(startleft, startright, "unset");
+    FunctionName functionName = new FunctionName(startleft, startright, id);
+    FunctionInvocation functionInvocation = new FunctionInvocation(startleft, closeParright, functionName, list);
+    ExpressionStatement expressionStatement = new ExpressionStatement(startleft, endright, functionInvocation);
+    RESULT = expressionStatement;
 :}
 
 | T_FOREACH:token T_OPEN_PARENTHESE variable:expr T_AS foreach_variable:var foreach_optional_arg:arg T_CLOSE_PARENTHESE foreach_statement:statement
 {:
-	ForEachStatement forEachStatement = null;
-	if (arg == null) {
-		forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, statement);
-	} else {
-		forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, arg, statement);
-	}
-	RESULT = forEachStatement;
+    ForEachStatement forEachStatement = null;
+    if (arg == null) {
+        forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, statement);
+    } else {
+        forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, arg, statement);
+    }
+    RESULT = forEachStatement;
 :}
 
 | T_FOREACH:token T_OPEN_PARENTHESE expr_without_variable:expr T_AS foreach_variable:var foreach_optional_arg:arg T_CLOSE_PARENTHESE foreach_statement:statement
 {:
-	ForEachStatement forEachStatement = null;
-	if (arg == null) {
-		forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, statement);
-	} else {
-		forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, arg, statement);
-	}
-	RESULT = forEachStatement;
+    ForEachStatement forEachStatement = null;
+    if (arg == null) {
+        forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, statement);
+    } else {
+        forEachStatement = new ForEachStatement(tokenleft, statementright, expr, var, arg, statement);
+    }
+    RESULT = forEachStatement;
 :}
 
 | T_DECLARE:start T_OPEN_PARENTHESE declare_list:lists T_CLOSE_PARENTHESE declare_statement:statement
 {:
-	DeclareStatement declare = new DeclareStatement(startleft, statementright, lists[0], lists[1], statement);
-	RESULT = declare;
+    DeclareStatement declare = new DeclareStatement(startleft, statementright, lists[0], lists[1], statement);
+    RESULT = declare;
 :}
 
 | T_SEMICOLON:token /* empty statement */
 {:
-	RESULT = new EmptyStatement(tokenleft, tokenright);
+    RESULT = new EmptyStatement(tokenleft, tokenright);
 :}
 
 | T_TRY:start T_CURLY_OPEN:tryBlockStart inner_statement_list:tryList T_CURLY_CLOSE:tryBlockEnd T_FINALLY:finally_word T_CURLY_OPEN:finallyBlockStart inner_statement_list:finallyList T_CURLY_CLOSE:finallyBlockEnd
 {:
-	Block tryBlock = new Block(tryBlockStartleft, tryBlockEndright, tryList);
+    Block tryBlock = new Block(tryBlockStartleft, tryBlockEndright, tryList);
     Block finallyBlock = new Block(finallyBlockStartleft, finallyBlockEndright, finallyList);
-	FinallyClause finallyClause = new FinallyClause(finally_wordleft, finallyBlockEndright, finallyBlock);
-	TryStatement tryStatement = new TryStatement(startleft, finallyBlockEndright, tryBlock, null, finallyClause);
-	RESULT = tryStatement;
+    FinallyClause finallyClause = new FinallyClause(finally_wordleft, finallyBlockEndright, finallyBlock);
+    TryStatement tryStatement = new TryStatement(startleft, finallyBlockEndright, tryBlock, null, finallyClause);
+    RESULT = tryStatement;
 :}
 
 | T_TRY:start T_CURLY_OPEN:tryBlockStart inner_statement_list:tryList T_CURLY_CLOSE:tryBlockEnd T_CATCH:catch_word T_OPEN_PARENTHESE catch_class_names:classNames tracked_variable:var T_CLOSE_PARENTHESE
 T_CURLY_OPEN:catchBlockStart inner_statement_list:catchList T_CURLY_CLOSE:catchBlockEnd additional_catches:catchesList additional_finally:finallyBlock
 {:
-	Block tryBlock = new Block(tryBlockStartleft, tryBlockEndright, tryList);
-	Block catchBlock = new Block(catchBlockStartleft, catchBlockEndright, catchList);
-	CatchClause catchClause = new CatchClause(catch_wordleft, catchBlockEndright, classNames, var, catchBlock);
-	((LinkedList) catchesList).addFirst(catchClause);
-	int end = finallyBlock == null ? catchesListright : finallyBlockright;
-	TryStatement tryStatement = new TryStatement(startleft, end, tryBlock, catchesList, finallyBlock);
-	RESULT = tryStatement;
+    Block tryBlock = new Block(tryBlockStartleft, tryBlockEndright, tryList);
+    Block catchBlock = new Block(catchBlockStartleft, catchBlockEndright, catchList);
+    CatchClause catchClause = new CatchClause(catch_wordleft, catchBlockEndright, classNames, var, catchBlock);
+    ((LinkedList) catchesList).addFirst(catchClause);
+    int end = finallyBlock == null ? catchesListright : finallyBlockright;
+    TryStatement tryStatement = new TryStatement(startleft, end, tryBlock, catchesList, finallyBlock);
+    RESULT = tryStatement;
 :}
 
 | T_THROW:token expr:expr T_SEMICOLON:end
 {:
-	RESULT = new ThrowStatement(tokenleft, endright, expr);
+    RESULT = new ThrowStatement(tokenleft, endright, expr);
 :}
 
 | T_GOTO:s T_STRING:label T_SEMICOLON:e
 {:
-	RESULT = new GotoStatement(sleft, eright, new Identifier(labelleft, labelright, label));
+    RESULT = new GotoStatement(sleft, eright, new Identifier(labelleft, labelright, label));
 :}
 
 | error:theError /* error statement */
 {:
-	ASTError error = new ASTError(theErrorleft, theErrorright);
-	RESULT = error;
+    ASTError error = new ASTError(theErrorleft, theErrorright);
+    RESULT = error;
 :}
 
 | T_VAR_COMMENT:varComment
 {:
-	// TODO: var comment should be added as parser.ast node
+    // TODO: var comment should be added as parser.ast node
 :}
 ;
 
 additional_catches ::=
 non_empty_additional_catches:list
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 
 | /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 ;
 
 non_empty_additional_catches ::=
 additional_catch:catch_statement
 {:
-	List list = new LinkedList();
-	list.add(catch_statement);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(catch_statement);
+    RESULT = list;
 :}
 | non_empty_additional_catches:list additional_catch:catch_statement
 {:
-	list.add(catch_statement);
-	RESULT = list;
+    list.add(catch_statement);
+    RESULT = list;
 :}
 ;
 
@@ -1538,10 +1538,10 @@ additional_catch ::=
 T_CATCH:catch_word T_OPEN_PARENTHESE catch_class_names:classNames T_VARIABLE:var T_CLOSE_PARENTHESE
  T_CURLY_OPEN:catchBlockStart inner_statement_list:catchList T_CURLY_CLOSE:catchBlockEnd
 {:
-	Block catchBlock = new Block(catchBlockStartleft, catchBlockEndright, catchList);
-	Variable variable = new Variable(varleft, varright, var);
-	CatchClause catchClause = new CatchClause(catch_wordleft, catchBlockEndright, classNames, variable, catchBlock);
-	RESULT = catchClause;
+    Block catchBlock = new Block(catchBlockStartleft, catchBlockEndright, catchList);
+    Variable variable = new Variable(varleft, varright, var);
+    CatchClause catchClause = new CatchClause(catch_wordleft, catchBlockEndright, classNames, variable, catchBlock);
+    RESULT = catchClause;
 :}
 ;
 
@@ -1554,125 +1554,125 @@ additional_finally ::=
 | T_FINALLY:finally_word T_CURLY_OPEN:finallyBlockStart inner_statement_list:finallyList T_CURLY_CLOSE:finallyBlockEnd
 {:
     Block finallyBlock = new Block(finallyBlockStartleft, finallyBlockEndright, finallyList);
-	FinallyClause finallyClause = new FinallyClause(finally_wordleft, finallyBlockEndright, finallyBlock);
-	RESULT = finallyClause;
+    FinallyClause finallyClause = new FinallyClause(finally_wordleft, finallyBlockEndright, finallyBlock);
+    RESULT = finallyClause;
 :}
 ;
 
 catch_class_names ::=
 fully_qualified_class_name:className additional_catch_class_names:list
 {:
-	((LinkedList) list).addFirst(className);
-	RESULT = list;
+    ((LinkedList) list).addFirst(className);
+    RESULT = list;
 :}
 ;
 
 additional_catch_class_names ::=
 non_empty_additional_catch_class_names:list
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 
 | /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 ;
 
 non_empty_additional_catch_class_names ::=
 additional_catch_class_name:className
 {:
-	List list = new LinkedList();
-	list.add(className);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(className);
+    RESULT = list;
 :}
 
 | non_empty_additional_catch_class_names:list additional_catch_class_name:className
 {:
-	list.add(className);
-	RESULT = list;
+    list.add(className);
+    RESULT = list;
 :}
 ;
 
 additional_catch_class_name ::=
 T_OR fully_qualified_class_name:className
 {:
-	RESULT = className;
+    RESULT = className;
 :}
 ;
 
 unset_variables ::=
 unset_variable:var
 {:
-	List list = new LinkedList();
-	list.add(var);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(var);
+    RESULT = list;
 :}
 
 | unset_variables:list T_COMMA unset_variable:var
 {:
-	list.add(var);
-	RESULT = list;
+    list.add(var);
+    RESULT = list;
 :}
 ;
 
 unset_variable ::=
 variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 ;
 
 use_filename ::=
 T_CONSTANT_ENCAPSED_STRING:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
+    RESULT = s;
 :}
 
 | T_OPEN_PARENTHESE:start T_CONSTANT_ENCAPSED_STRING:scalar T_CLOSE_PARENTHESE:end
 {:
-	Scalar s = new Scalar(startleft, endright, scalar, Scalar.Type.STRING);
-	RESULT = s;
+    Scalar s = new Scalar(startleft, endright, scalar, Scalar.Type.STRING);
+    RESULT = s;
 :}
 ;
 
 function_declaration_statement ::=
 unticked_function_declaration_statement:functionDeclaration
 {:
-	RESULT = functionDeclaration;
+    RESULT = functionDeclaration;
 :}
 ;
 
 class_declaration_statement ::=
 unticked_class_declaration_statement:classDeclaration
 {:
-	RESULT = classDeclaration;
+    RESULT = classDeclaration;
 :}
 ;
 
 is_reference ::=
 /* empty */
 {:
-	RESULT = Boolean.FALSE;
+    RESULT = Boolean.FALSE;
 :}
 
 | T_REFERENCE
 {:
-	RESULT = Boolean.TRUE;
+    RESULT = Boolean.TRUE;
 :}
 ;
 
 is_variadic ::=
 /* empty */
 {:
-	RESULT = Boolean.FALSE;
+    RESULT = Boolean.FALSE;
 :}
 
 | T_ELLIPSIS
 {:
-	RESULT = Boolean.TRUE;
+    RESULT = Boolean.TRUE;
 :}
 ;
 
@@ -1682,10 +1682,10 @@ T_OPEN_PARENTHESE parameter_list:paramList T_CLOSE_PARENTHESE
 optional_return_type:returnType
 T_CURLY_OPEN:blockStart inner_statement_list:statementList T_CURLY_CLOSE:blockEnd
 {:
-	Identifier functionId = new Identifier(functionNameleft, functionNameright, functionName);
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, blockEndright, functionId, paramList, returnType, block, isReference.booleanValue());
-	RESULT = functionDeclaration;
+    Identifier functionId = new Identifier(functionNameleft, functionNameright, functionName);
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, blockEndright, functionId, paramList, returnType, block, isReference.booleanValue());
+    RESULT = functionDeclaration;
 :}
 ;
 
@@ -1694,10 +1694,10 @@ class_entry_type:modifier T_STRING:className
 extends_from:superClass implements_list:interfaces
 T_CURLY_OPEN:blockStart class_statement_list:statementList T_CURLY_CLOSE:blockEnd
 {:
-	Identifier classId = new Identifier(classNameleft, classNameright, className);
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	ClassDeclaration classDeclaration = new ClassDeclaration(modifierleft ,blockEndright, modifier, classId, superClass, interfaces, block);
-	RESULT = classDeclaration;
+    Identifier classId = new Identifier(classNameleft, classNameright, className);
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    ClassDeclaration classDeclaration = new ClassDeclaration(modifierleft ,blockEndright, modifier, classId, superClass, interfaces, block);
+    RESULT = classDeclaration;
 :}
 
 |
@@ -1705,44 +1705,44 @@ interface_entry:start T_STRING:className
 interface_extends_list:interfaces
 T_CURLY_OPEN:blockStart interface_statement_list:statementList T_CURLY_CLOSE:blockEnd
 {:
-	Identifier classId = new Identifier(classNameleft, classNameright, className);
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	InterfaceDeclaration interfaceDeclaration = new InterfaceDeclaration(startleft ,blockEndright, classId, interfaces, block);
-	RESULT = interfaceDeclaration;
+    Identifier classId = new Identifier(classNameleft, classNameright, className);
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    InterfaceDeclaration interfaceDeclaration = new InterfaceDeclaration(startleft ,blockEndright, classId, interfaces, block);
+    RESULT = interfaceDeclaration;
 :}
 
 |
 T_TRAIT:start T_STRING:traitName
 T_CURLY_OPEN:blockStart trait_statement_list:statementList T_CURLY_CLOSE:blockEnd
 {:
-	Identifier traitId = new Identifier(traitNameleft, traitNameright, traitName);
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	TraitDeclaration traitDeclaration = new TraitDeclaration(startleft, blockEndright, traitId, block);
-	RESULT = traitDeclaration;
+    Identifier traitId = new Identifier(traitNameleft, traitNameright, traitName);
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    TraitDeclaration traitDeclaration = new TraitDeclaration(startleft, blockEndright, traitId, block);
+    RESULT = traitDeclaration;
 :}
 ;
 
 interface_statement_list ::=
 interface_statement_list:list interface_statement:interfaceStatement
 {:
-	list.add(interfaceStatement);
-	RESULT = list;
+    list.add(interfaceStatement);
+    RESULT = list;
 :}
 
 | /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 ;
 
 interface_statement ::=
 constant_modifiers:modifier class_constant_declaration:list T_SEMICOLON:end
 {:
-	int constantStart = modifier == null ? listleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.IMPLICIT_PUBLIC : modifier;
-	ConstantDeclaration classConstantDeclaration = new ConstantDeclaration(constantStart, endright, modifier, list, false);
-	RESULT = classConstantDeclaration;
+    int constantStart = modifier == null ? listleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.IMPLICIT_PUBLIC : modifier;
+    ConstantDeclaration classConstantDeclaration = new ConstantDeclaration(constantStart, endright, modifier, list, false);
+    RESULT = classConstantDeclaration;
 :}
 
 | method_modifiers:modifier T_FUNCTION:start is_reference:isReference identifier:functionId
@@ -1750,12 +1750,12 @@ T_OPEN_PARENTHESE parameter_list:paramList T_CLOSE_PARENTHESE
 optional_return_type:returnType
 T_SEMICOLON:end
 {:
-	int methodStart = modifier == null ? startleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
-        Block block = new Block(endleft, endright, Collections.EMPTY_LIST, false);
-	FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, endright, functionId, paramList, returnType, block, isReference.booleanValue());
-	MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, endright, modifier.intValue(), functionDeclaration, true);
-	RESULT = methodDeclaration;
+    int methodStart = modifier == null ? startleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
+    Block block = new Block(endleft, endright, Collections.EMPTY_LIST, false);
+    FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, endright, functionId, paramList, returnType, block, isReference.booleanValue());
+    MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, endright, modifier.intValue(), functionDeclaration, true);
+    RESULT = methodDeclaration;
 :}
 
 | T_VAR_COMMENT:varComment
@@ -1767,22 +1767,22 @@ T_SEMICOLON:end
 trait_statement_list ::=
 trait_statement_list:list trait_statement:traitStatement
 {:
-	list.add(traitStatement);
-	RESULT = list;
+    list.add(traitStatement);
+    RESULT = list;
 :}
 
 | /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 ;
 
 trait_statement ::=
 variable_modifiers:modifier class_variable_declaration:decList T_SEMICOLON:end
 {:
-	FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
-	RESULT = fieldsDeclaration;
+    FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
+    RESULT = fieldsDeclaration;
 :}
 
 | method_modifiers:modifier T_FUNCTION:start is_reference:isReference identifier:functionId
@@ -1790,11 +1790,11 @@ T_OPEN_PARENTHESE parameter_list:paramList T_CLOSE_PARENTHESE
 optional_return_type:returnType
 method_body:body
 {:
-	int methodStart = modifier == null ? startleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
-	FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, bodyright, functionId, paramList, returnType, body, isReference.booleanValue());
-	MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, bodyright, modifier.intValue(), functionDeclaration, true);
-	RESULT = methodDeclaration;
+    int methodStart = modifier == null ? startleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
+    FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, bodyright, functionId, paramList, returnType, body, isReference.booleanValue());
+    MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, bodyright, modifier.intValue(), functionDeclaration, true);
+    RESULT = methodDeclaration;
 :}
 
 | T_VAR_COMMENT:varComment
@@ -1804,158 +1804,158 @@ method_body:body
 
 | T_USE:s use_traits:list use_traits_body:body
 {:
-	RESULT = new UseTraitStatement(sleft, bodyright, list, body);
+    RESULT = new UseTraitStatement(sleft, bodyright, list, body);
 :}
 ;
 
 class_entry_type ::=
 T_CLASS
 {:
-	RESULT = ClassDeclaration.Modifier.NONE;
+    RESULT = ClassDeclaration.Modifier.NONE;
 :}
 
 | T_ABSTRACT T_CLASS
 {:
-	RESULT = ClassDeclaration.Modifier.ABSTRACT;
+    RESULT = ClassDeclaration.Modifier.ABSTRACT;
 :}
 
 | T_FINAL T_CLASS
 {:
-	RESULT = ClassDeclaration.Modifier.FINAL;
+    RESULT = ClassDeclaration.Modifier.FINAL;
 :}
 ;
 
 extends_from ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_EXTENDS fully_qualified_class_name:className
 {:
-	RESULT = className;
+    RESULT = className;
 :}
 ;
 
 /* do nothing */
 interface_entry ::=
-	T_INTERFACE
+    T_INTERFACE
 ;
 
 interface_extends_list ::=
 /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 
 | T_EXTENDS interface_list:list
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 ;
 
 implements_list ::=
 /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 
 | T_IMPLEMENTS interface_list:list
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 ;
 
 interface_list ::=
 fully_qualified_class_name:className
 {:
-	List list = new LinkedList();
-	list.add(className);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(className);
+    RESULT = list;
 :}
 
 | interface_list:list T_COMMA fully_qualified_class_name:className
 {:
-	list.add(className);
-	RESULT = list;
+    list.add(className);
+    RESULT = list;
 :}
 ;
 
 foreach_optional_arg ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_DOUBLE_ARROW foreach_variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 ;
 
 foreach_variable ::=
 variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 
 | T_REFERENCE:start variable:var
 {:
-	Reference reference = new Reference (startleft, varright, var);
-	RESULT = reference;
+    Reference reference = new Reference (startleft, varright, var);
+    RESULT = reference;
 :}
 
 | T_LIST:start T_OPEN_PARENTHESE array_pair_list:varList T_CLOSE_PARENTHESE:end
 {:
-	ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
-	RESULT = vars;
+    ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
+    RESULT = vars;
 :}
 
 | T_OPEN_RECT:start array_pair_list:varList T_CLOSE_RECT:end
 {:
-	ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.NEW);
-	RESULT = vars;
+    ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.NEW);
+    RESULT = vars;
 :}
 ;
 
 for_statement ::=
 statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | T_NEKUDOTAIM:start inner_statement_list:statementList T_ENDFOR T_SEMICOLON
 {:
-	Block block = new Block(startleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(startleft, statementListright, statementList, false);
+    RESULT = block;
 :}
 ;
 
 foreach_statement ::=
 statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | T_NEKUDOTAIM:start inner_statement_list:statementList T_ENDFOREACH T_SEMICOLON
 {:
-	Block block = new Block(startleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(startleft, statementListright, statementList, false);
+    RESULT = block;
 :}
 ;
 
 declare_statement ::=
 statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | T_NEKUDOTAIM:start inner_statement_list:statementList T_ENDDECLARE T_SEMICOLON
 {:
-	Block block = new Block(startleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(startleft, statementListright, statementList, false);
+    RESULT = block;
 :}
 ;
 
@@ -1963,76 +1963,76 @@ statement:statement
 declare_list ::=
 string_st:key T_EQUAL static_scalar:value
 {:
-	List listKeys = new LinkedList();
-	List listValues = new LinkedList();
+    List listKeys = new LinkedList();
+    List listValues = new LinkedList();
 
-	Identifier id = new Identifier(keyleft, keyright, key);
-	listKeys.add(id);
-	listValues.add(value);
+    Identifier id = new Identifier(keyleft, keyright, key);
+    listKeys.add(id);
+    listValues.add(value);
 
-	List[] returnList = new List[] { listKeys, listValues };
-	RESULT = returnList;
+    List[] returnList = new List[] { listKeys, listValues };
+    RESULT = returnList;
 :}
 
 | declare_list:lists T_COMMA string_st:key T_EQUAL static_scalar:value
 {:
-	Identifier id = new Identifier(keyleft, keyright, key);
-	lists[0].add(id);
-	lists[1].add(value);
-	RESULT = lists;
+    Identifier id = new Identifier(keyleft, keyright, key);
+    lists[0].add(id);
+    lists[1].add(value);
+    RESULT = lists;
 :}
 ;
 
 switch_case_list ::=
 T_CURLY_OPEN:start case_list:caseList T_CURLY_CLOSE:end
 {:
-	Block block = new Block(startleft, endright, caseList);
-	RESULT = block;
+    Block block = new Block(startleft, endright, caseList);
+    RESULT = block;
 :}
 
 | T_CURLY_OPEN:start T_SEMICOLON case_list:caseList T_CURLY_CLOSE:end
 {:
-	Block block = new Block(startleft, endright, caseList);
-	RESULT = block;
+    Block block = new Block(startleft, endright, caseList);
+    RESULT = block;
 :}
 
 | T_NEKUDOTAIM:start case_list:caseList T_ENDSWITCH T_SEMICOLON:end
 {:
-	Block block = new Block(startleft, endright, caseList, false);
-	RESULT = block;
+    Block block = new Block(startleft, endright, caseList, false);
+    RESULT = block;
 :}
 
 | T_NEKUDOTAIM:start T_SEMICOLON case_list:caseList T_ENDSWITCH T_SEMICOLON:end
 {:
-	Block block = new Block(startleft, endright, caseList, false);
-	RESULT = block;
+    Block block = new Block(startleft, endright, caseList, false);
+    RESULT = block;
 :}
 ;
 
 case_list ::=
 /* empty */
 {:
-	RESULT = new LinkedList(); // of SwitchCase
+    RESULT = new LinkedList(); // of SwitchCase
 :}
 
 | case_list:caseList T_CASE:token expr:expr case_separator inner_statement_list:statements
 {:
-	SwitchCase switchCase = new SwitchCase(tokenleft, statementsright, expr, statements, false);
-	if (caseList == null) {
-		caseList = new LinkedList(); // of switchCase
-	}
-	caseList.add(switchCase);
-	RESULT = caseList;
+    SwitchCase switchCase = new SwitchCase(tokenleft, statementsright, expr, statements, false);
+    if (caseList == null) {
+        caseList = new LinkedList(); // of switchCase
+    }
+    caseList.add(switchCase);
+    RESULT = caseList;
 :}
 
 | case_list:caseList T_DEFAULT:token case_separator inner_statement_list:statements
 {:
-	SwitchCase switchCase = new SwitchCase(tokenleft, statementsright, null, statements, true);
-	if (caseList == null) {
-		caseList = new LinkedList(); // of SwitchCase
-	}
-	caseList.add(switchCase);
-	RESULT = caseList;
+    SwitchCase switchCase = new SwitchCase(tokenleft, statementsright, null, statements, true);
+    if (caseList == null) {
+        caseList = new LinkedList(); // of SwitchCase
+    }
+    caseList.add(switchCase);
+    RESULT = caseList;
 :}
 ;
 
@@ -2045,218 +2045,218 @@ T_NEKUDOTAIM
 while_statement ::=
 statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 
 | T_NEKUDOTAIM:colon inner_statement_list:statementList T_ENDWHILE T_SEMICOLON
 {:
-	Block block = new Block(colonleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(colonleft, statementListright, statementList, false);
+    RESULT = block;
 :}
 ;
 
 elseif_list ::=
 /* empty */
 {:
-	List listConditions = new LinkedList();
-	List listStatements = new LinkedList();
-	List listTokens = new LinkedList();
+    List listConditions = new LinkedList();
+    List listStatements = new LinkedList();
+    List listTokens = new LinkedList();
 
-	List[] returnList = new List[] { listConditions, listStatements, listTokens };
+    List[] returnList = new List[] { listConditions, listStatements, listTokens };
 
-	RESULT = returnList;
+    RESULT = returnList;
 :}
 
 | elseif_list:elseifList T_ELSEIF:token T_OPEN_PARENTHESE expr:condition T_CLOSE_PARENTHESE statement:iftrue
 {:
-	((LinkedList)elseifList[0]).addFirst(condition);
-	((LinkedList)elseifList[1]).addFirst(iftrue);
-	((LinkedList)elseifList[2]).addFirst(Integer.valueOf(tokenleft));
+    ((LinkedList)elseifList[0]).addFirst(condition);
+    ((LinkedList)elseifList[1]).addFirst(iftrue);
+    ((LinkedList)elseifList[2]).addFirst(Integer.valueOf(tokenleft));
 
-	RESULT = elseifList;
+    RESULT = elseifList;
 :}
 ;
 
 new_elseif_list ::=
 /* empty */
 {:
-	List listConditions = new LinkedList();
-	List listStatements = new LinkedList();
-	List listTokens = new LinkedList();
+    List listConditions = new LinkedList();
+    List listStatements = new LinkedList();
+    List listTokens = new LinkedList();
 
-	List[] returnList = new List[] { listConditions, listStatements, listTokens };
+    List[] returnList = new List[] { listConditions, listStatements, listTokens };
 
-	RESULT = returnList;
+    RESULT = returnList;
 :}
 
 | new_elseif_list:elseifList T_ELSEIF:token T_OPEN_PARENTHESE expr:condition T_CLOSE_PARENTHESE T_NEKUDOTAIM:colon inner_statement_list:statementList
 {:
-	Block block = new Block(colonleft, statementListright, statementList, false);
-	((LinkedList)elseifList[0]).addFirst(condition);
-	((LinkedList)elseifList[1]).addFirst(block);
-	((LinkedList)elseifList[2]).addFirst(Integer.valueOf(tokenleft));
+    Block block = new Block(colonleft, statementListright, statementList, false);
+    ((LinkedList)elseifList[0]).addFirst(condition);
+    ((LinkedList)elseifList[1]).addFirst(block);
+    ((LinkedList)elseifList[2]).addFirst(Integer.valueOf(tokenleft));
 
-	RESULT = elseifList;
+    RESULT = elseifList;
 :}
 ;
 
 else_single ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_ELSE statement:statement
 {:
-	RESULT = statement;
+    RESULT = statement;
 :}
 ;
 
 new_else_single ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_ELSE T_NEKUDOTAIM:colon inner_statement_list:statementList
 {:
-	Block block = new Block(colonleft, statementListright, statementList, false);
-	RESULT = block;
+    Block block = new Block(colonleft, statementListright, statementList, false);
+    RESULT = block;
 :}
 ;
 
 parameter_list ::=
 non_empty_parameter_list:list
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 
 | /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 ;
 
 non_empty_parameter_list ::=
 parameter:parameter
 {:
-	List list = new LinkedList();
-	list.add(parameter);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(parameter);
+    RESULT = list;
 :}
 
 | non_empty_parameter_list:list T_COMMA parameter:parameter
 {:
-	list.add(parameter);
-	RESULT = list;
+    list.add(parameter);
+    RESULT = list;
 :}
 ;
 
 parameter ::=
 optional_class_type:classType is_variadic:isVariadic T_VARIABLE:var
 {:
-	int start = classType == null ? (isVariadic ? isVariadicleft : varleft) : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
+    int start = classType == null ? (isVariadic ? isVariadicleft : varleft) : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
         Expression argument = v;
         if (isVariadic) {
             argument = new Variadic(isVariadicleft, varright, v);
         }
-	FormalParameter parameter = new FormalParameter(start, varright, classType, argument);
-	RESULT = parameter;
+    FormalParameter parameter = new FormalParameter(start, varright, classType, argument);
+    RESULT = parameter;
 :}
 
 | optional_class_type:classType T_REFERENCE:ref T_VARIABLE:var
 {:
-	int start = classType == null ? refleft : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
-	Reference ref_var = new Reference (refleft, varright, v);
-	FormalParameter parameter = new FormalParameter(start, varright, classType, ref_var);
-	RESULT = parameter;
+    int start = classType == null ? refleft : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
+    Reference ref_var = new Reference (refleft, varright, v);
+    FormalParameter parameter = new FormalParameter(start, varright, classType, ref_var);
+    RESULT = parameter;
 :}
 
 | optional_class_type:classType T_REFERENCE:ref T_ELLIPSIS:ell T_VARIABLE:var
 {:
-	int start = classType == null ? refleft : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
-	Variadic variadic = new Variadic(ellleft, varright, v);
-	Reference ref_var = new Reference (refleft, varright, variadic);
-	FormalParameter parameter = new FormalParameter(start, varright, classType, ref_var);
-	RESULT = parameter;
+    int start = classType == null ? refleft : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
+    Variadic variadic = new Variadic(ellleft, varright, v);
+    Reference ref_var = new Reference (refleft, varright, variadic);
+    FormalParameter parameter = new FormalParameter(start, varright, classType, ref_var);
+    RESULT = parameter;
 :}
 
 | optional_class_type:classType is_variadic:isVariadic T_VARIABLE:var T_EQUAL static_scalar:scalar
 {:
-	int start = classType == null ? (isVariadic ? isVariadicleft : varleft) : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
+    int start = classType == null ? (isVariadic ? isVariadicleft : varleft) : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
         Expression argument = v;
         if (isVariadic) {
             argument = new Variadic(isVariadicleft, varright, v);
         }
-	FormalParameter parameter = new FormalParameter(start, scalarright, classType, argument, scalar);
-	RESULT = parameter;
+    FormalParameter parameter = new FormalParameter(start, scalarright, classType, argument, scalar);
+    RESULT = parameter;
 :}
 
 | optional_class_type:classType T_REFERENCE:ref T_VARIABLE:var T_EQUAL static_scalar:scalar
 {:
-	int start = classType == null ? refleft : classTypeleft;
-	Variable v = new Variable(varleft, varright, var);
-	Reference ref_var = new Reference (refleft, varright, v);
-	FormalParameter parameter = new FormalParameter(start, scalarright, classType, ref_var, scalar);
-	RESULT = parameter;
+    int start = classType == null ? refleft : classTypeleft;
+    Variable v = new Variable(varleft, varright, var);
+    Reference ref_var = new Reference (refleft, varright, v);
+    FormalParameter parameter = new FormalParameter(start, scalarright, classType, ref_var, scalar);
+    RESULT = parameter;
 :}
 ;
 
 optional_return_type ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_NEKUDOTAIM:e class_type:className
 {:
-	RESULT = className;
+    RESULT = className;
 :}
 
 | T_NEKUDOTAIM:e T_QUESTION_MARK:nullable class_type:className
 {:
-	RESULT = new NullableType(nullableleft, classNameright, className);
+    RESULT = new NullableType(nullableleft, classNameright, className);
 :}
 ;
 
 optional_class_type ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | class_type:className
 {:
-	RESULT = className;
+    RESULT = className;
 :}
 
 | T_QUESTION_MARK:start class_type:className
 {:
-	RESULT = new NullableType(startleft, classNameright, className);
+    RESULT = new NullableType(startleft, classNameright, className);
 :}
 ;
 
 class_type ::=
 fully_qualified_class_name:className
 {:
-	RESULT = className;
+    RESULT = className;
 :}
 
 | T_ARRAY:array
 {:
-	Identifier classId = new Identifier(arrayleft, arrayright, "array");
-	RESULT = classId;
+    Identifier classId = new Identifier(arrayleft, arrayright, "array");
+    RESULT = classId;
 :}
 
 | T_CALLABLE:callable
 {:
-	Identifier classId = new Identifier(callableleft, callableright, "callable");
-	RESULT = classId;
+    Identifier classId = new Identifier(callableleft, callableright, "callable");
+    RESULT = classId;
 :}
 
 ;
@@ -2264,170 +2264,170 @@ fully_qualified_class_name:className
 function_call_parameter_list ::=
 non_empty_function_call_parameter_list:paramsList possible_comma
 {:
-	RESULT = paramsList;
+    RESULT = paramsList;
 :}
 
 | /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 ;
 
 non_empty_function_call_parameter_list ::=
 is_variadic:isVariadic expr_without_variable:var
 {:
-	List paramsList = new LinkedList();
-	Expression param = var;
+    List paramsList = new LinkedList();
+    Expression param = var;
         if (isVariadic) {
             param = new Variadic(isVariadicleft, varright, var);
         }
-	paramsList.add(param);
-	RESULT = paramsList;
+    paramsList.add(param);
+    RESULT = paramsList;
 :}
 
 | is_variadic:isVariadic variable:var
 {:
-	List paramsList = new LinkedList();
-	Expression param = var;
+    List paramsList = new LinkedList();
+    Expression param = var;
         if (isVariadic) {
             param = new Variadic(isVariadicleft, varright, var);
         }
-	paramsList.add(param);
-	RESULT = paramsList;
+    paramsList.add(param);
+    RESULT = paramsList;
 :}
 
 | T_REFERENCE:start w_variable:var
 {:
-	List paramsList = new LinkedList();
-	Expression var_ref = new Reference(startleft, varright, var);
-	paramsList.add(var_ref);
-	RESULT = paramsList;
+    List paramsList = new LinkedList();
+    Expression var_ref = new Reference(startleft, varright, var);
+    paramsList.add(var_ref);
+    RESULT = paramsList;
 :}
 
 | non_empty_function_call_parameter_list:paramsList T_COMMA is_variadic:isVariadic expr_without_variable:var
 {:
-        Expression param = var;
-        if (isVariadic) {
-            param = new Variadic(isVariadicleft, varright, var);
-        }
-	paramsList.add(param);
-	RESULT = paramsList;
+    Expression param = var;
+    if (isVariadic) {
+        param = new Variadic(isVariadicleft, varright, var);
+    }
+    paramsList.add(param);
+    RESULT = paramsList;
 :}
 
 | non_empty_function_call_parameter_list:paramsList T_COMMA is_variadic:isVariadic variable:var
 {:
-	Expression param = var;
-        if (isVariadic) {
-            param = new Variadic(isVariadicleft, varright, var);
-        }
-	paramsList.add(param);
-	RESULT = paramsList;
+    Expression param = var;
+    if (isVariadic) {
+        param = new Variadic(isVariadicleft, varright, var);
+    }
+    paramsList.add(param);
+    RESULT = paramsList;
 :}
 
 | non_empty_function_call_parameter_list:paramsList T_COMMA T_REFERENCE:start w_variable:var
 {:
-	Expression var_ref = new Reference(startleft, varright, var);
-	paramsList.add(var_ref);
-	RESULT = paramsList;
+    Expression var_ref = new Reference(startleft, varright, var);
+    paramsList.add(var_ref);
+    RESULT = paramsList;
 :}
 ;
 
 global_var_list ::=
 global_var_list:list T_COMMA global_var:var
 {:
-	list.add(var);
-	RESULT = list;
+    list.add(var);
+    RESULT = list;
 :}
 
 | global_var:var
 {:
-	List list = new LinkedList();
-	list.add(var);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(var);
+    RESULT = list;
 :}
 ;
 
 global_var ::=
 T_VARIABLE:var
 {:
-	Variable variable = new Variable(varleft, varright, var);
-	RESULT = variable;
+    Variable variable = new Variable(varleft, varright, var);
+    RESULT = variable;
 :}
 
 | T_DOLLAR:start r_variable:var
 {:
-	ReflectionVariable ref = new ReflectionVariable(startleft, varright, var);
-	RESULT = ref;
+    ReflectionVariable ref = new ReflectionVariable(startleft, varright, var);
+    RESULT = ref;
 :}
 
 | T_DOLLAR:start T_CURLY_OPEN expr:varName T_CURLY_CLOSE:end
 {:
-	ReflectionVariable var = new ReflectionVariable(startleft, endright, varName);
-	RESULT = var;
+    ReflectionVariable var = new ReflectionVariable(startleft, endright, varName);
+    RESULT = var;
 :}
 ;
 
 static_var_list ::=
 static_var_list:list T_COMMA T_VARIABLE:var
 {:
-	Variable v = new Variable(varleft, varright, var);
-	list.add(v);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    list.add(v);
+    RESULT = list;
 :}
 
 | static_var_list:list T_COMMA T_VARIABLE:var T_EQUAL static_scalar:expr
 {:
-	Variable v = new Variable(varleft, varright, var);
-	Assignment assignment = new Assignment(varleft, exprright, v, Assignment.Type.EQUAL, expr);
-	list.add(assignment);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    Assignment assignment = new Assignment(varleft, exprright, v, Assignment.Type.EQUAL, expr);
+    list.add(assignment);
+    RESULT = list;
 :}
 
 | T_VARIABLE:var
 {:
-	Variable v = new Variable(varleft, varright, var);
-	List list = new LinkedList();
-	list.add(v);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    List list = new LinkedList();
+    list.add(v);
+    RESULT = list;
 :}
 
 | T_VARIABLE:var T_EQUAL static_scalar:expr
 {:
-	Variable v = new Variable(varleft, varright, var);
-	Assignment assignment = new Assignment(varleft, exprright, v, Assignment.Type.EQUAL, expr);
-	List list = new LinkedList();
-	list.add(assignment);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    Assignment assignment = new Assignment(varleft, exprright, v, Assignment.Type.EQUAL, expr);
+    List list = new LinkedList();
+    list.add(assignment);
+    RESULT = list;
 :}
 ;
 
 class_statement_list ::=
 class_statement_list:list class_statement:classStatement
 {:
-	list.add(classStatement);
-	RESULT = list;
+    list.add(classStatement);
+    RESULT = list;
 :}
 
 | /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 ;
 
 class_statement ::=
 variable_modifiers:modifier class_variable_declaration:decList T_SEMICOLON:end
 {:
-	FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
-	RESULT = fieldsDeclaration;
+    FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
+    RESULT = fieldsDeclaration;
 :}
 
 | constant_modifiers:modifier class_constant_declaration:list T_SEMICOLON:end
 {:
-	int constantStart = modifier == null ? listleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.IMPLICIT_PUBLIC : modifier;
-	ConstantDeclaration classConstantDeclaration = new ConstantDeclaration(constantStart, endright, modifier, list, false);
-	RESULT = classConstantDeclaration;
+    int constantStart = modifier == null ? listleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.IMPLICIT_PUBLIC : modifier;
+    ConstantDeclaration classConstantDeclaration = new ConstantDeclaration(constantStart, endright, modifier, list, false);
+    RESULT = classConstantDeclaration;
 :}
 
 | method_modifiers:modifier T_FUNCTION:start is_reference:isReference identifier:functionId
@@ -2435,11 +2435,11 @@ T_OPEN_PARENTHESE parameter_list:paramList T_CLOSE_PARENTHESE
 optional_return_type:returnType
 method_body:body
 {:
-	int methodStart = modifier == null ? startleft : modifierleft;
-	modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
-	FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, bodyright, functionId, paramList, returnType, body, isReference.booleanValue());
-	MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, bodyright, modifier.intValue(), functionDeclaration, true);
-	RESULT = methodDeclaration;
+    int methodStart = modifier == null ? startleft : modifierleft;
+    modifier = modifier == null ? ASTPHP5Parser.PUBLIC : modifier;
+    FunctionDeclaration functionDeclaration = new FunctionDeclaration(startleft, bodyright, functionId, paramList, returnType, body, isReference.booleanValue());
+    MethodDeclaration methodDeclaration = new MethodDeclaration(methodStart, bodyright, modifier.intValue(), functionDeclaration, true);
+    RESULT = methodDeclaration;
 :}
 
 | T_VAR_COMMENT:varComment
@@ -2449,34 +2449,34 @@ method_body:body
 
 | T_USE:s use_traits:list use_traits_body:body
 {:
-	RESULT = new UseTraitStatement(sleft, bodyright, list, body);
+    RESULT = new UseTraitStatement(sleft, bodyright, list, body);
 :}
 ;
 
 use_traits ::=
 use_traits:list T_COMMA use_trait:useDecl
 {:
-	list.add(useDecl);
-	RESULT = list;
+    list.add(useDecl);
+    RESULT = list;
 :}
 
 | use_trait:useDecl
 {:
-	List list = new LinkedList();
-	list.add(useDecl);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(useDecl);
+    RESULT = list;
 :}
 ;
 
 use_trait ::=
 namespace_name:list
 {:
-	RESULT = new UseTraitStatementPart(listleft, listright, new NamespaceName(listleft, listright, list, false, false));
+    RESULT = new UseTraitStatementPart(listleft, listright, new NamespaceName(listleft, listright, list, false, false));
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list
 {:
-	RESULT = new UseTraitStatementPart(sleft, listright, new NamespaceName(sleft, listright, list, true, false));
+    RESULT = new UseTraitStatementPart(sleft, listright, new NamespaceName(sleft, listright, list, true, false));
 :}
 ;
 
@@ -2488,24 +2488,24 @@ T_SEMICOLON:e
 
 | T_CURLY_OPEN:start use_traits_body_statement_list:statementList T_CURLY_CLOSE:end
 {:
-	Block block = new Block(startleft, endright, statementList);
-	RESULT = block;
+    Block block = new Block(startleft, endright, statementList);
+    RESULT = block;
 :}
 ;
 
 use_traits_body_statement_list ::=
 use_traits_body_statement_list:statementList use_traits_body_statement:statement
 {:
-	// Ignore null statements
-	if(statement != null) {
-		statementList.add(statement);
-	}
-	RESULT = statementList;
+    // Ignore null statements
+    if(statement != null) {
+        statementList.add(statement);
+    }
+    RESULT = statementList;
 :}
 
 | /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 ;
 
@@ -2524,14 +2524,14 @@ trait_conflict_resolution_declaration:statement
 class_name_list ::=
 class_name_list:classNameList T_COMMA class_name:className
 {:
-	classNameList.add(className);
-	RESULT = classNameList;
+    classNameList.add(className);
+    RESULT = classNameList;
 :}
 | class_name:className
 {:
-	List classNameList = new LinkedList();
-	classNameList.add(className);
-	RESULT = classNameList;
+    List classNameList = new LinkedList();
+    classNameList.add(className);
+    RESULT = classNameList;
 :}
 ;
 
@@ -2583,42 +2583,42 @@ class_name:traitName T_PAAMAYIM_NEKUDOTAYIM string_st:oldMethodName T_AS traits_
 traits_alias_modifier ::=
 T_PUBLIC
 {:
-	RESULT = TraitMethodAliasDeclaration.Modifier.PUBLIC;
+    RESULT = TraitMethodAliasDeclaration.Modifier.PUBLIC;
 :}
 
 | T_PROTECTED
 {:
-	RESULT = TraitMethodAliasDeclaration.Modifier.PROTECTED;
+    RESULT = TraitMethodAliasDeclaration.Modifier.PROTECTED;
 :}
 
 | T_PRIVATE
 {:
-	RESULT = TraitMethodAliasDeclaration.Modifier.PRIVATE;
+    RESULT = TraitMethodAliasDeclaration.Modifier.PRIVATE;
 :}
 ;
 
 method_body ::=
 T_SEMICOLON /* abstract method */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_CURLY_OPEN:start inner_statement_list:statementList T_CURLY_CLOSE:end
 {:
-	Block block = new Block(startleft, endright, statementList);
-	RESULT = block;
+    Block block = new Block(startleft, endright, statementList);
+    RESULT = block;
 :}
 ;
 
 constant_modifiers ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | ppp_modifiers:modifier
 {:
-	RESULT = modifier;
+    RESULT = modifier;
 :}
 ;
 
@@ -2651,14 +2651,14 @@ ppp_modifiers:modifier
 
 | T_VAR
 {:
-	RESULT = ASTPHP5Parser.PUBLIC;
+    RESULT = ASTPHP5Parser.PUBLIC;
 :}
 ;
 
 method_modifiers ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | af_modifiers:modifier
@@ -2680,102 +2680,102 @@ method_modifiers ::=
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 :}
 
 | static_modifier:fModifier af_modifiers:sModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 :}
 
 | ppp_modifiers:fModifier static_modifier:sModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 :}
 
 | ppp_modifiers:fModifier af_modifiers:sModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 :}
 
 | af_modifiers:fModifier static_modifier:sModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 :}
 
 | af_modifiers:fModifier ppp_modifiers:sModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    result |= sModifier.intValue();
+    RESULT = Integer.valueOf(result);
 :}
 
 | static_modifier:fModifier ppp_modifiers:sModifier af_modifiers:tModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 :}
 
 | static_modifier:fModifier af_modifiers:sModifier ppp_modifiers:tModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 :}
 
 | ppp_modifiers:fModifier static_modifier:sModifier af_modifiers:tModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 :}
 
 | ppp_modifiers:fModifier af_modifiers:sModifier static_modifier:tModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 :}
 
 | af_modifiers:fModifier static_modifier:sModifier ppp_modifiers:tModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 :}
 
 | af_modifiers:fModifier ppp_modifiers:sModifier static_modifier:tModifier
 {:
     int result = 0;
     result |= fModifier.intValue();
-	result |= sModifier.intValue();
+    result |= sModifier.intValue();
     result |= tModifier.intValue();
-	RESULT = Integer.valueOf(result);
+    RESULT = Integer.valueOf(result);
 :}
 ;
 
@@ -2789,134 +2789,134 @@ T_STATIC
 ppp_modifiers ::=
 T_PUBLIC
 {:
-	RESULT = ASTPHP5Parser.PUBLIC;
+    RESULT = ASTPHP5Parser.PUBLIC;
 :}
 
 | T_PROTECTED
 {:
-	RESULT = ASTPHP5Parser.PROTECTED;
+    RESULT = ASTPHP5Parser.PROTECTED;
 :}
 
 | T_PRIVATE
 {:
-	RESULT = ASTPHP5Parser.PRIVATE;
+    RESULT = ASTPHP5Parser.PRIVATE;
 :}
 ;
 
 af_modifiers ::=
 T_ABSTRACT
 {:
-	RESULT = ASTPHP5Parser.ABSTRACT;
+    RESULT = ASTPHP5Parser.ABSTRACT;
 :}
 
 | T_FINAL
 {:
-	RESULT = ASTPHP5Parser.FINAL;
+    RESULT = ASTPHP5Parser.FINAL;
 :}
 ;
 
 class_variable_declaration ::=
 class_variable_declaration:list T_COMMA T_VARIABLE:var
 {:
-	Variable varId = new Variable(varleft, varright, var);
-	list.add(new ASTNode[] {varId, null});
-	RESULT = list;
+    Variable varId = new Variable(varleft, varright, var);
+    list.add(new ASTNode[] {varId, null});
+    RESULT = list;
 :}
 
 | class_variable_declaration:list T_COMMA T_VARIABLE:var T_EQUAL static_scalar:expr
 {:
-	Variable varId = new Variable(varleft, varright, var);
-	list.add(new ASTNode[] {varId, expr});
-	RESULT = list;
+    Variable varId = new Variable(varleft, varright, var);
+    list.add(new ASTNode[] {varId, expr});
+    RESULT = list;
 :}
 
 | T_VARIABLE:var
 {:
-	List list = new LinkedList();
-	Variable varId = new Variable(varleft, varright, var);
-	list.add(new ASTNode[] {varId, null});
-	RESULT = list;
+    List list = new LinkedList();
+    Variable varId = new Variable(varleft, varright, var);
+    list.add(new ASTNode[] {varId, null});
+    RESULT = list;
 :}
 
 | T_VARIABLE:var T_EQUAL static_scalar:expr
 {:
-	List list = new LinkedList();
-	Variable varId = new Variable(varleft, varright, var);
-	list.add(new ASTNode[] {varId, expr});
-	RESULT = list;
+    List list = new LinkedList();
+    Variable varId = new Variable(varleft, varright, var);
+    list.add(new ASTNode[] {varId, expr});
+    RESULT = list;
 :}
 ;
 
 constant_declaration ::=
 constant_declaration:list T_COMMA string_st:constName T_EQUAL static_scalar_value:expr
 {:
-	Identifier constId = new Identifier(constNameleft, constNameright, constName);
-	list.add(new ASTNode[] {constId, expr});
-	RESULT = list;
+    Identifier constId = new Identifier(constNameleft, constNameright, constName);
+    list.add(new ASTNode[] {constId, expr});
+    RESULT = list;
 :}
 
 | T_CONST string_st:constName T_EQUAL static_scalar_value:expr
 {:
-	List list = new LinkedList();
-	Identifier constId = new Identifier(constNameleft, constNameright, constName);
-	list.add(new ASTNode[] {constId, expr});
-	RESULT = list;
+    List list = new LinkedList();
+    Identifier constId = new Identifier(constNameleft, constNameright, constName);
+    list.add(new ASTNode[] {constId, expr});
+    RESULT = list;
 :}
 ;
 
 class_constant_declaration ::=
 class_constant_declaration:list T_COMMA identifier_without_class:constName T_EQUAL static_scalar_value:expr
 {:
-	list.add(new ASTNode[] {constName, expr});
-	RESULT = list;
+    list.add(new ASTNode[] {constName, expr});
+    RESULT = list;
 :}
 
 | T_CONST identifier_without_class:constId T_EQUAL static_scalar_value:expr
 {:
-	List list = new LinkedList();
-	list.add(new ASTNode[] {constId, expr});
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new ASTNode[] {constId, expr});
+    RESULT = list;
 :}
 ;
 
 echo_expr_list ::=
 echo_expr_list:exprList T_COMMA expr:expr
 {:
-	exprList.add(expr);
-	RESULT = exprList;
+    exprList.add(expr);
+    RESULT = exprList;
 :}
 | expr:expr
 {:
-	List exprList = new LinkedList();
-	exprList.add(expr);
-	RESULT = exprList;
+    List exprList = new LinkedList();
+    exprList.add(expr);
+    RESULT = exprList;
 :}
 ;
 
 for_expr ::=
 /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 
 | non_empty_for_expr:exprList
 {:
-	RESULT = exprList;
+    RESULT = exprList;
 :}
 ;
 
 non_empty_for_expr ::=
 non_empty_for_expr:exprList T_COMMA expr:expr
 {:
-	exprList.add(expr);
-	RESULT = exprList;
+    exprList.add(expr);
+    RESULT = exprList;
 :}
 
 | expr:expr
 {:
-	List exprList = new LinkedList();
-	exprList.add(expr);
-	RESULT = exprList;
+    List exprList = new LinkedList();
+    exprList.add(expr);
+    RESULT = exprList;
 :}
 ;
 
@@ -2928,288 +2928,288 @@ expr_without_variable_and_class_instance:ex
 
 | anonymous_class:ex
 {:
-	RESULT = ex;
+    RESULT = ex;
 :}
 
 | T_NEW:start class_name_reference:className ctor_arguments:ctor
 {:
-	ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(startleft, ctorright, className, ctor);
-	RESULT = classInstanceCreation;
+    ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(startleft, ctorright, className, ctor);
+    RESULT = classInstanceCreation;
 :}
 
 | T_CLONE:start expr:expr
 {:
-	CloneExpression clone = new CloneExpression(startleft, exprright, expr);
-	RESULT = clone;
+    CloneExpression clone = new CloneExpression(startleft, exprright, expr);
+    RESULT = clone;
 :}
 ;
 
 expr_without_variable_and_class_instance ::=
 T_LIST:start T_OPEN_PARENTHESE array_pair_list:varList T_CLOSE_PARENTHESE:close T_EQUAL expr:expr
 {:
-	ListVariable vars = new ListVariable(startleft, closeright, varList, ListVariable.SyntaxType.OLD);
-	Assignment list = new Assignment(startleft, exprright, vars, Assignment.Type.EQUAL, expr);
-	RESULT = list;
+    ListVariable vars = new ListVariable(startleft, closeright, varList, ListVariable.SyntaxType.OLD);
+    Assignment list = new Assignment(startleft, exprright, vars, Assignment.Type.EQUAL, expr);
+    RESULT = list;
 :}
 
 | T_OPEN_RECT:start array_pair_list:varList T_CLOSE_RECT:close T_EQUAL expr:expr
 {:
-	ListVariable vars = new ListVariable(startleft, closeright, varList, ListVariable.SyntaxType.NEW);
-	Assignment list = new Assignment(startleft, exprright, vars, Assignment.Type.EQUAL, expr);
-	RESULT = list;
+    ListVariable vars = new ListVariable(startleft, closeright, varList, ListVariable.SyntaxType.NEW);
+    Assignment list = new Assignment(startleft, exprright, vars, Assignment.Type.EQUAL, expr);
+    RESULT = list;
 :}
 
 | variable:var T_EQUAL expr_with_yields:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var, Assignment.Type.EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var, Assignment.Type.EQUAL, expr);
 :}
 
 | variable:var T_EQUAL T_REFERENCE:reftoken variable:refvar
 {:
-	RESULT = new Assignment(varleft, refvarright, var, Assignment.Type.EQUAL, new Reference(reftokenleft, refvarright, refvar));
+    RESULT = new Assignment(varleft, refvarright, var, Assignment.Type.EQUAL, new Reference(reftokenleft, refvarright, refvar));
 :}
 
 | variable:var T_EQUAL T_REFERENCE:reftoken T_NEW:start class_name_reference:className ctor_arguments:ctor
 {:
-	ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(startleft, ctorright, className, ctor);
-	Reference reference = new Reference(reftokenleft, ctorright, classInstanceCreation);
-	Assignment assignment = new Assignment(varleft, ctorright, var, Assignment.Type.EQUAL, reference);
-	RESULT = assignment;
+    ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(startleft, ctorright, className, ctor);
+    Reference reference = new Reference(reftokenleft, ctorright, classInstanceCreation);
+    Assignment assignment = new Assignment(varleft, ctorright, var, Assignment.Type.EQUAL, reference);
+    RESULT = assignment;
 :}
 
 | variable:var T_POW_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.POW_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.POW_EQUAL, expr);
 :}
 
 | variable:var T_PLUS_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.PLUS_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.PLUS_EQUAL, expr);
 :}
 
 | variable:var T_MINUS_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MINUS_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MINUS_EQUAL, expr);
 :}
 
 | variable:var T_MUL_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MUL_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MUL_EQUAL, expr);
 :}
 
 | variable:var T_DIV_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.DIV_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.DIV_EQUAL, expr);
 :}
 
 | variable:var T_CONCAT_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.CONCAT_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.CONCAT_EQUAL, expr);
 :}
 
 | variable:var T_MOD_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MOD_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.MOD_EQUAL, expr);
 :}
 
 | variable:var T_AND_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.AND_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.AND_EQUAL, expr);
 :}
 
 | variable:var T_OR_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.OR_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.OR_EQUAL, expr);
 :}
 
 | variable:var T_XOR_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.XOR_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.XOR_EQUAL, expr);
 :}
 
 | variable:var T_SL_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.SL_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.SL_EQUAL, expr);
 :}
 
 | variable:var T_SR_EQUAL expr:expr
 {:
-	RESULT = new Assignment(varleft, exprright, var , Assignment.Type.SR_EQUAL, expr);
+    RESULT = new Assignment(varleft, exprright, var , Assignment.Type.SR_EQUAL, expr);
 :}
 
 | rw_variable:var T_INC:token
 {:
-	RESULT = new PostfixExpression(varleft, tokenright, var , PostfixExpression.Operator.INC);
+    RESULT = new PostfixExpression(varleft, tokenright, var , PostfixExpression.Operator.INC);
 :}
 
 | T_INC:token rw_variable:var
 {:
-	RESULT = new PrefixExpression(tokenleft, varright, var , PrefixExpression.Operator.INC);
+    RESULT = new PrefixExpression(tokenleft, varright, var , PrefixExpression.Operator.INC);
 :}
 
 | rw_variable:var T_DEC:token
 {:
-	RESULT = new PostfixExpression(varleft, tokenright, var , PostfixExpression.Operator.DEC);
+    RESULT = new PostfixExpression(varleft, tokenright, var , PostfixExpression.Operator.DEC);
 :}
 
 | T_DEC:token rw_variable:var
 {:
-	RESULT = new PrefixExpression(tokenleft, varright, var , PrefixExpression.Operator.DEC);
+    RESULT = new PrefixExpression(tokenleft, varright, var , PrefixExpression.Operator.DEC);
 :}
 
 | expr:expr1 T_BOOLEAN_OR expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_OR, expr2);
 :}
 
 | expr:expr1 T_BOOLEAN_AND expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_AND, expr2);
 :}
 
 | expr:expr1 T_LOGICAL_OR expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_OR, expr2);
 :}
 
 | expr:expr1 T_LOGICAL_AND expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_AND, expr2);
 :}
 
 | expr:expr1 T_LOGICAL_XOR expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_XOR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_XOR, expr2);
 :}
 
 | expr:expr1 T_OR expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.OR, expr2);
 :}
 
 | expr:expr1 T_REFERENCE expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.AND, expr2);
 :}
 
 | expr:expr1 T_KOVA expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.XOR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.XOR, expr2);
 :}
 
 | expr:expr1 T_NEKUDA expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.CONCAT, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.CONCAT, expr2);
 :}
 
 | expr:expr1 T_POW expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.POW, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.POW, expr2);
 :}
 
 | expr:expr1 T_PLUS expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.PLUS, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.PLUS, expr2);
 :}
 
 | expr:expr1 T_MINUS expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MINUS, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MINUS, expr2);
 :}
 
 | expr:expr1 T_TIMES expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MUL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MUL, expr2);
 :}
 
 | expr:expr1 T_DIV expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.DIV, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.DIV, expr2);
 :}
 
 | expr:expr1 T_PRECENT expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MOD, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.MOD, expr2);
 :}
 
 | expr:expr1 T_SL expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SL, expr2);
 :}
 
 | expr:expr1 T_SR expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SR, expr2);
 :}
 
 | T_PLUS:token expr:expr
 {:
-	RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.PLUS);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.PLUS);
 :}
 
 | T_MINUS:token expr:expr
 {:
-	RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.MINUS);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.MINUS);
 :}
 
 | T_NOT:token expr:expr
 {:
-	RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.NOT);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.NOT);
 :}
 
 | T_TILDA:token expr:expr
 {:
-	RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.TILDA);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.TILDA);
 :}
 
 | expr:expr1 T_IS_IDENTICAL expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_IDENTICAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_IDENTICAL, expr2);
 :}
 
 | expr:expr1 T_IS_NOT_IDENTICAL expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_IDENTICAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_IDENTICAL, expr2);
 :}
 
 | expr:expr1 T_IS_EQUAL expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_EQUAL, expr2);
 :}
 
 | expr:expr1 T_IS_NOT_EQUAL expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_EQUAL, expr2);
 :}
 
 | expr:expr1 T_RGREATER expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.RGREATER, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.RGREATER, expr2);
 :}
 
 | expr:expr1 T_IS_SMALLER_OR_EQUAL expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_SMALLER_OR_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_SMALLER_OR_EQUAL, expr2);
 :}
 
 | expr:expr1 T_LGREATER expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.LGREATER, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.LGREATER, expr2);
 :}
 
 | expr:expr1 T_IS_GREATER_OR_EQUAL expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_GREATER_OR_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_GREATER_OR_EQUAL, expr2);
 :}
 
 | expr:expr1 T_SPACESHIP expr:expr2
 {:
-	RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SPACESHIP, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SPACESHIP, expr2);
 :}
 
 | expr:expr T_INSTANCEOF class_name_reference:className
 {:
-	RESULT = new InstanceOfExpression(exprleft, classNameright, expr , className);
+    RESULT = new InstanceOfExpression(exprleft, classNameright, expr , className);
 :}
 
 | parenthesis_expr:expr
@@ -3219,103 +3219,103 @@ T_LIST:start T_OPEN_PARENTHESE array_pair_list:varList T_CLOSE_PARENTHESE:close
 
 | expr:condition T_QUESTION_MARK expr:ifTrue T_NEKUDOTAIM expr:ifFalse
 {:
-	RESULT = new ConditionalExpression(conditionleft, ifFalseright, condition, ConditionalExpression.OperatorType.QUESTION_MARK, ifTrue, ifFalse);
+    RESULT = new ConditionalExpression(conditionleft, ifFalseright, condition, ConditionalExpression.OperatorType.QUESTION_MARK, ifTrue, ifFalse);
 :}
 
 | expr:cond T_QUESTION_MARK T_NEKUDOTAIM expr:ifFalse
 {:
-	RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.ELVIS, null, ifFalse);
+    RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.ELVIS, null, ifFalse);
 :}
 
 | expr:cond T_COALESCE expr:ifFalse
 {:
-	RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.COALESCE, null, ifFalse);
+    RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.COALESCE, null, ifFalse);
 :}
 
 | internal_functions_in_yacc:expr
 {:
-	RESULT = expr;
+    RESULT = expr;
 :}
 
 | T_INT_CAST:token expr:expr
 {:
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.INT);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.INT);
 :}
 
 | T_DOUBLE_CAST:token expr:expr
 {:
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.REAL);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.REAL);
 :}
 
 | T_STRING_CAST:token expr:expr
 {:
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.STRING);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.STRING);
 :}
 
 | T_ARRAY_CAST:token expr:expr
 {:
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.ARRAY);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.ARRAY);
 :}
 
 | T_OBJECT_CAST:token expr:expr
 {:
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.OBJECT);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.OBJECT);
 :}
 
 | T_BOOL_CAST:token expr:expr
 {:
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.BOOL);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.BOOL);
 :}
 
 | T_UNSET_CAST:token expr:expr
 {:
-	RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.UNSET);
+    RESULT = new CastExpression(tokenleft, exprright, expr , CastExpression.Type.UNSET);
 :}
 
 | T_EXIT:start exit_expr:expr
 {:
-	List expList = new LinkedList();
-	if (expr != null) {
-		expList.add(expr);
-	}
-	Identifier id = new Identifier(startleft, startright, start);
-	FunctionName name = new FunctionName(startleft, startright, id);
-	FunctionInvocation result = new FunctionInvocation(startleft, exprright, name, expList);
-	RESULT = result;
+    List expList = new LinkedList();
+    if (expr != null) {
+        expList.add(expr);
+    }
+    Identifier id = new Identifier(startleft, startright, start);
+    FunctionName name = new FunctionName(startleft, startright, id);
+    FunctionInvocation result = new FunctionInvocation(startleft, exprright, name, expList);
+    RESULT = result;
 :}
 
 | T_AT:start expr:expr
 {:
-	IgnoreError ignoreError = new IgnoreError(startleft, exprright, expr);
-	RESULT = ignoreError;
+    IgnoreError ignoreError = new IgnoreError(startleft, exprright, expr);
+    RESULT = ignoreError;
 :}
 
 | scalar:scalar
 {:
-	RESULT = scalar;
+    RESULT = scalar;
 :}
 
 | array_creation:array
 {:
-	RESULT = array;
+    RESULT = array;
 :}
 
 | T_BACKQUATE:start encaps_list:list T_BACKQUATE:end
 {:
-	BackTickExpression backTickExpression = new BackTickExpression(startleft, endright, list);
-	RESULT = backTickExpression;
+    BackTickExpression backTickExpression = new BackTickExpression(startleft, endright, list);
+    RESULT = backTickExpression;
 :}
 
 | T_PRINT:start expr:expr
 {:
-	List expList = new LinkedList();
-	if (expr != null) {
-		expList.add(expr);
-	}
-	Identifier id = new Identifier(startleft, startright, "print");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	FunctionInvocation result = new FunctionInvocation(startleft, exprright, name, expList);
-	RESULT = result;
+    List expList = new LinkedList();
+    if (expr != null) {
+        expList.add(expr);
+    }
+    Identifier id = new Identifier(startleft, startright, "print");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    FunctionInvocation result = new FunctionInvocation(startleft, exprright, name, expList);
+    RESULT = result;
 :}
 
 | T_FUNCTION:s is_reference:isReference
@@ -3324,8 +3324,8 @@ lexical_vars:varsList
 optional_return_type:returnType
 T_CURLY_OPEN:blockStart inner_statement_list:list T_CURLY_CLOSE:blockEnd
 {:
-	RESULT = new LambdaFunctionDeclaration(sleft, blockEndright, paramList, returnType, varsList,
-		new Block(blockStartleft, blockEndright, list), isReference.booleanValue(), false);
+    RESULT = new LambdaFunctionDeclaration(sleft, blockEndright, paramList, returnType, varsList,
+        new Block(blockStartleft, blockEndright, list), isReference.booleanValue(), false);
 :}
 
 | T_STATIC:st T_FUNCTION:s is_reference:isReference
@@ -3334,8 +3334,8 @@ lexical_vars:varsList
 optional_return_type:returnType
 T_CURLY_OPEN:blockStart inner_statement_list:list T_CURLY_CLOSE:blockEnd
 {:
-	RESULT = new LambdaFunctionDeclaration(sleft, blockEndright, paramList, returnType, varsList,
-		new Block(blockStartleft, blockEndright, list), isReference.booleanValue(), true);
+    RESULT = new LambdaFunctionDeclaration(sleft, blockEndright, paramList, returnType, varsList,
+        new Block(blockStartleft, blockEndright, list), isReference.booleanValue(), true);
 :}
 
 | expression_array_access:eaa
@@ -3347,120 +3347,120 @@ T_CURLY_OPEN:blockStart inner_statement_list:list T_CURLY_CLOSE:blockEnd
 lexical_vars ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_USE:s T_OPEN_PARENTHESE lexical_var_list:list T_CLOSE_PARENTHESE:e
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 ;
 
 lexical_var_list ::=
 lexical_var_list:list T_COMMA T_VARIABLE:var
 {:
-	Variable v = new Variable(varleft, varright, var);
-	list.add(v);
-	RESULT = list;
+    Variable v = new Variable(varleft, varright, var);
+    list.add(v);
+    RESULT = list;
 :}
 
 | lexical_var_list:list T_COMMA T_REFERENCE:ref T_VARIABLE:var
 {:
-	list.add(new Reference (refleft, varright, new Variable(varleft, varright, var)));
-	RESULT = list;
+    list.add(new Reference (refleft, varright, new Variable(varleft, varright, var)));
+    RESULT = list;
 :}
 
 | T_VARIABLE:var
 {:
-	List list = new LinkedList();
-	list.add(new Variable(varleft, varright, var));
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new Variable(varleft, varright, var));
+    RESULT = list;
 :}
 
 | T_REFERENCE:ref T_VARIABLE:var
 {:
-	List list = new LinkedList();
-	list.add(new Reference (refleft, varright, new Variable(varleft, varright, var)));
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(new Reference (refleft, varright, new Variable(varleft, varright, var)));
+    RESULT = list;
 :}
 ;
 
 function_call ::=
 namespace_name:list T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new FunctionInvocation(listleft, eright,
-		new FunctionName(listleft, listright,
-			new NamespaceName(listleft, listright, list, false, false)), parameters);
+    RESULT = new FunctionInvocation(listleft, eright,
+        new FunctionName(listleft, listright,
+            new NamespaceName(listleft, listright, list, false, false)), parameters);
 :}
 
 | T_NAMESPACE:s T_NS_SEPARATOR namespace_name:list T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new FunctionInvocation(sleft, eright,
-		new FunctionName(sleft, listright,
-			new NamespaceName(sleft, listright, list, false, true)), parameters);
+    RESULT = new FunctionInvocation(sleft, eright,
+        new FunctionName(sleft, listright,
+            new NamespaceName(sleft, listright, list, false, true)), parameters);
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new FunctionInvocation(sleft, eright,
-		new FunctionName(sleft, listright,
-			new NamespaceName(sleft, listright, list, true, false)), parameters);
+    RESULT = new FunctionInvocation(sleft, eright,
+        new FunctionName(sleft, listright,
+            new NamespaceName(sleft, listright, list, true, false)), parameters);
 :}
 
 | class_name:className T_PAAMAYIM_NEKUDOTAYIM identifier:fn T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(fnleft, eright,
-			new FunctionName(fnleft, fnright, fn), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(fnleft, eright,
+            new FunctionName(fnleft, fnright, fn), parameters));
 :}
 
 | class_name:className T_PAAMAYIM_NEKUDOTAYIM variable_without_objects:reflectionName T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(reflectionNameleft, eright,
-			new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(reflectionNameleft, eright,
+            new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters));
 :}
 
 | class_name:className T_PAAMAYIM_NEKUDOTAYIM T_CURLY_OPEN:o expr:expr T_CURLY_CLOSE:c T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
     ReflectionVariable reflectionVariable = new ReflectionVariable(oleft, cright, expr);
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(oleft, eright,
-			new FunctionName(oleft, cright, reflectionVariable), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(oleft, eright,
+            new FunctionName(oleft, cright, reflectionVariable), parameters));
 :}
 
 | variable_class_name:className T_PAAMAYIM_NEKUDOTAYIM identifier:fn T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(fnleft, eright,
-			new FunctionName(fnleft, fnright, fn), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(fnleft, eright,
+            new FunctionName(fnleft, fnright, fn), parameters));
 :}
 
 | variable_class_name:className T_PAAMAYIM_NEKUDOTAYIM variable_without_objects:reflectionName T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(reflectionNameleft, eright,
-			new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters));
+    RESULT = new StaticMethodInvocation(classNameleft, eright, className,
+        new FunctionInvocation(reflectionNameleft, eright,
+            new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters));
 :}
 
 | variable_class_name:className T_PAAMAYIM_NEKUDOTAYIM T_CURLY_OPEN:o expr:expr T_CURLY_CLOSE:c T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	ReflectionVariable reflectionVariable = new ReflectionVariable(oleft, cright, expr);
+    ReflectionVariable reflectionVariable = new ReflectionVariable(oleft, cright, expr);
     RESULT = new StaticMethodInvocation(classNameleft, eright, className,
-		new FunctionInvocation(oleft, eright,
-			new FunctionName(oleft, cright, reflectionVariable), parameters));
+        new FunctionInvocation(oleft, eright,
+            new FunctionName(oleft, cright, reflectionVariable), parameters));
 :}
 
 | variable_without_objects:reflectionName T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new FunctionInvocation(reflectionNameleft, eright,
-		new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters);
+    RESULT = new FunctionInvocation(reflectionNameleft, eright,
+        new FunctionName(reflectionNameleft, reflectionNameright, reflectionName), parameters);
 :}
 
 | callable_expr:start T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new FunctionInvocation(startleft, eright,
-		new FunctionName(startleft, startright, start), parameters);
+    RESULT = new FunctionInvocation(startleft, eright,
+        new FunctionName(startleft, startright, start), parameters);
 :}
 
 | function_call:var array_dimension:ad
@@ -3470,70 +3470,70 @@ namespace_name:list T_OPEN_PARENTHESE function_call_parameter_list:parameters T_
 
 | function_call:call T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
-	RESULT = new FunctionInvocation(callleft, eright,
-		new FunctionName(callleft, callright, call), parameters);
+    RESULT = new FunctionInvocation(callleft, eright,
+        new FunctionName(callleft, callright, call), parameters);
 :}
 ;
 
 callable_expr ::=
 parenthesis_expr:expr
 {:
-	RESULT = expr;
+    RESULT = expr;
 :}
 
 | dereferencable_variable:dereferencableVariable
 {:
-	RESULT = dereferencableVariable;
+    RESULT = dereferencableVariable;
 :}
 
 | field_or_method_access:fma
 {:
-	RESULT = fma;
+    RESULT = fma;
 :}
 
 | T_OPEN_PARENTHESE:start anonymous_class:cls T_CLOSE_PARENTHESE:end
 {:
-	AnonymousObjectVariable anonymous= new AnonymousObjectVariable(startleft, endright, cls);
-	RESULT = anonymous;
+    AnonymousObjectVariable anonymous= new AnonymousObjectVariable(startleft, endright, cls);
+    RESULT = anonymous;
 :}
 
 | T_OPEN_PARENTHESE:start T_NEW:n class_name_reference:className ctor_arguments:ctor T_CLOSE_PARENTHESE:end
 {:
-	ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(nleft, ctorright, className, ctor);
-	AnonymousObjectVariable anonymous = new AnonymousObjectVariable(startleft, endright, classInstanceCreation);
-	RESULT = anonymous;
+    ClassInstanceCreation classInstanceCreation = new ClassInstanceCreation(nleft, ctorright, className, ctor);
+    AnonymousObjectVariable anonymous = new AnonymousObjectVariable(startleft, endright, classInstanceCreation);
+    RESULT = anonymous;
 :}
 
 | T_CONSTANT_ENCAPSED_STRING:scalar
 {:
-	RESULT = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
+    RESULT = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
 :}
 
 | array_creation:array
 {:
-	RESULT = array;
+    RESULT = array;
 :}
 ;
 
 class_name ::=
 T_STATIC:s
 {:
-	RESULT = new Identifier(sleft, sright, "static");
+    RESULT = new Identifier(sleft, sright, "static");
 :}
 
 | namespace_name:list
 {:
-	RESULT = new NamespaceName(listleft, listright, list, false, false);
+    RESULT = new NamespaceName(listleft, listright, list, false, false);
 :}
 
 | T_NAMESPACE:s T_NS_SEPARATOR namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 :}
 ;
 
@@ -3541,239 +3541,239 @@ T_STATIC:s
 fully_qualified_class_name ::=
 namespace_name:list
 {:
-	RESULT = new NamespaceName(listleft, listright, list, false, false);
+    RESULT = new NamespaceName(listleft, listright, list, false, false);
 :}
 
 | T_NAMESPACE:s T_NS_SEPARATOR namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 :}
 ;
 
 class_name_reference ::=
 class_name:className
 {:
-	RESULT = new ClassName(classNameleft, classNameright, className);
+    RESULT = new ClassName(classNameleft, classNameright, className);
 :}
 
 | dynamic_class_name_reference:className
 {:
-	RESULT = className;
+    RESULT = className;
 :}
 ;
 
 dynamic_class_name_reference ::=
 base_variable:var T_OBJECT_OPERATOR object_property:firstVarProperty dynamic_class_name_variable_properties:propertyList
 {:
-	// then get the aggregated list of properties (->...->...->...)
-	LinkedList list = (LinkedList) propertyList;
-	list.addFirst(firstVarProperty);
-
-	// now create the dispatch(es) nodes
-	VariableBase dispatch = null;
-	VariableBase dispatcher = var;
-	Iterator listIt = list.iterator();
-	while (listIt.hasNext()) {
-		VariableBase property = (VariableBase)listIt.next();
-		dispatch = parser.createDispatch(dispatcher, property);
-		dispatcher = dispatch;
-	}
+    // then get the aggregated list of properties (->...->...->...)
+    LinkedList list = (LinkedList) propertyList;
+    list.addFirst(firstVarProperty);
+
+    // now create the dispatch(es) nodes
+    VariableBase dispatch = null;
+    VariableBase dispatcher = var;
+    Iterator listIt = list.iterator();
+    while (listIt.hasNext()) {
+        VariableBase property = (VariableBase)listIt.next();
+        dispatch = parser.createDispatch(dispatcher, property);
+        dispatcher = dispatch;
+    }
 
-	// create class name from the dispatch
-	ClassName name = new ClassName(varleft, propertyListright, dispatch);
-	RESULT = name;
+    // create class name from the dispatch
+    ClassName name = new ClassName(varleft, propertyListright, dispatch);
+    RESULT = name;
 :}
 
 | base_variable:var
 {:
-	 ClassName name = new ClassName(varleft, varright, var);
-	 RESULT = name;
+     ClassName name = new ClassName(varleft, varright, var);
+     RESULT = name;
 :}
 ;
 
 dynamic_class_name_variable_properties ::=
 dynamic_class_name_variable_properties:variables dynamic_class_name_variable_property:var
 {:
-	variables.add(var);
-	RESULT = variables;
+    variables.add(var);
+    RESULT = variables;
 :}
 
 | /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 ;
 
 dynamic_class_name_variable_property ::=
 T_OBJECT_OPERATOR object_property:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 ;
 
 exit_expr ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_OPEN_PARENTHESE T_CLOSE_PARENTHESE
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | T_OPEN_PARENTHESE expr:expr T_CLOSE_PARENTHESE
 {:
-	RESULT = expr;
+    RESULT = expr;
 :}
 ;
 
 ctor_arguments ::=
 /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 
 | T_OPEN_PARENTHESE function_call_parameter_list:paramsList T_CLOSE_PARENTHESE
 {:
-	RESULT = paramsList;
+    RESULT = paramsList;
 :}
 ;
 
 common_scalar ::=
 T_LNUMBER:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.INT);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.INT);
+    RESULT = s;
 :}
 
 | T_DNUMBER:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.REAL);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.REAL);
+    RESULT = s;
 :}
 
 | T_CONSTANT_ENCAPSED_STRING:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
+    RESULT = s;
 :}
 
 | T_LINE:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, "__LINE__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__LINE__", Scalar.Type.SYSTEM);
+    RESULT = s;
 :}
 
 | T_FILE:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, "__FILE__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__FILE__", Scalar.Type.SYSTEM);
+    RESULT = s;
 :}
 
 | T_DIR:scalar
 {:
-	RESULT = new Scalar(scalarleft, scalarright, "__DIR__", Scalar.Type.SYSTEM);
+    RESULT = new Scalar(scalarleft, scalarright, "__DIR__", Scalar.Type.SYSTEM);
 :}
 
 | T_CLASS_C:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, "__CLASS__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__CLASS__", Scalar.Type.SYSTEM);
+    RESULT = s;
 :}
 
 | T_TRAIT_C:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, "__TRAIT__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__TRAIT__", Scalar.Type.SYSTEM);
+    RESULT = s;
 :}
 
 | T_METHOD_C:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, "__METHOD__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__METHOD__", Scalar.Type.SYSTEM);
+    RESULT = s;
 :}
 
 | T_FUNC_C:scalar
 {:
-	Scalar s = new Scalar(scalarleft, scalarright, "__FUNCTION__", Scalar.Type.SYSTEM);
-	RESULT = s;
+    Scalar s = new Scalar(scalarleft, scalarright, "__FUNCTION__", Scalar.Type.SYSTEM);
+    RESULT = s;
 :}
 
 | T_NS_C:scalar
 {:
-	RESULT = new Scalar(scalarleft, scalarright, "__NAMESPACE__", Scalar.Type.SYSTEM);
+    RESULT = new Scalar(scalarleft, scalarright, "__NAMESPACE__", Scalar.Type.SYSTEM);
 :}
 
 | T_START_NOWDOC:start T_ENCAPSED_AND_WHITESPACE:scalar T_END_NOWDOC:end
 {:
-        Scalar s = new Scalar(startleft, endright, scalar, Scalar.Type.STRING);
-        RESULT = s;
+    Scalar s = new Scalar(startleft, endright, scalar, Scalar.Type.STRING);
+    RESULT = s;
 :}
 
 | T_START_NOWDOC:start T_END_NOWDOC:end
 {:
-        Scalar s = new Scalar(startleft, endright, "", Scalar.Type.STRING); //NOI18N
-        RESULT = s;
+    Scalar s = new Scalar(startleft, endright, "", Scalar.Type.STRING); //NOI18N
+    RESULT = s;
 :}
 ;
 
 static_scalar_value ::=
 common_scalar:scalar
 {:
-	RESULT = scalar;
+    RESULT = scalar;
 :}
 
 | namespace_name:list
 {:
-	if (list.size() == 1) {
-            String itemName = ((Identifier)list.get(0)).getName();
-            String itemNameLower = itemName.toLowerCase();
-            if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) { //NOI18N
-                RESULT = new Scalar(listleft, listright, itemName, Scalar.Type.STRING);
-            } else {
-                RESULT = new NamespaceName(listleft, listright, list, false, false);
-            }
-	} else {
+    if (list.size() == 1) {
+        String itemName = ((Identifier)list.get(0)).getName();
+        String itemNameLower = itemName.toLowerCase();
+        if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) { //NOI18N
+            RESULT = new Scalar(listleft, listright, itemName, Scalar.Type.STRING);
+        } else {
             RESULT = new NamespaceName(listleft, listright, list, false, false);
-	}
+        }
+    } else {
+        RESULT = new NamespaceName(listleft, listright, list, false, false);
+    }
 :}
 
 | T_NAMESPACE:s T_NS_SEPARATOR namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 :}
 
 | static_class_constant:classConstant
 {:
-	RESULT = classConstant;
+    RESULT = classConstant;
 :}
 
 | heredoc:doc
 {:
-	RESULT = doc;
+    RESULT = doc;
 :}
 
 | static_operation:operation
 {:
-        RESULT = operation;
+    RESULT = operation;
 :}
 ;
 
 static_operation ::=
 /*static_scalar_value T_OPEN_RECT static_scalar_value T_CLOSE_RECT
 {:
-        RESULT = ???;
+    RESULT = ???;
 :}
 
 | */
@@ -3805,229 +3805,229 @@ static_array_creation:arrayCreation
 
 | static_scalar_value:expr1 T_PLUS static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.PLUS, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.PLUS, expr2);
 :}
 
 | static_scalar_value:expr1 T_MINUS static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MINUS, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MINUS, expr2);
 :}
 
 | static_scalar_value:expr1 T_TIMES static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MUL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MUL, expr2);
 :}
 
 | static_scalar_value:expr1 T_POW static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.POW, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.POW, expr2);
 :}
 
 | static_scalar_value:expr1 T_DIV static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.DIV, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.DIV, expr2);
 :}
 
 | static_scalar_value:expr1 T_PRECENT static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MOD, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1, InfixExpression.OperatorType.MOD, expr2);
 :}
 
 | T_NOT:token static_scalar_value:expr
 {:
-        RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.NOT);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.NOT);
 :}
 
 | T_TILDA:token static_scalar_value:expr
 {:
-        RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.TILDA);
+    RESULT = new UnaryOperation(tokenleft, exprright, expr , UnaryOperation.Operator.TILDA);
 :}
 
 | static_scalar_value:expr1 T_OR static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.OR, expr2);
 :}
 
 | static_scalar_value:expr1 T_REFERENCE static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.AND, expr2);
 :}
 
 | static_scalar_value:expr1 T_KOVA static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.XOR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.XOR, expr2);
 :}
 
 | static_scalar_value:expr1 T_SL static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SL, expr2);
 :}
 
 | static_scalar_value:expr1 T_SR static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SR, expr2);
 :}
 
 | static_scalar_value:expr1 T_NEKUDA static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.CONCAT, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.CONCAT, expr2);
 :}
 
 | static_scalar_value:expr1 T_LOGICAL_XOR static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_XOR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_XOR, expr2);
 :}
 
 | static_scalar_value:expr1 T_LOGICAL_AND static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_AND, expr2);
 :}
 
 | static_scalar_value:expr1 T_LOGICAL_OR static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.STRING_OR, expr2);
 :}
 
 | static_scalar_value:expr1 T_BOOLEAN_AND static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_AND, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_AND, expr2);
 :}
 
 | static_scalar_value:expr1 T_BOOLEAN_OR static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_OR, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.BOOL_OR, expr2);
 :}
 
 | static_scalar_value:expr1 T_IS_IDENTICAL static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_IDENTICAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_IDENTICAL, expr2);
 :}
 
 | static_scalar_value:expr1 T_IS_NOT_IDENTICAL static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_IDENTICAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_IDENTICAL, expr2);
 :}
 
 | static_scalar_value:expr1 T_IS_EQUAL static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_EQUAL, expr2);
 :}
 
 | static_scalar_value:expr1 T_IS_NOT_EQUAL static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_NOT_EQUAL, expr2);
 :}
 
 | static_scalar_value:expr1 T_RGREATER static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.RGREATER, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.RGREATER, expr2);
 :}
 
 | static_scalar_value:expr1 T_LGREATER static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.LGREATER, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.LGREATER, expr2);
 :}
 
 | static_scalar_value:expr1 T_IS_SMALLER_OR_EQUAL static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_SMALLER_OR_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_SMALLER_OR_EQUAL, expr2);
 :}
 
 | static_scalar_value:expr1 T_IS_GREATER_OR_EQUAL static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_GREATER_OR_EQUAL, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.IS_GREATER_OR_EQUAL, expr2);
 :}
 
 | static_scalar_value:expr1 T_SPACESHIP static_scalar_value:expr2
 {:
-        RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SPACESHIP, expr2);
+    RESULT = new InfixExpression(expr1left, expr2right, expr1 , InfixExpression.OperatorType.SPACESHIP, expr2);
 :}
 
 | static_scalar_value:cond T_QUESTION_MARK T_NEKUDOTAIM static_scalar_value:ifFalse
 {:
-        RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.ELVIS, null, ifFalse);
+    RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.ELVIS, null, ifFalse);
 :}
 
 | static_scalar_value:condition T_QUESTION_MARK static_scalar_value:ifTrue T_NEKUDOTAIM static_scalar_value:ifFalse
 {:
-        RESULT = new ConditionalExpression(conditionleft, ifFalseright, condition, ConditionalExpression.OperatorType.QUESTION_MARK, ifTrue, ifFalse);
+    RESULT = new ConditionalExpression(conditionleft, ifFalseright, condition, ConditionalExpression.OperatorType.QUESTION_MARK, ifTrue, ifFalse);
 :}
 
 | static_scalar_value:cond T_COALESCE static_scalar_value:ifFalse
 {:
-        RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.COALESCE, null, ifFalse);
+    RESULT = new ConditionalExpression(condleft, ifFalseright, cond, ConditionalExpression.OperatorType.COALESCE, null, ifFalse);
 :}
 
 | T_PLUS:start static_scalar_value:expr
 {:
-	UnaryOperation op = new UnaryOperation(startleft, exprright, expr, UnaryOperation.Operator.PLUS);
-	RESULT = op;
+    UnaryOperation op = new UnaryOperation(startleft, exprright, expr, UnaryOperation.Operator.PLUS);
+    RESULT = op;
 :}
 
 | T_MINUS:start static_scalar_value:expr
 {:
-	UnaryOperation op = new UnaryOperation(startleft, exprright, expr, UnaryOperation.Operator.MINUS);
-	RESULT = op;
+    UnaryOperation op = new UnaryOperation(startleft, exprright, expr, UnaryOperation.Operator.MINUS);
+    RESULT = op;
 :}
 
 | T_OPEN_PARENTHESE static_scalar_value:expr T_CLOSE_PARENTHESE
 {:
-        RESULT = expr;
+    RESULT = expr;
 :}
 ;
 
 static_scalar ::=  /* compile-time evaluated scalars */
 static_scalar_value:scalar
 {:
-	RESULT = scalar;
+    RESULT = scalar;
 :}
 ;
 
 static_class_constant ::=
 class_name:className T_PAAMAYIM_NEKUDOTAYIM static_reference_constant:constant
 {:
-	RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
+    RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
 :}
 ;
 
 static_reference_constant ::=
 static_class_constant_array_access:arrayAccess
 {:
-	RESULT = arrayAccess;
+    RESULT = arrayAccess;
 :}
 
 | identifier:constantName
 {:
-	RESULT = constantName;
+    RESULT = constantName;
 :}
 ;
 
 static_class_constant_array_access ::=
 static_class_constant_array_access:arrayAccess T_OPEN_RECT:o static_scalar_value:index T_CLOSE_RECT:end
 {:
-	RESULT = new ExpressionArrayAccess(arrayAccessleft, endright, arrayAccess, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(arrayAccessleft, endright, arrayAccess, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 :}
 
 | identifier:constantName T_OPEN_RECT:o static_scalar_value:index T_CLOSE_RECT:end
 {:
-	RESULT = new ExpressionArrayAccess(constantNameleft, endright, constantName, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(constantNameleft, endright, constantName, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 :}
 ;
 
 static_constant_array_access ::=
 static_constant_array_access:arrayAccess T_OPEN_RECT:o static_scalar_value:index T_CLOSE_RECT:end
 {:
-	RESULT = new ExpressionArrayAccess(arrayAccessleft, endright, arrayAccess, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(arrayAccessleft, endright, arrayAccess, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 :}
 
 | T_STRING:constantName T_OPEN_RECT:o static_scalar_value:index T_CLOSE_RECT:end
 {:
-	RESULT = new ExpressionArrayAccess(constantNameleft, endright, new Identifier(constantNameleft, constantNameright, constantName), new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(constantNameleft, endright, new Identifier(constantNameleft, constantNameright, constantName), new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 :}
 
 | namespace_name_access:namespace T_OPEN_RECT:o static_scalar_value:index T_CLOSE_RECT:end
 {:
-	RESULT = new ExpressionArrayAccess(namespaceleft, endright, namespace, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = new ExpressionArrayAccess(namespaceleft, endright, namespace, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
 :}
 ;
 
@@ -4046,67 +4046,67 @@ static_array_creation:arr array_dimension_with_static_scalar_value:ad
 static_array_creation ::=
 T_ARRAY:start T_OPEN_PARENTHESE:o static_array_pair_list:list T_CLOSE_PARENTHESE:end
 {:
-	Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.OLD);
-	RESULT = expr;
+    Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.OLD);
+    RESULT = expr;
 :}
 
 | T_OPEN_RECT:start static_array_pair_list:list T_CLOSE_RECT:end
 {:
-	Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.NEW);
-	RESULT = expr;
+    Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.NEW);
+    RESULT = expr;
 :}
 ;
 
 scalar ::=
 T_STRING_VARNAME:scalar
 {:
-	RESULT = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
+    RESULT = new Scalar(scalarleft, scalarright, scalar, Scalar.Type.STRING);
 :}
 
 | class_constant:classConstant
 {:
-	RESULT = classConstant;
+    RESULT = classConstant;
 :}
 
 | namespace_name:list
 {:
-	if (list.size() == 1) {
-            String itemName = ((Identifier)list.get(0)).getName();
-            String itemNameLower = itemName.toLowerCase();
-            if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) { //NOI18N
-                RESULT = new Scalar(listleft, listright, itemName, Scalar.Type.STRING);
-            } else {
-                RESULT = new NamespaceName(listleft, listright, list, false, false);
-            }
-	} else {
+    if (list.size() == 1) {
+        String itemName = ((Identifier)list.get(0)).getName();
+        String itemNameLower = itemName.toLowerCase();
+        if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) { //NOI18N
+            RESULT = new Scalar(listleft, listright, itemName, Scalar.Type.STRING);
+        } else {
             RESULT = new NamespaceName(listleft, listright, list, false, false);
-	}
+        }
+    } else {
+        RESULT = new NamespaceName(listleft, listright, list, false, false);
+    }
 :}
 
 | T_NAMESPACE:s T_NS_SEPARATOR namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, false, true);
+    RESULT = new NamespaceName(sleft, listright, list, false, true);
 :}
 
 | T_NS_SEPARATOR:s namespace_name:list
 {:
-	RESULT = new NamespaceName(sleft, listright, list, true, false);
+    RESULT = new NamespaceName(sleft, listright, list, true, false);
 :}
 
 | common_scalar:scalar
 {:
-	RESULT = scalar;
+    RESULT = scalar;
 :}
 
 | T_QUATE:start encaps_list:list T_QUATE:end
 {:
-	Quote quote = new Quote(startleft, endright, list, Quote.Type.QUOTE);
-	RESULT = quote;
+    Quote quote = new Quote(startleft, endright, list, Quote.Type.QUOTE);
+    RESULT = quote;
 :}
 
 | heredoc:doc
 {:
-	RESULT = doc;
+    RESULT = doc;
 :}
 ;
 
@@ -4121,13 +4121,13 @@ T_START_HEREDOC:start encaps_list:list T_END_HEREDOC:end
 static_array_pair_list ::=
 /* empty */
 {:
-	List list = new LinkedList();
-	RESULT = list;
+    List list = new LinkedList();
+    RESULT = list;
 :}
 
 | non_empty_static_array_pair_list:list possible_comma
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 ;
 
@@ -4140,32 +4140,32 @@ possible_comma ::=
 non_empty_static_array_pair_list ::=
 non_empty_static_array_pair_list:list T_COMMA static_scalar:key T_DOUBLE_ARROW static_scalar:value
 {:
-	ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
-	list.add(element);
-	RESULT = list;
+    ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
+    list.add(element);
+    RESULT = list;
 :}
 
 | non_empty_static_array_pair_list:list T_COMMA static_scalar:value
 {:
-	ArrayElement element = new ArrayElement(valueleft, valueright, value);
-	list.add(element);
-	RESULT = list;
+    ArrayElement element = new ArrayElement(valueleft, valueright, value);
+    list.add(element);
+    RESULT = list;
 :}
 
 | static_scalar:key T_DOUBLE_ARROW static_scalar:value
 {:
-	List list = new LinkedList();
-	ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
-	list.add(element);
-	RESULT = list;
+    List list = new LinkedList();
+    ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
+    list.add(element);
+    RESULT = list;
 :}
 
 | static_scalar:value
 {:
-	List list = new LinkedList();
-	ArrayElement element = new ArrayElement(valueleft, valueright, value);
-	list.add(element);
-	RESULT = list;
+    List list = new LinkedList();
+    ArrayElement element = new ArrayElement(valueleft, valueright, value);
+    list.add(element);
+    RESULT = list;
 :}
 ;
 
@@ -4242,17 +4242,17 @@ r_variable:var
 expr_with_yields ::=
 expr:expr
 {:
-	RESULT = expr;
+    RESULT = expr;
 :}
 
 | yield_expr:expr
 {:
-	RESULT = expr;
+    RESULT = expr;
 :}
 
 | yield_from_expr:expr
 {:
-	RESULT = expr;
+    RESULT = expr;
 :}
 ;
 
@@ -4274,57 +4274,57 @@ variable:var
 field_or_method_access ::=
 base_variable_with_function_calls:var T_OBJECT_OPERATOR object_property:memberProperty method_or_not:paramsList array_access_or_not:aa variable_properties:propertyList
 {:
-	RESULT = parser.createDispatch(false, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    RESULT = parser.createDispatch(false, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 :}
 
 //| base_variable_with_function_calls:var T_PAAMAYIM_NEKUDOTAYIM object_property:memberProperty method_or_not:paramsList array_access_or_not:aa variable_properties:propertyList
 | function_call:var T_PAAMAYIM_NEKUDOTAYIM static_property:memberProperty method_or_not:paramsList array_access_or_not:aa variable_properties:propertyList
 {:
-	RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 :}
 
 | base_variable_without_reference_variable:var T_PAAMAYIM_NEKUDOTAYIM static_property:memberProperty method_or_not:paramsList array_access_or_not:aa variable_properties:propertyList
 {:
-	RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 :}
 
 | parenthesis_expr:pe T_OBJECT_OPERATOR object_property:memberProperty method_or_not:paramsList array_access_or_not:aa variable_properties:propertyList
 {:
-	// e.g. ($uvs = new UVS())->method();
-	DereferencableVariable var = new DereferencableVariable(peleft, peright, pe.getExpression());
-	RESULT = parser.createDispatch(false, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    // e.g. ($uvs = new UVS())->method();
+    DereferencableVariable var = new DereferencableVariable(peleft, peright, pe.getExpression());
+    RESULT = parser.createDispatch(false, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 :}
 
 | parenthesis_expr:pe T_PAAMAYIM_NEKUDOTAYIM static_property:memberProperty method_or_not:paramsList array_access_or_not:aa variable_properties:propertyList
 {:
-	// e.g. ($uvs = new UVS())::staticMethod();
-	DereferencableVariable var = new DereferencableVariable(peleft, peright, pe.getExpression());
-	RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
+    // e.g. ($uvs = new UVS())::staticMethod();
+    DereferencableVariable var = new DereferencableVariable(peleft, peright, pe.getExpression());
+    RESULT = parser.createDispatch(true, var, memberProperty, memberPropertyleft, memberPropertyright, paramsList, paramsListright, propertyList, aa);
 :}
 ;
 
 variable ::=
 field_or_method_access:acc
 {:
-	RESULT = acc;
+    RESULT = acc;
 :}
 
 | base_variable_with_function_calls:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 ;
 
 variable_properties ::=
 variable_properties:variables variable_property:variableProperty
 {:
-	variables.add(variableProperty);
-	RESULT = variables;
+    variables.add(variableProperty);
+    RESULT = variables;
 :}
 
 | /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 ;
 
@@ -4343,12 +4343,12 @@ T_OBJECT_OPERATOR object_property:memberProperty method_or_not:paramsList array_
 method_or_not ::=
 T_OPEN_PARENTHESE function_call_parameter_list:paramsList T_CLOSE_PARENTHESE
 {:
-	RESULT = paramsList;
+    RESULT = paramsList;
 :}
 
 | /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 ;
 
@@ -4399,30 +4399,30 @@ array_dimension:ad
 variable_without_objects ::=
 reference_variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 
 | simple_indirect_reference:ref_count reference_variable:var
 {:
-	// the ref_count counts the number of reflection (DOLLAR sign) so now we should
-	// accomulate the dolars into reflection variables
-	Variable finalVar = var;
-	for (int i=0; i<ref_count.intValue(); i++) {
-		finalVar = new ReflectionVariable(ref_countright - i - 1, varright, finalVar);
-	}
-	RESULT = finalVar;
+    // the ref_count counts the number of reflection (DOLLAR sign) so now we should
+    // accomulate the dolars into reflection variables
+    Variable finalVar = var;
+    for (int i=0; i<ref_count.intValue(); i++) {
+        finalVar = new ReflectionVariable(ref_countright - i - 1, varright, finalVar);
+    }
+    RESULT = finalVar;
 :}
 ;
 
 static_member ::=
 class_name:className T_PAAMAYIM_NEKUDOTAYIM variable_without_objects:var
 {:
-	RESULT = new StaticFieldAccess(classNameleft, varright, className, var);
+    RESULT = new StaticFieldAccess(classNameleft, varright, className, var);
 :}
 
 | variable_class_name:className T_PAAMAYIM_NEKUDOTAYIM variable_without_objects:var
 {:
-	RESULT = new StaticFieldAccess(classNameleft, varright, className, var);
+    RESULT = new StaticFieldAccess(classNameleft, varright, className, var);
 :}
 ;
 
@@ -4430,7 +4430,7 @@ class_name:className T_PAAMAYIM_NEKUDOTAYIM variable_without_objects:var
 variable_class_name ::=
 reference_variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 ;
 
@@ -4478,7 +4478,7 @@ constant_array_access:arrayAccess array_dimension:ad
 
 | namespace_name_access:namespace array_dimension:ad
 {:
-	RESULT = new ExpressionArrayAccess(namespaceleft, adright, namespace, ad);
+    RESULT = new ExpressionArrayAccess(namespaceleft, adright, namespace, ad);
 :}
 ;
 
@@ -4497,26 +4497,26 @@ array_creation:arr array_dimension:ad
 array_creation ::=
 T_ARRAY:start T_OPEN_PARENTHESE array_pair_list:list T_CLOSE_PARENTHESE:end
 {:
-	Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.OLD);
-	RESULT = expr;
+    Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.OLD);
+    RESULT = expr;
 :}
 
 | T_OPEN_RECT:start array_pair_list:list T_CLOSE_RECT:end
 {:
     Expression expr = new ArrayCreation(startleft, endright, list, ArrayCreation.Type.NEW);
-	RESULT = expr;
+    RESULT = expr;
 :}
 ;
 
 base_variable ::=
 reference_variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 
 | base_variable_without_reference_variable:variable
 {:
-	RESULT = variable;
+    RESULT = variable;
 :}
 ;
 
@@ -4540,28 +4540,28 @@ T_OPEN_PARENTHESE:start anonymous_class:cls T_CLOSE_PARENTHESE:end
 
 | simple_indirect_reference:ref_count reference_variable:var
 {:
-	// the ref_count counts the number of reflection (DOLLAR sign) so now we should
-	// accomulate the dolars into reflection variables
-	VariableBase finalVar = var;
-	for (int i=0; i<ref_count.intValue(); i++) {
-		finalVar = new ReflectionVariable(ref_countright - i - 1, varright, finalVar);
-	}
-	RESULT = finalVar;
+    // the ref_count counts the number of reflection (DOLLAR sign) so now we should
+    // accomulate the dolars into reflection variables
+    VariableBase finalVar = var;
+    for (int i=0; i<ref_count.intValue(); i++) {
+        finalVar = new ReflectionVariable(ref_countright - i - 1, varright, finalVar);
+    }
+    RESULT = finalVar;
 :}
 
 | static_member:staticFieldAccess
 {:
-	RESULT = staticFieldAccess;
+    RESULT = staticFieldAccess;
 :}
 
 | array_creation_with_access:arrayCreationWithAccess
 {:
-	RESULT = arrayCreationWithAccess;
+    RESULT = arrayCreationWithAccess;
 :}
 
 | dereferencable_variable:dereferencableVariable
 {:
-	RESULT = dereferencableVariable;
+    RESULT = dereferencableVariable;
 :}
 ;
 
@@ -4587,8 +4587,8 @@ T_OPEN_PARENTHESE:start variable:var T_CLOSE_PARENTHESE:end
 reference_variable ::=
 reference_variable:varName array_dimension:ad
 {:
-	Variable var = new ArrayAccess(varNameleft, adright, varName, ad);
-	RESULT = var;
+    Variable var = new ArrayAccess(varNameleft, adright, varName, ad);
+    RESULT = var;
 :}
 
 | compound_variable:comp_var
@@ -4601,52 +4601,52 @@ tracked_variable:var
 
 | T_DOLLAR:start T_CURLY_OPEN expr:expr T_CURLY_CLOSE:end
 {:
-	ReflectionVariable var = new ReflectionVariable(startleft, endright, expr);
-	RESULT = var;
+    ReflectionVariable var = new ReflectionVariable(startleft, endright, expr);
+    RESULT = var;
 :}
 ;
 
 dim_offset ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | expr:expr
 {:
-	RESULT = expr;
+    RESULT = expr;
 :}
 ;
 
 static_property ::=
 variable_without_objects:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 
 | static_reference_constant:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 ;
 
 object_property ::=
 object_dim_list:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 
 | variable_without_objects:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 ;
 
 object_dim_list ::=
 object_dim_list:var array_dimension:ad
 {:
-	Variable varArray = new ArrayAccess(varleft, adright, var, ad);
-	RESULT = varArray;
+    Variable varArray = new ArrayAccess(varleft, adright, var, ad);
+    RESULT = varArray;
 :}
 
 | variable_name:var
@@ -4656,315 +4656,315 @@ object_dim_list:var array_dimension:ad
 variable_name ::=
 string_st:varName
 {:
-	RESULT = new Variable(varNameleft, varNameright, varName);
+    RESULT = new Variable(varNameleft, varNameright, varName);
 :}
 
 | T_CURLY_OPEN:start expr:expr T_CURLY_CLOSE:end
 {:
-	RESULT = new ReflectionVariable(startleft, endright, expr);
+    RESULT = new ReflectionVariable(startleft, endright, expr);
 :}
 ;
 
 simple_indirect_reference ::=
 T_DOLLAR
 {:
-	RESULT = Integer.valueOf(1);
+    RESULT = Integer.valueOf(1);
 :}
 
 | simple_indirect_reference:ref T_DOLLAR
 {:
-	RESULT = Integer.valueOf(1 + ref.intValue());
+    RESULT = Integer.valueOf(1 + ref.intValue());
 :}
 ;
 
 array_pair_list ::=
 non_empty_array_pair_list:list
 {:
-	RESULT = list;
+    RESULT = list;
 :}
 ;
 
 non_empty_array_pair_list ::=
 non_empty_array_pair_list:list T_COMMA possible_array_pair:pair
 {:
-	if(pair != null) {
-		list.add(pair);
-	}
-	RESULT = list;
+    if(pair != null) {
+        list.add(pair);
+    }
+    RESULT = list;
 :}
 
 | possible_array_pair:pair
 {:
-	List list = new LinkedList();
-	if(pair != null) {
-		list.add(pair);
-	}
-	RESULT = list;
+    List list = new LinkedList();
+    if(pair != null) {
+        list.add(pair);
+    }
+    RESULT = list;
 :}
 ;
 
 possible_array_pair ::=
 /* empty */
 {:
-	RESULT = null;
+    RESULT = null;
 :}
 
 | array_pair:pair
 {:
-	RESULT = pair;
+    RESULT = pair;
 :}
 ;
 
 array_pair ::=
 expr:key T_DOUBLE_ARROW expr:value
 {:
-	ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
-	RESULT = element;
+    ArrayElement element = new ArrayElement(keyleft, valueright, key, value);
+    RESULT = element;
 :}
 
 | expr:expr
 {:
-	ArrayElement element = new ArrayElement(exprleft, exprright, expr);
-	RESULT = element;
+    ArrayElement element = new ArrayElement(exprleft, exprright, expr);
+    RESULT = element;
 :}
 
 | expr:expr T_DOUBLE_ARROW T_REFERENCE:start w_variable:var
 {:
-	Reference value = new Reference(startleft, varright, var);
-	ArrayElement element = new ArrayElement(exprleft, varright, expr, value);
-	RESULT = element;
+    Reference value = new Reference(startleft, varright, var);
+    ArrayElement element = new ArrayElement(exprleft, varright, expr, value);
+    RESULT = element;
 :}
 
 
 | T_REFERENCE:start w_variable:var
 {:
-	Reference ref = new Reference(startleft, varright, var);
-	ArrayElement element = new ArrayElement(startleft, varright, ref);
-	RESULT = element;
+    Reference ref = new Reference(startleft, varright, var);
+    ArrayElement element = new ArrayElement(startleft, varright, ref);
+    RESULT = element;
 :}
 
 | expr:expr T_DOUBLE_ARROW T_LIST:start T_OPEN_PARENTHESE array_pair_list:varList T_CLOSE_PARENTHESE:end
 {:
-	ListVariable value = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
-	ArrayElement element = new ArrayElement(exprleft, endright, expr, value);
-	RESULT = element;
+    ListVariable value = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
+    ArrayElement element = new ArrayElement(exprleft, endright, expr, value);
+    RESULT = element;
 :}
 
 | T_LIST:start T_OPEN_PARENTHESE array_pair_list:varList T_CLOSE_PARENTHESE:end
 {:
-	ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
-        ArrayElement element = new ArrayElement(startleft, endright, vars);
-	RESULT = element;
+    ListVariable vars = new ListVariable(startleft, endright, varList, ListVariable.SyntaxType.OLD);
+    ArrayElement element = new ArrayElement(startleft, endright, vars);
+    RESULT = element;
 :}
 ;
 
 encaps_list ::=
 encaps_list:list encaps_var:var
 {:
-	list.add(var);
-	RESULT = list;
+    list.add(var);
+    RESULT = list;
 :}
 
 | encaps_list:list T_ENCAPSED_AND_WHITESPACE:string
 {:
-	Scalar scalar = new Scalar(stringleft, stringright, string, string == null ? Scalar.Type.UNKNOWN : Scalar.Type.STRING);
-	list.add(scalar);
-	RESULT = list;
+    Scalar scalar = new Scalar(stringleft, stringright, string, string == null ? Scalar.Type.UNKNOWN : Scalar.Type.STRING);
+    list.add(scalar);
+    RESULT = list;
 :}
 
 | /* empty */
 {:
-	RESULT = new LinkedList();
+    RESULT = new LinkedList();
 :}
 ;
 
 encaps_var ::=
 tracked_variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 
 | tracked_variable:varName T_OPEN_RECT:o encaps_var_offset:index T_CLOSE_RECT:end
 {:
-	Variable var = new ArrayAccess(varNameleft, endright, varName, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
-	RESULT = var;
+    Variable var = new ArrayAccess(varNameleft, endright, varName, new ArrayDimension(oleft, endright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = var;
 :}
 
 | tracked_variable:var T_OBJECT_OPERATOR string_st:string
 {:
-	Variable property = new Variable(stringleft, stringright, string);
-	VariableBase dispatch = parser.createDispatch(var, property);
-	RESULT = dispatch;
+    Variable property = new Variable(stringleft, stringright, string);
+    VariableBase dispatch = parser.createDispatch(var, property);
+    RESULT = dispatch;
 :}
 
 | T_DOLLAR_OPEN_CURLY_BRACES:start expr:expr T_CURLY_CLOSE:end
 {:
-	ReflectionVariable var = new ReflectionVariable(startleft, endright, expr);
-	RESULT = var;
+    ReflectionVariable var = new ReflectionVariable(startleft, endright, expr);
+    RESULT = var;
 :}
 
 | T_DOLLAR_OPEN_CURLY_BRACES:start T_STRING_VARNAME:varName T_OPEN_RECT:o expr:index T_CLOSE_RECT:c T_CURLY_CLOSE:end
 {:
-	Variable var = new Variable(varNameleft, varNameright, varName);
-	Variable indexedVar = new ArrayAccess(startleft, endright, var, new ArrayDimension(oleft, cright, index, ArrayDimension.Type.VARIABLE_ARRAY));
-	RESULT = indexedVar;
+    Variable var = new Variable(varNameleft, varNameright, varName);
+    Variable indexedVar = new ArrayAccess(startleft, endright, var, new ArrayDimension(oleft, cright, index, ArrayDimension.Type.VARIABLE_ARRAY));
+    RESULT = indexedVar;
 :}
 
 | T_CURLY_OPEN_WITH_DOLAR:start variable:var T_CURLY_CLOSE:end
 {:
-	ReflectionVariable ref = new ReflectionVariable(startleft, endright, var);
-	RESULT = ref;
+    ReflectionVariable ref = new ReflectionVariable(startleft, endright, var);
+    RESULT = ref;
 :}
 ;
 
 encaps_var_offset ::=
 string_st:string
 {:
-	Identifier id = new Identifier(stringleft, stringright, string);
-	RESULT = id;
+    Identifier id = new Identifier(stringleft, stringright, string);
+    RESULT = id;
 :}
 
 | T_NUM_STRING:num
 {:
-	Scalar scalar = new Scalar(numleft,numright, num, Scalar.Type.REAL);
-	RESULT = scalar;
+    Scalar scalar = new Scalar(numleft,numright, num, Scalar.Type.REAL);
+    RESULT = scalar;
 :}
 
 | tracked_variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 ;
 
 internal_functions_in_yacc ::=
 T_ISSET:start T_OPEN_PARENTHESE isset_variables:varList possible_comma T_CLOSE_PARENTHESE:end
 {:
-	Identifier id = new Identifier(startleft, startright, "isset");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	FunctionInvocation result = new FunctionInvocation(startleft, endright, name, varList);
-	RESULT = result;
+    Identifier id = new Identifier(startleft, startright, "isset");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    FunctionInvocation result = new FunctionInvocation(startleft, endright, name, varList);
+    RESULT = result;
 :}
 
 | T_EMPTY:start T_OPEN_PARENTHESE variable:var T_CLOSE_PARENTHESE:end
 {:
-	Identifier id = new Identifier(startleft, startright, "empty");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	LinkedList varList = new LinkedList();
-	varList.add(var);
-	FunctionInvocation result = new FunctionInvocation(startleft, endright, name, varList);
-	RESULT = result;
+    Identifier id = new Identifier(startleft, startright, "empty");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    LinkedList varList = new LinkedList();
+    varList.add(var);
+    FunctionInvocation result = new FunctionInvocation(startleft, endright, name, varList);
+    RESULT = result;
 :}
 
 | T_EMPTY:start T_OPEN_PARENTHESE expr_without_variable:expr T_CLOSE_PARENTHESE:end
 {:
-	Identifier id = new Identifier(startleft, startright, "empty");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	LinkedList exprList = new LinkedList();
-	exprList.add(expr);
-	FunctionInvocation result = new FunctionInvocation(startleft, endright, name, exprList);
-	RESULT = result;
+    Identifier id = new Identifier(startleft, startright, "empty");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    LinkedList exprList = new LinkedList();
+    exprList.add(expr);
+    FunctionInvocation result = new FunctionInvocation(startleft, endright, name, exprList);
+    RESULT = result;
 :}
 
 | T_INCLUDE:include expr:expr
 {:
-	Include result = new Include(includeleft, exprright, expr, Include.Type.INCLUDE);
-	RESULT = result;
+    Include result = new Include(includeleft, exprright, expr, Include.Type.INCLUDE);
+    RESULT = result;
 :}
 
 | T_INCLUDE_ONCE:include expr:expr
 {:
-	Include result = new Include(includeleft, exprright, expr, Include.Type.INCLUDE_ONCE);
-	RESULT = result;
+    Include result = new Include(includeleft, exprright, expr, Include.Type.INCLUDE_ONCE);
+    RESULT = result;
 :}
 
 | T_EVAL:start T_OPEN_PARENTHESE expr:expr T_CLOSE_PARENTHESE:end
 {:
-	Identifier id = new Identifier(startleft, startright, "eval");
-	FunctionName name = new FunctionName(startleft, startright, id);
-	LinkedList exprList = new LinkedList();
-	exprList.add(expr);
-	FunctionInvocation result = new FunctionInvocation(startleft, endright, name, exprList);
-	RESULT = result;
+    Identifier id = new Identifier(startleft, startright, "eval");
+    FunctionName name = new FunctionName(startleft, startright, id);
+    LinkedList exprList = new LinkedList();
+    exprList.add(expr);
+    FunctionInvocation result = new FunctionInvocation(startleft, endright, name, exprList);
+    RESULT = result;
 :}
 
 | T_REQUIRE:include expr:expr
 {:
-	Include result = new Include(includeleft, exprright, expr, Include.Type.REQUIRE);
-	RESULT = result;
+    Include result = new Include(includeleft, exprright, expr, Include.Type.REQUIRE);
+    RESULT = result;
 :}
 
 | T_REQUIRE_ONCE:include expr:expr
 {:
-	Include result = new Include(includeleft, exprright, expr, Include.Type.REQUIRE_ONCE);
-	RESULT = result;
+    Include result = new Include(includeleft, exprright, expr, Include.Type.REQUIRE_ONCE);
+    RESULT = result;
 :}
 ;
 
 isset_variables ::=
 isset_variable:var
 {:
-	List list = new LinkedList();
-	list.add(var);
-	RESULT = list;
+    List list = new LinkedList();
+    list.add(var);
+    RESULT = list;
 :}
 
 | isset_variables:varList T_COMMA isset_variable:var
 {:
-	varList.add(var);
-	RESULT = varList;
+    varList.add(var);
+    RESULT = varList;
 :}
 ;
 
 isset_variable ::=
 variable:var
 {:
-	RESULT = var;
+    RESULT = var;
 :}
 
 | expression_array_access:arrayAccess
 {:
-	RESULT = arrayAccess;
+    RESULT = arrayAccess;
 :}
 
 | class_name:className T_PAAMAYIM_NEKUDOTAYIM constant_array_access:arrayAccess
 {:
-	RESULT = new StaticConstantAccess(classNameleft, arrayAccessright, className, arrayAccess);
+    RESULT = new StaticConstantAccess(classNameleft, arrayAccessright, className, arrayAccess);
 :}
 
 | variable_class_name:className T_PAAMAYIM_NEKUDOTAYIM constant_array_access:arrayAccess
 {:
-	RESULT = new StaticConstantAccess(classNameleft, arrayAccessright, className, arrayAccess);
+    RESULT = new StaticConstantAccess(classNameleft, arrayAccessright, className, arrayAccess);
 :}
 ;
 
 class_constant ::=
 class_name:className T_PAAMAYIM_NEKUDOTAYIM reference_constant:constant
 {:
-	RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
+    RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
 :}
 
 | variable_class_name:className T_PAAMAYIM_NEKUDOTAYIM reference_constant:constant
 {:
-	RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
+    RESULT = new StaticConstantAccess(classNameleft, constantright, className, constant);
 :}
 ;
 
 reference_constant ::=
 reference_constant:constant array_dimension:ad
 {:
-	RESULT = new ExpressionArrayAccess(constantleft, adright, constant, ad);
+    RESULT = new ExpressionArrayAccess(constantleft, adright, constant, ad);
 :}
 
 | identifier:constantName
 {:
-	RESULT = constantName;
+    RESULT = constantName;
 :}
 ;
 
 tracked_variable ::=
 T_VARIABLE:varName
 {:
-	RESULT = new Variable(varNameleft, varNameright, varName);
+    RESULT = new Variable(varNameleft, varNameright, varName);
 :}
 ;
 
@@ -4982,8 +4982,8 @@ extends_from:superClass implements_list:interfaces
 T_CURLY_OPEN:blockStart class_statement_list:statementList T_CURLY_CLOSE:blockEnd
 {:
     final int counter = parser.incrementAndGetAnonymousClassCounter();
-	Block block = new Block(blockStartleft, blockEndright, statementList);
-	ClassInstanceCreation classInstance = ClassInstanceCreation.anonymous(parser.getFileName(), counter, startleft, blockEndright, cleft, ctor, superClass, interfaces, block);
-	RESULT = classInstance;
+    Block block = new Block(blockStartleft, blockEndright, statementList);
+    ClassInstanceCreation classInstance = ClassInstanceCreation.anonymous(parser.getFileName(), counter, startleft, blockEndright, cleft, ctor, superClass, interfaces, block);
+    RESULT = classInstance;
 :}
 ;
diff --git a/php/php.editor/tools/ASTPHP5Scanner.flex b/php/php.editor/tools/ASTPHP5Scanner.flex
index a9388758de..ffbe672f5c 100644
--- a/php/php.editor/tools/ASTPHP5Scanner.flex
+++ b/php/php.editor/tools/ASTPHP5Scanner.flex
@@ -22,7 +22,6 @@ package org.netbeans.modules.php.editor.parser;
 import java.util.ArrayList;
 import java.util.List;
 import java_cup.runtime.*;
-import org.netbeans.modules.php.editor.*;
 import org.netbeans.modules.php.editor.parser.astnodes.*;
 import org.netbeans.modules.web.common.api.ByteStack;
 
@@ -135,19 +134,19 @@ import org.netbeans.modules.web.common.api.ByteStack;
     }
 
     public void setInScriptingState() {
-		yybegin(ST_IN_SCRIPTING);
-	}
+        yybegin(ST_IN_SCRIPTING);
+    }
 
-	public void resetCommentList() {
-		commentList.clear();
-	}
+    public void resetCommentList() {
+        commentList.clear();
+    }
 
-	public List getCommentList() {
-		return commentList;
-	}
+    public List getCommentList() {
+        return commentList;
+    }
 
-	protected void addComment(Comment.Type type) {
-		int leftPosition = getTokenStartPosition();
+    protected void addComment(Comment.Type type) {
+        int leftPosition = getTokenStartPosition();
         //System.out.println("#####AddCommnet start: " + commentStartPosition + " end: " + (leftPosition + getTokenLength()) + ", type: " + type);
         Comment comm;
         if (type == Comment.Type.TYPE_PHPDOC) {
@@ -164,12 +163,12 @@ import org.netbeans.modules.web.common.api.ByteStack;
         else {
             comm = new Comment(commentStartPosition, leftPosition + getTokenLength(), /*ast,*/ type);
         }
-		commentList.add(comm);
-	}
+        commentList.add(comm);
+    }
 
-	public void setUseAspTagsAsPhp(boolean useAspTagsAsPhp) {
-		asp_tags = useAspTagsAsPhp;
-	}
+    public void setUseAspTagsAsPhp(boolean useAspTagsAsPhp) {
+        asp_tags = useAspTagsAsPhp;
+    }
 
     private void pushState(int state) {
         stack.push(zzLexicalState);
@@ -201,11 +200,11 @@ import org.netbeans.modules.web.common.api.ByteStack;
     }
 
     private void handleLineCommentEnd() {
-         addComment(Comment.Type.TYPE_SINGLE_LINE);
+        addComment(Comment.Type.TYPE_SINGLE_LINE);
     }
 
     private void handleMultilineCommentEnd() {
-    	addComment(Comment.Type.TYPE_MULTILINE);
+        addComment(Comment.Type.TYPE_MULTILINE);
     }
 
     private void handlePHPDocEnd() {
@@ -213,8 +212,8 @@ import org.netbeans.modules.web.common.api.ByteStack;
     }
 
     private void handleVarComment() {
-    	commentStartPosition = getTokenStartPosition();
-    	addComment(Comment.Type.TYPE_VARTYPE);
+        commentStartPosition = getTokenStartPosition();
+        addComment(Comment.Type.TYPE_VARTYPE);
     }
 
     private Symbol createFullSymbol(int symbolNumber) {
@@ -291,42 +290,42 @@ import org.netbeans.modules.web.common.api.ByteStack;
     }
 
     public int[] getParamenters(){
-    	return new int[]{zzMarkedPos, zzPushbackPos, zzCurrentPos, zzStartRead, zzEndRead, yyline};
+        return new int[]{zzMarkedPos, zzPushbackPos, zzCurrentPos, zzStartRead, zzEndRead, yyline};
+    }
+
+    private boolean parsePHPDoc(){
+        /*final IDocumentorLexer documentorLexer = getDocumentorLexer(zzReader);
+        if(documentorLexer == null){
+            return false;
+        }
+        yypushback(zzMarkedPos - zzStartRead);
+        int[] parameters = getParamenters();
+        documentorLexer.reset(zzReader, zzBuffer, parameters);
+        Object phpDocBlock = documentorLexer.parse();
+        commentList.add(phpDocBlock);
+        reset(zzReader, documentorLexer.getBuffer(), documentorLexer.getParamenters());*/
+
+        //System.out.println("#######ParsePHPDoc()");
+        //return true;
+        return false;
     }
 
-	private boolean parsePHPDoc(){
-		/*final IDocumentorLexer documentorLexer = getDocumentorLexer(zzReader);
-		if(documentorLexer == null){
-			return false;
-		}
-		yypushback(zzMarkedPos - zzStartRead);
-		int[] parameters = getParamenters();
-		documentorLexer.reset(zzReader, zzBuffer, parameters);
-		Object phpDocBlock = documentorLexer.parse();
-		commentList.add(phpDocBlock);
-		reset(zzReader, documentorLexer.getBuffer(), documentorLexer.getParamenters());*/
-
-                //System.out.println("#######ParsePHPDoc()");
-		//return true;
-                return false;
-	}
-
-
-	/*protected IDocumentorLexer getDocumentorLexer(java.io.Reader  reader) {
-		return null;
-	}*/
-
-	public void reset(java.io.Reader  reader, char[] buffer, int[] parameters){
-		this.zzReader = reader;
-		this.zzBuffer = buffer;
-		this.zzMarkedPos = parameters[0];
-		this.zzPushbackPos = parameters[1];
-		this.zzCurrentPos = parameters[2];
-		this.zzStartRead = parameters[3];
-		this.zzEndRead = parameters[4];
-		this.yyline = parameters[5];
-		this.yychar = this.zzStartRead - this.zzPushbackPos;
-	}
+
+    /*protected IDocumentorLexer getDocumentorLexer(java.io.Reader  reader) {
+        return null;
+    }*/
+
+    public void reset(java.io.Reader  reader, char[] buffer, int[] parameters){
+        this.zzReader = reader;
+        this.zzBuffer = buffer;
+        this.zzMarkedPos = parameters[0];
+        this.zzPushbackPos = parameters[1];
+        this.zzCurrentPos = parameters[2];
+        this.zzStartRead = parameters[3];
+        this.zzEndRead = parameters[4];
+        this.yyline = parameters[5];
+        this.yychar = this.zzStartRead - this.zzPushbackPos;
+    }
 
 %}
 
@@ -362,167 +361,167 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_IN_SCRIPTING>"exit" {
-	return createFullSymbol(ASTPHP5Symbols.T_EXIT);
+    return createFullSymbol(ASTPHP5Symbols.T_EXIT);
 }
 
 <ST_IN_SCRIPTING>"die" {
-	return createFullSymbol(ASTPHP5Symbols.T_EXIT);
+    return createFullSymbol(ASTPHP5Symbols.T_EXIT);
 }
 
 <ST_IN_SCRIPTING>"function" {
-	return createFullSymbol(ASTPHP5Symbols.T_FUNCTION);
+    return createFullSymbol(ASTPHP5Symbols.T_FUNCTION);
 }
 
 <ST_IN_SCRIPTING>"const" {
-	return createFullSymbol(ASTPHP5Symbols.T_CONST);
+    return createFullSymbol(ASTPHP5Symbols.T_CONST);
 }
 
 <ST_IN_SCRIPTING>"return" {
-	return createFullSymbol(ASTPHP5Symbols.T_RETURN);
+    return createFullSymbol(ASTPHP5Symbols.T_RETURN);
 }
 
 <ST_IN_SCRIPTING>"yield"{WHITESPACE}+"from" {
-	return createSymbol(ASTPHP5Symbols.T_YIELD_FROM);
+    return createSymbol(ASTPHP5Symbols.T_YIELD_FROM);
 }
 
 <ST_IN_SCRIPTING>"yield" {
-	return createFullSymbol(ASTPHP5Symbols.T_YIELD);
+    return createFullSymbol(ASTPHP5Symbols.T_YIELD);
 }
 
 <ST_IN_SCRIPTING>"try" {
-	return createFullSymbol(ASTPHP5Symbols.T_TRY);
+    return createFullSymbol(ASTPHP5Symbols.T_TRY);
 }
 
 <ST_IN_SCRIPTING>"catch" {
-	return createFullSymbol(ASTPHP5Symbols.T_CATCH);
+    return createFullSymbol(ASTPHP5Symbols.T_CATCH);
 }
 
 <ST_IN_SCRIPTING>"throw" {
-	return createFullSymbol(ASTPHP5Symbols.T_THROW);
+    return createFullSymbol(ASTPHP5Symbols.T_THROW);
 }
 
 <ST_IN_SCRIPTING>"finally" {
-	return createFullSymbol(ASTPHP5Symbols.T_FINALLY);
+    return createFullSymbol(ASTPHP5Symbols.T_FINALLY);
 }
 
 <ST_IN_SCRIPTING>"if" {
-	return createFullSymbol(ASTPHP5Symbols.T_IF);
+    return createFullSymbol(ASTPHP5Symbols.T_IF);
 }
 
 <ST_IN_SCRIPTING>"elseif" {
-	return createFullSymbol(ASTPHP5Symbols.T_ELSEIF);
+    return createFullSymbol(ASTPHP5Symbols.T_ELSEIF);
 }
 
 <ST_IN_SCRIPTING>"endif" {
-	return createFullSymbol(ASTPHP5Symbols.T_ENDIF);
+    return createFullSymbol(ASTPHP5Symbols.T_ENDIF);
 }
 
 <ST_IN_SCRIPTING>"else" {
-	return createFullSymbol(ASTPHP5Symbols.T_ELSE);
+    return createFullSymbol(ASTPHP5Symbols.T_ELSE);
 }
 
 <ST_IN_SCRIPTING>"while" {
-	return createFullSymbol(ASTPHP5Symbols.T_WHILE);
+    return createFullSymbol(ASTPHP5Symbols.T_WHILE);
 }
 
 <ST_IN_SCRIPTING>"endwhile" {
-	return createFullSymbol(ASTPHP5Symbols.T_ENDWHILE);
+    return createFullSymbol(ASTPHP5Symbols.T_ENDWHILE);
 }
 
 <ST_IN_SCRIPTING>"do" {
-	return createFullSymbol(ASTPHP5Symbols.T_DO);
+    return createFullSymbol(ASTPHP5Symbols.T_DO);
 }
 
 <ST_IN_SCRIPTING>"for" {
-	return createFullSymbol(ASTPHP5Symbols.T_FOR);
+    return createFullSymbol(ASTPHP5Symbols.T_FOR);
 }
 
 <ST_IN_SCRIPTING>"endfor" {
-	return createFullSymbol(ASTPHP5Symbols.T_ENDFOR);
+    return createFullSymbol(ASTPHP5Symbols.T_ENDFOR);
 }
 
 <ST_IN_SCRIPTING>"foreach" {
-	return createFullSymbol(ASTPHP5Symbols.T_FOREACH);
+    return createFullSymbol(ASTPHP5Symbols.T_FOREACH);
 }
 
 <ST_IN_SCRIPTING>"endforeach" {
-	return createFullSymbol(ASTPHP5Symbols.T_ENDFOREACH);
+    return createFullSymbol(ASTPHP5Symbols.T_ENDFOREACH);
 }
 
 <ST_IN_SCRIPTING>"declare" {
-	return createFullSymbol(ASTPHP5Symbols.T_DECLARE);
+    return createFullSymbol(ASTPHP5Symbols.T_DECLARE);
 }
 
 <ST_IN_SCRIPTING>"enddeclare" {
-	return createFullSymbol(ASTPHP5Symbols.T_ENDDECLARE);
+    return createFullSymbol(ASTPHP5Symbols.T_ENDDECLARE);
 }
 
 <ST_IN_SCRIPTING>"instanceof" {
-	return createFullSymbol(ASTPHP5Symbols.T_INSTANCEOF);
+    return createFullSymbol(ASTPHP5Symbols.T_INSTANCEOF);
 }
 
 <ST_IN_SCRIPTING>"insteadof" {
-	return createFullSymbol(ASTPHP5Symbols.T_INSTEADOF);
+    return createFullSymbol(ASTPHP5Symbols.T_INSTEADOF);
 }
 
 <ST_IN_SCRIPTING>"as" {
-	return createFullSymbol(ASTPHP5Symbols.T_AS);
+    return createFullSymbol(ASTPHP5Symbols.T_AS);
 }
 
 <ST_IN_SCRIPTING>"switch" {
-	return createFullSymbol(ASTPHP5Symbols.T_SWITCH);
+    return createFullSymbol(ASTPHP5Symbols.T_SWITCH);
 }
 
 <ST_IN_SCRIPTING>"endswitch" {
-	return createFullSymbol(ASTPHP5Symbols.T_ENDSWITCH);
+    return createFullSymbol(ASTPHP5Symbols.T_ENDSWITCH);
 }
 
 <ST_IN_SCRIPTING>"case" {
-	return createFullSymbol(ASTPHP5Symbols.T_CASE);
+    return createFullSymbol(ASTPHP5Symbols.T_CASE);
 }
 
 <ST_IN_SCRIPTING>"default" {
-	return createFullSymbol(ASTPHP5Symbols.T_DEFAULT);
+    return createFullSymbol(ASTPHP5Symbols.T_DEFAULT);
 }
 
 <ST_IN_SCRIPTING>"break" {
-	return createFullSymbol(ASTPHP5Symbols.T_BREAK);
+    return createFullSymbol(ASTPHP5Symbols.T_BREAK);
 }
 
 <ST_IN_SCRIPTING>"continue" {
-	return createFullSymbol(ASTPHP5Symbols.T_CONTINUE);
+    return createFullSymbol(ASTPHP5Symbols.T_CONTINUE);
 }
 
 <ST_IN_SCRIPTING>"goto" {
- 	return createFullSymbol(ASTPHP5Symbols.T_GOTO);
+    return createFullSymbol(ASTPHP5Symbols.T_GOTO);
 }
 
 <ST_IN_SCRIPTING>"echo" {
-	return createFullSymbol(ASTPHP5Symbols.T_ECHO);
+    return createFullSymbol(ASTPHP5Symbols.T_ECHO);
 }
 
 <ST_IN_SCRIPTING>"print" {
-	return createFullSymbol(ASTPHP5Symbols.T_PRINT);
+    return createFullSymbol(ASTPHP5Symbols.T_PRINT);
 }
 
 <ST_IN_SCRIPTING>"class" {
-	return createFullSymbol(ASTPHP5Symbols.T_CLASS);
+    return createFullSymbol(ASTPHP5Symbols.T_CLASS);
 }
 
 <ST_IN_SCRIPTING>"trait" {
-	return createFullSymbol(ASTPHP5Symbols.T_TRAIT);
+    return createFullSymbol(ASTPHP5Symbols.T_TRAIT);
 }
 
 <ST_IN_SCRIPTING>"interface" {
-	return createFullSymbol(ASTPHP5Symbols.T_INTERFACE);
+    return createFullSymbol(ASTPHP5Symbols.T_INTERFACE);
 }
 
 <ST_IN_SCRIPTING>"extends" {
-	return createFullSymbol(ASTPHP5Symbols.T_EXTENDS);
+    return createFullSymbol(ASTPHP5Symbols.T_EXTENDS);
 }
 
 <ST_IN_SCRIPTING>"implements" {
-	return createFullSymbol(ASTPHP5Symbols.T_IMPLEMENTS);
+    return createFullSymbol(ASTPHP5Symbols.T_IMPLEMENTS);
 }
 
 <ST_IN_SCRIPTING>"->" {
@@ -535,7 +534,7 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_LOOKING_FOR_PROPERTY>"->" {
-	return createSymbol(ASTPHP5Symbols.T_OBJECT_OPERATOR);
+    return createSymbol(ASTPHP5Symbols.T_OBJECT_OPERATOR);
 }
 
 <ST_LOOKING_FOR_PROPERTY>{LABEL} {
@@ -549,100 +548,100 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_IN_SCRIPTING>"::" {
-	return createSymbol(ASTPHP5Symbols.T_PAAMAYIM_NEKUDOTAYIM);
+    return createSymbol(ASTPHP5Symbols.T_PAAMAYIM_NEKUDOTAYIM);
 }
 
 <ST_IN_SCRIPTING>"\\" {
-	return createSymbol(ASTPHP5Symbols.T_NS_SEPARATOR);
+    return createSymbol(ASTPHP5Symbols.T_NS_SEPARATOR);
 }
 
 <ST_IN_SCRIPTING>"new" {
-	return createFullSymbol(ASTPHP5Symbols.T_NEW);
+    return createFullSymbol(ASTPHP5Symbols.T_NEW);
 }
 
 <ST_IN_SCRIPTING>"clone" {
-	return createFullSymbol(ASTPHP5Symbols.T_CLONE);
+    return createFullSymbol(ASTPHP5Symbols.T_CLONE);
 }
 
 <ST_IN_SCRIPTING>"var" {
-	return createFullSymbol(ASTPHP5Symbols.T_VAR);
+    return createFullSymbol(ASTPHP5Symbols.T_VAR);
 }
 
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("int"|"integer"){TABS_AND_SPACES}")" {
-	return createSymbol(ASTPHP5Symbols.T_INT_CAST);
+    return createSymbol(ASTPHP5Symbols.T_INT_CAST);
 }
 
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("real"|"double"|"float"){TABS_AND_SPACES}")" {
-	return createSymbol(ASTPHP5Symbols.T_DOUBLE_CAST);
+    return createSymbol(ASTPHP5Symbols.T_DOUBLE_CAST);
 }
 
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}"string"{TABS_AND_SPACES}")" {
-	return createSymbol(ASTPHP5Symbols.T_STRING_CAST);
+    return createSymbol(ASTPHP5Symbols.T_STRING_CAST);
 }
 
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}"binary"{TABS_AND_SPACES}")" {
-	return createSymbol(ASTPHP5Symbols.T_STRING_CAST);
+    return createSymbol(ASTPHP5Symbols.T_STRING_CAST);
 }
 
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}"array"{TABS_AND_SPACES}")" {
-	return createSymbol(ASTPHP5Symbols.T_ARRAY_CAST);
+    return createSymbol(ASTPHP5Symbols.T_ARRAY_CAST);
 }
 
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}"object"{TABS_AND_SPACES}")" {
-	return createSymbol(ASTPHP5Symbols.T_OBJECT_CAST);
+    return createSymbol(ASTPHP5Symbols.T_OBJECT_CAST);
 }
 
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("bool"|"boolean"){TABS_AND_SPACES}")" {
-	return createSymbol(ASTPHP5Symbols.T_BOOL_CAST);
+    return createSymbol(ASTPHP5Symbols.T_BOOL_CAST);
 }
 
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("unset"){TABS_AND_SPACES}")" {
-	return createSymbol(ASTPHP5Symbols.T_UNSET_CAST);
+    return createSymbol(ASTPHP5Symbols.T_UNSET_CAST);
 }
 
 <ST_IN_SCRIPTING>"eval" {
-	return createFullSymbol(ASTPHP5Symbols.T_EVAL);
+    return createFullSymbol(ASTPHP5Symbols.T_EVAL);
 }
 
 <ST_IN_SCRIPTING>"include" {
-	return createFullSymbol(ASTPHP5Symbols.T_INCLUDE);
+    return createFullSymbol(ASTPHP5Symbols.T_INCLUDE);
 }
 
 <ST_IN_SCRIPTING>"include_once" {
-	return createFullSymbol(ASTPHP5Symbols.T_INCLUDE_ONCE);
+    return createFullSymbol(ASTPHP5Symbols.T_INCLUDE_ONCE);
 }
 
 <ST_IN_SCRIPTING>"require" {
-	return createFullSymbol(ASTPHP5Symbols.T_REQUIRE);
+    return createFullSymbol(ASTPHP5Symbols.T_REQUIRE);
 }
 
 <ST_IN_SCRIPTING>"require_once" {
-	return createFullSymbol(ASTPHP5Symbols.T_REQUIRE_ONCE);
+    return createFullSymbol(ASTPHP5Symbols.T_REQUIRE_ONCE);
 }
 
 <ST_IN_SCRIPTING>"namespace" {
- 	return createFullSymbol(ASTPHP5Symbols.T_NAMESPACE);
+     return createFullSymbol(ASTPHP5Symbols.T_NAMESPACE);
 }
 
 <ST_IN_SCRIPTING>"use" {
-	return createFullSymbol(ASTPHP5Symbols.T_USE);
+    return createFullSymbol(ASTPHP5Symbols.T_USE);
 }
 
 <ST_IN_SCRIPTING>"global" {
-	return createFullSymbol(ASTPHP5Symbols.T_GLOBAL);
+    return createFullSymbol(ASTPHP5Symbols.T_GLOBAL);
 }
 
 <ST_IN_SCRIPTING>"isset" {
-	return createFullSymbol(ASTPHP5Symbols.T_ISSET);
+    return createFullSymbol(ASTPHP5Symbols.T_ISSET);
 }
 
 <ST_IN_SCRIPTING>"empty" {
-	return createFullSymbol(ASTPHP5Symbols.T_EMPTY);
+    return createFullSymbol(ASTPHP5Symbols.T_EMPTY);
 }
 
 <ST_IN_SCRIPTING>"__halt_compiler();" {
     yybegin(ST_HALTED_COMPILER);
-	return createSymbol(ASTPHP5Symbols.T_HALT_COMPILER);
+    return createSymbol(ASTPHP5Symbols.T_HALT_COMPILER);
 }
 
 <ST_HALTED_COMPILER> {ANY_CHAR}+ {
@@ -650,171 +649,171 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_IN_SCRIPTING>"static" {
-	return createFullSymbol(ASTPHP5Symbols.T_STATIC);
+    return createFullSymbol(ASTPHP5Symbols.T_STATIC);
 }
 
 <ST_IN_SCRIPTING>"abstract" {
-	return createFullSymbol(ASTPHP5Symbols.T_ABSTRACT);
+    return createFullSymbol(ASTPHP5Symbols.T_ABSTRACT);
 }
 
 <ST_IN_SCRIPTING>"final" {
-	return createFullSymbol(ASTPHP5Symbols.T_FINAL);
+    return createFullSymbol(ASTPHP5Symbols.T_FINAL);
 }
 
 <ST_IN_SCRIPTING>"private" {
-	return createFullSymbol(ASTPHP5Symbols.T_PRIVATE);
+    return createFullSymbol(ASTPHP5Symbols.T_PRIVATE);
 }
 
 <ST_IN_SCRIPTING>"protected" {
-	return createFullSymbol(ASTPHP5Symbols.T_PROTECTED);
+    return createFullSymbol(ASTPHP5Symbols.T_PROTECTED);
 }
 
 <ST_IN_SCRIPTING>"public" {
-	return createFullSymbol(ASTPHP5Symbols.T_PUBLIC);
+    return createFullSymbol(ASTPHP5Symbols.T_PUBLIC);
 }
 
 <ST_IN_SCRIPTING>"unset" {
-	return createFullSymbol(ASTPHP5Symbols.T_UNSET);
+    return createFullSymbol(ASTPHP5Symbols.T_UNSET);
 }
 
 <ST_IN_SCRIPTING>"=>" {
-	return createSymbol(ASTPHP5Symbols.T_DOUBLE_ARROW);
+    return createSymbol(ASTPHP5Symbols.T_DOUBLE_ARROW);
 }
 
 <ST_IN_SCRIPTING>"list" {
-	return createFullSymbol(ASTPHP5Symbols.T_LIST);
+    return createFullSymbol(ASTPHP5Symbols.T_LIST);
 }
 
 <ST_IN_SCRIPTING>"array" {
-	return createFullSymbol(ASTPHP5Symbols.T_ARRAY);
+    return createFullSymbol(ASTPHP5Symbols.T_ARRAY);
 }
 
 <ST_IN_SCRIPTING>"callable" {
-	return createFullSymbol(ASTPHP5Symbols.T_CALLABLE);
+    return createFullSymbol(ASTPHP5Symbols.T_CALLABLE);
 }
 
 <ST_IN_SCRIPTING>"++" {
-	return createSymbol(ASTPHP5Symbols.T_INC);
+    return createSymbol(ASTPHP5Symbols.T_INC);
 }
 
 <ST_IN_SCRIPTING>"--" {
-	return createSymbol(ASTPHP5Symbols.T_DEC);
+    return createSymbol(ASTPHP5Symbols.T_DEC);
 }
 
 <ST_IN_SCRIPTING>"===" {
-	return createSymbol(ASTPHP5Symbols.T_IS_IDENTICAL);
+    return createSymbol(ASTPHP5Symbols.T_IS_IDENTICAL);
 }
 
 <ST_IN_SCRIPTING>"!==" {
-	return createSymbol(ASTPHP5Symbols.T_IS_NOT_IDENTICAL);
+    return createSymbol(ASTPHP5Symbols.T_IS_NOT_IDENTICAL);
 }
 
 <ST_IN_SCRIPTING>"==" {
-	return createSymbol(ASTPHP5Symbols.T_IS_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_IS_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"!="|"<>" {
-	return createSymbol(ASTPHP5Symbols.T_IS_NOT_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_IS_NOT_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"<=" {
-	return createSymbol(ASTPHP5Symbols.T_IS_SMALLER_OR_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_IS_SMALLER_OR_EQUAL);
 }
 
 <ST_IN_SCRIPTING>">=" {
-	return createSymbol(ASTPHP5Symbols.T_IS_GREATER_OR_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_IS_GREATER_OR_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"<=>" {
-	return createSymbol(ASTPHP5Symbols.T_SPACESHIP);
+    return createSymbol(ASTPHP5Symbols.T_SPACESHIP);
 }
 
 <ST_IN_SCRIPTING>"+=" {
-	return createSymbol(ASTPHP5Symbols.T_PLUS_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_PLUS_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"-=" {
-	return createSymbol(ASTPHP5Symbols.T_MINUS_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_MINUS_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"*=" {
-	return createSymbol(ASTPHP5Symbols.T_MUL_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_MUL_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"/=" {
-	return createSymbol(ASTPHP5Symbols.T_DIV_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_DIV_EQUAL);
 }
 
 <ST_IN_SCRIPTING>".=" {
-	return createSymbol(ASTPHP5Symbols.T_CONCAT_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_CONCAT_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"%=" {
-	return createSymbol(ASTPHP5Symbols.T_MOD_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_MOD_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"<<=" {
-	return createSymbol(ASTPHP5Symbols.T_SL_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_SL_EQUAL);
 }
 
 <ST_IN_SCRIPTING>">>=" {
-	return createSymbol(ASTPHP5Symbols.T_SR_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_SR_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"&=" {
-	return createSymbol(ASTPHP5Symbols.T_AND_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_AND_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"|=" {
-	return createSymbol(ASTPHP5Symbols.T_OR_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_OR_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"^=" {
-	return createSymbol(ASTPHP5Symbols.T_XOR_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_XOR_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"||" {
-	return createSymbol(ASTPHP5Symbols.T_BOOLEAN_OR);
+    return createSymbol(ASTPHP5Symbols.T_BOOLEAN_OR);
 }
 
 <ST_IN_SCRIPTING>"&&" {
-	return createSymbol(ASTPHP5Symbols.T_BOOLEAN_AND);
+    return createSymbol(ASTPHP5Symbols.T_BOOLEAN_AND);
 }
 
 <ST_IN_SCRIPTING>"OR" {
-	return createFullSymbol(ASTPHP5Symbols.T_LOGICAL_OR);
+    return createFullSymbol(ASTPHP5Symbols.T_LOGICAL_OR);
 }
 
 <ST_IN_SCRIPTING>"AND" {
-	return createFullSymbol(ASTPHP5Symbols.T_LOGICAL_AND);
+    return createFullSymbol(ASTPHP5Symbols.T_LOGICAL_AND);
 }
 
 <ST_IN_SCRIPTING>"XOR" {
-	return createFullSymbol(ASTPHP5Symbols.T_LOGICAL_XOR);
+    return createFullSymbol(ASTPHP5Symbols.T_LOGICAL_XOR);
 }
 
 <ST_IN_SCRIPTING>"<<" {
-	return createSymbol(ASTPHP5Symbols.T_SL);
+    return createSymbol(ASTPHP5Symbols.T_SL);
 }
 
 <ST_IN_SCRIPTING>">>" {
-	return createSymbol(ASTPHP5Symbols.T_SR);
+    return createSymbol(ASTPHP5Symbols.T_SR);
 }
 
 <ST_IN_SCRIPTING>"**" {
-	return createSymbol(ASTPHP5Symbols.T_POW);
+    return createSymbol(ASTPHP5Symbols.T_POW);
 }
 
 <ST_IN_SCRIPTING>"**=" {
-	return createSymbol(ASTPHP5Symbols.T_POW_EQUAL);
+    return createSymbol(ASTPHP5Symbols.T_POW_EQUAL);
 }
 
 <ST_IN_SCRIPTING>"..." {
-	return createSymbol(ASTPHP5Symbols.T_ELLIPSIS);
+    return createSymbol(ASTPHP5Symbols.T_ELLIPSIS);
 }
 
 <ST_IN_SCRIPTING>"??" {
-	return createSymbol(ASTPHP5Symbols.T_COALESCE);
+    return createSymbol(ASTPHP5Symbols.T_COALESCE);
 }
 
 // TOKENS
@@ -858,7 +857,7 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_IN_SCRIPTING>"}" {
-	/* This is a temporary fix which is dependant on flex and it's implementation */
+    /* This is a temporary fix which is dependant on flex and it's implementation */
     if (!stack.isEmpty()) {
         popState();
     }
@@ -891,7 +890,7 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_VAR_OFFSET>0|([1-9][0-9]*) {
-	return createFullSymbol(ASTPHP5Symbols.T_NUM_STRING);
+    return createFullSymbol(ASTPHP5Symbols.T_NUM_STRING);
 }
 
 <ST_VAR_OFFSET>{LNUM}|{HNUM}|{BNUM} { /* treat numbers (almost) as strings inside encapsulated strings */
@@ -927,11 +926,11 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_IN_SCRIPTING>"__DIR__" {
- 	return createFullSymbol(ASTPHP5Symbols.T_DIR);
+    return createFullSymbol(ASTPHP5Symbols.T_DIR);
 }
 
 <ST_IN_SCRIPTING>"__NAMESPACE__" {
-	return createFullSymbol(ASTPHP5Symbols.T_NS_C);
+    return createFullSymbol(ASTPHP5Symbols.T_NS_C);
 }
 
 <YYINITIAL>(([^<]|"<"[^?%s<])+)|"<s"|"<" {
@@ -982,20 +981,20 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL}"->"[a-zA-Z_\x7f-\xff] {
-	yypushback(3);
-	pushState(ST_LOOKING_FOR_PROPERTY);
-	return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
+    yypushback(3);
+    pushState(ST_LOOKING_FOR_PROPERTY);
+    return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
 }
 
 <ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL}"[" {
-	yypushback(1);
-	pushState(ST_VAR_OFFSET);
-	return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
+    yypushback(1);
+    pushState(ST_VAR_OFFSET);
+    return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
 }
 
 <ST_VAR_OFFSET>"]" {
-	popState();
-	return createSymbol(ASTPHP5Symbols.T_CLOSE_RECT);
+    popState();
+    return createSymbol(ASTPHP5Symbols.T_CLOSE_RECT);
 }
 
 //this is instead {TOKENS}|[{}"`]
@@ -1031,10 +1030,10 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_VAR_OFFSET>[ \n\r\t\\'#] {
-	yypushback(1);
-	popState();
-        /*<ST_VAR_OFFSET>[ \n\r\t\\'#]*/
-	return createSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+    yypushback(1);
+    popState();
+    /*<ST_VAR_OFFSET>[ \n\r\t\\'#]*/
+    return createSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
 }
 
 <ST_IN_SCRIPTING>"define" {
@@ -1047,38 +1046,38 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_IN_SCRIPTING>"#"|"//" {
-	handleCommentStart();
-	yybegin(ST_ONE_LINE_COMMENT);
-//	yymore();
+    handleCommentStart();
+    yybegin(ST_ONE_LINE_COMMENT);
+//    yymore();
 }
 
 <ST_ONE_LINE_COMMENT>"?"|"%"|">" {
-	//	yymore();
+    //    yymore();
 }
 
 <ST_ONE_LINE_COMMENT>[^\n\r?%>]*(.|{NEWLINE}) {
-	String yytext = yytext();
-	switch (yytext.charAt(yytext.length() - 1)) {
-		case '?':
-		case '%':
-		case '>':
-			yypushback(1);
-			break;
-		default:
-			handleLineCommentEnd();
-			yybegin(ST_IN_SCRIPTING);
-	}
-//	yymore();
+    String yytext = yytext();
+    switch (yytext.charAt(yytext.length() - 1)) {
+        case '?':
+        case '%':
+        case '>':
+            yypushback(1);
+            break;
+        default:
+            handleLineCommentEnd();
+            yybegin(ST_IN_SCRIPTING);
+    }
+//    yymore();
 }
 
 <ST_ONE_LINE_COMMENT>"?>"|"%>" {
     if (asp_tags || yytext().charAt(0)!='%') { /* asp comment? */
         isEndedPhp = true;
-	    handleLineCommentEnd();
+        handleLineCommentEnd();
         yypushback(yylength());
-		yybegin(ST_IN_SCRIPTING);
-		//return T_COMMENT;
-	}
+        yybegin(ST_IN_SCRIPTING);
+        //return T_COMMENT;
+    }
 }
 
 <ST_IN_SCRIPTING>"/*"{WHITESPACE}*"@var"{WHITESPACE}("$"?){LABEL}("["({LABEL} | "\"" | "'")*"]")*{WHITESPACE}{QUALIFIED_LABEL}("[""]")*([|]{QUALIFIED_LABEL}("[""]")*)*{WHITESPACE}?"*/" {
@@ -1095,40 +1094,40 @@ NOWDOC_CHARS=({NEWLINE}*(([^a-zA-Z_\x7f-\xff\n\r][^\n\r]*)|({LABEL}[^a-zA-Z0-9_\
 }
 
 <ST_IN_SCRIPTING>"/**" {
-if (!parsePHPDoc()) {
-handleCommentStart();
-yybegin(ST_DOCBLOCK);
-}
+    if (!parsePHPDoc()) {
+        handleCommentStart();
+        yybegin(ST_DOCBLOCK);
+    }
 }
 
 <ST_DOCBLOCK>"*/" {
-     handlePHPDocEnd();
-     yybegin(ST_IN_SCRIPTING);
+    handlePHPDocEnd();
+    yybegin(ST_IN_SCRIPTING);
 }
 
 <ST_DOCBLOCK>~"*/" {
-        int len = yylength();
-        yypushback(2); // go back to mark end of comment in the next token
-        comment = yytext();
+    int len = yylength();
+    yypushback(2); // go back to mark end of comment in the next token
+    comment = yytext();
 }
 
 <ST_DOCBLOCK> <<EOF>> {
-              if (yytext().length() > 0) {
-                yypushback(1);  // backup eof
-                comment = yytext();
-              }
-              else {
-                return createSymbol(ASTPHP5Symbols.EOF);
-              }
+    if (yytext().length() > 0) {
+        yypushback(1);  // backup eof
+        comment = yytext();
+    }
+    else {
+        return createSymbol(ASTPHP5Symbols.EOF);
+    }
 
 }
 
 <ST_IN_SCRIPTING>"/**/" {
-	handleCommentStart();
+    handleCommentStart();
 }
 
 <ST_IN_SCRIPTING>"/*" {
-	handleCommentStart();
+    handleCommentStart();
     yybegin(ST_COMMENT);
 }
 
@@ -1136,12 +1135,12 @@ yybegin(ST_DOCBLOCK);
 }
 
 <ST_COMMENT>"*/" {
-	handleMultilineCommentEnd();
+    handleMultilineCommentEnd();
     yybegin(ST_IN_SCRIPTING);
 }
 
 <ST_COMMENT>"*" {
-//	yymore();
+//    yymore();
 }
 
 <ST_IN_SCRIPTING>("?>"|"</script"{WHITESPACE}*">"){NEWLINE}? {
@@ -1173,24 +1172,24 @@ yybegin(ST_DOCBLOCK);
 }
 
 <ST_IN_SCRIPTING>b?"<<<"{TABS_AND_SPACES}[']{LABEL}[']{NEWLINE} {
-	int bprefix = (yytext().charAt(0) != '<') ? 1 : 0;
-        int startString=3+bprefix;
-        /* 3 is <<<, 2 is quotes, 1 is newline */
-        nowdoc_len = yylength()-bprefix-3-2-1-(yytext().charAt(yylength()-2)=='\r'?1:0);
-        while ((yytext().charAt(startString) == ' ') || (yytext().charAt(startString) == '\t')) {
-            startString++;
-            nowdoc_len--;
-        }
-        // first quate
+    int bprefix = (yytext().charAt(0) != '<') ? 1 : 0;
+    int startString=3+bprefix;
+    /* 3 is <<<, 2 is quotes, 1 is newline */
+    nowdoc_len = yylength()-bprefix-3-2-1-(yytext().charAt(yylength()-2)=='\r'?1:0);
+    while ((yytext().charAt(startString) == ' ') || (yytext().charAt(startString) == '\t')) {
         startString++;
-        nowdoc = yytext().substring(startString,nowdoc_len+startString);
-        yybegin(ST_START_NOWDOC);
-        return createSymbol(ASTPHP5Symbols.T_START_NOWDOC);
+        nowdoc_len--;
+    }
+    // first quate
+    startString++;
+    nowdoc = yytext().substring(startString,nowdoc_len+startString);
+    yybegin(ST_START_NOWDOC);
+    return createSymbol(ASTPHP5Symbols.T_START_NOWDOC);
 }
 
 <ST_START_NOWDOC>{ANY_CHAR} {
-	yypushback(1);
-	yybegin(ST_NOWDOC);
+    yypushback(1);
+    yybegin(ST_NOWDOC);
 }
 
 <ST_START_NOWDOC>{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? {
@@ -1273,8 +1272,8 @@ yybegin(ST_DOCBLOCK);
 }
 
 <ST_START_HEREDOC>{ANY_CHAR} {
-	yypushback(1);
-	yybegin(ST_HEREDOC);
+    yypushback(1);
+    yybegin(ST_HEREDOC);
 }
 
 <ST_START_HEREDOC>{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? {
@@ -1405,8 +1404,8 @@ yybegin(ST_DOCBLOCK);
 }
 
 <ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}+ {
-        /*<ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}+*/
-	return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+    /*<ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}+*/
+    return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
 }
 
 /*
@@ -1420,8 +1419,8 @@ but jflex doesn't support a{n,} so we changed a{2,} to aa+
 }
 
 <ST_BACKQUOTE>{BACKQUOTE_CHARS}+ {
-        /*<ST_BACKQUOTE>{BACKQUOTE_CHARS}+*/
-	return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+    /*<ST_BACKQUOTE>{BACKQUOTE_CHARS}+*/
+    return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
 }
 
 /*
@@ -1429,9 +1428,9 @@ The original parsing rule was {BACKQUOTE_CHARS}*("{"{2,}|"$"{2,}|(("{"+|"$"+)[`]
 but jflex doesn't support a{n,} so we changed a{2,} to aa+
 */
 <ST_BACKQUOTE>{BACKQUOTE_CHARS}*("{""{"+|"$""$"+|(("{"+|"$"+)[`])) {
-	yypushback(1);
-        /*<ST_BACKQUOTE>{BACKQUOTE_CHARS}*("{""{"+|"$""$"+|(("{"+|"$"+)[`]))*/
-	return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
+    yypushback(1);
+    /*<ST_BACKQUOTE>{BACKQUOTE_CHARS}*("{""{"+|"$""$"+|(("{"+|"$"+)[`]))*/
+    return createFullSymbol(ASTPHP5Symbols.T_ENCAPSED_AND_WHITESPACE);
 }
 
 <ST_DOUBLE_QUOTES>[\"] {
@@ -1445,5 +1444,5 @@ but jflex doesn't support a{n,} so we changed a{2,} to aa+
 }
 
 <ST_IN_SCRIPTING,YYINITIAL,ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC,ST_START_HEREDOC,ST_END_HEREDOC, ST_NOWDOC,ST_START_NOWDOC,ST_END_NOWDOC,ST_VAR_OFFSET, ST_DOCBLOCK>{ANY_CHAR} {
-	// do nothing
+    // do nothing
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists