* Added browser like links (Ctrl+Mouseclick on identifier; same as F3 shortcut)
[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / parser / Parser.java
index f30009d..cc9ce7a 100644 (file)
@@ -1,12 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de All rights
- * reserved. This program and the accompanying material are made available under
- * the terms of the Common Public License v1.0 which accompanies this
- * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
+/***********************************************************************************************************************************
+ * Copyright (c) 2002 www.phpeclipse.de All rights reserved. This program and the accompanying material are made available under the
+ * terms of the Common Public License v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
  * 
- * Contributors: Klaus Hartlage - www.eclipseproject.de
- ******************************************************************************/
+ * Contributors: www.phpeclipse.de
+ **********************************************************************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.parser;
+
 import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
@@ -19,41 +19,71 @@ import net.sourceforge.phpdt.internal.compiler.lookup.TypeConstants;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemSeverities;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
+import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
+import net.sourceforge.phpeclipse.internal.compiler.ast.AND_AND_Expression;
+import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
 import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AstNode;
+import net.sourceforge.phpeclipse.internal.compiler.ast.BinaryExpression;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.ConditionalExpression;
+import net.sourceforge.phpeclipse.internal.compiler.ast.EqualExpression;
+import net.sourceforge.phpeclipse.internal.compiler.ast.Expression;
 import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.IfStatement;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.OR_OR_Expression;
 import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
+import net.sourceforge.phpeclipse.internal.compiler.ast.Statement;
+import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteral;
+import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteralDQ;
+import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteralSQ;
 import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+
 public class Parser //extends PHPParserSuperclass
     implements ITerminalSymbols, CompilerModifiers, ParserBasicInformation {
   //internal data for the automat
   protected final static int StackIncrement = 255;
+
   protected int stateStackTop;
+
   protected int[] stack = new int[StackIncrement];
+
   public int firstToken; // handle for multiple parsing goals
+
   public int lastAct; //handle for multiple parsing goals
+
   protected RecoveredElement currentElement;
+
   public static boolean VERBOSE_RECOVERY = false;
+
   protected boolean diet = false; //tells the scanner to jump over some
+
   // parts of the code/expressions like
   // method bodies
   //scanner token
   public Scanner scanner;
+
   private ArrayList phpList;
+
   private int currentPHPString;
+
   private boolean phpEnd;
+
   // private static HashMap keywordMap = null;
   private String str;
+
   // current character
   //  char ch;
   // current token
   int token;
+
   // row counter for syntax errors:
   //int rowCount;
   // column counter for syntax errors:
@@ -63,22 +93,27 @@ public class Parser //extends PHPParserSuperclass
   //   // current identifier
   //   String identifier;
   Long longNumber;
+
   Double doubleNumber;
+
   private String stringValue;
+
   /** Contains the current expression. */
   // private StringBuffer expression;
   //private boolean phpMode;
   protected int modifiers;
+
   protected int modifiersSourceStart;
-//  protected IdentifierIndexManager indexManager;
-  
+
+  //  protected IdentifierIndexManager indexManager;
+
   protected Parser(ProblemReporter problemReporter) {
     this.problemReporter = problemReporter;
     this.options = problemReporter.options;
     this.currentPHPString = 0;
     //         PHPParserSuperclass.fileToParse = fileToParse;
     this.phpList = null;
-//    this.indexManager = null;
+    //    this.indexManager = null;
     this.str = "";
     this.token = TokenNameEOF;
     //    this.chIndx = 0;
@@ -88,16 +123,18 @@ public class Parser //extends PHPParserSuperclass
     //   getNextToken();
     this.initializeScanner();
   }
+
   public void setFileToParse(IFile fileToParse) {
     this.currentPHPString = 0;
     //    PHPParserSuperclass.fileToParse = fileToParse;
     this.phpList = null;
-//    this.indexManager = null;
+    //    this.indexManager = null;
     this.str = "";
     this.token = TokenNameEOF;
     this.phpEnd = false;
     this.initializeScanner();
   }
+
   /**
    * ClassDeclaration Constructor.
    * 
@@ -126,11 +163,15 @@ public class Parser //extends PHPParserSuperclass
     //   getNextToken();
     this.initializeScanner();
   }
+
   public void initializeScanner() {
     this.scanner = new Scanner(false /* comment */, false /* whitespace */, this.options
         .getSeverity(CompilerOptions.NonExternalizedString) != ProblemSeverities.Ignore /* nls */, false, false,
-        this.options.taskTags/* taskTags */, this.options.taskPriorites/* taskPriorities */);
+        this.options.taskTags/* taskTags */, 
+        this.options.taskPriorites/* taskPriorities */,
+        true/*isTaskCaseSensitive*/);
   }
+
   /**
    * Create marker for the parse error
    */
@@ -139,8 +180,7 @@ public class Parser //extends PHPParserSuperclass
   //    setMarker(fileToParse, message, charStart, charEnd, errorLevel);
   //  }
   /**
-   * This method will throw the SyntaxError. It will add the good lines and
-   * columns to the Error
+   * This method will throw the SyntaxError. It will add the good lines and columns to the Error
    * 
    * @param error
    *          the error message
@@ -152,9 +192,9 @@ public class Parser //extends PHPParserSuperclass
     int problemEndPosition = scanner.getCurrentTokenEndPosition();
     throwSyntaxError(error, problemStartPosition, problemEndPosition + 1);
   }
+
   /**
-   * This method will throw the SyntaxError. It will add the good lines and
-   * columns to the Error
+   * This method will throw the SyntaxError. It will add the good lines and columns to the Error
    * 
    * @param error
    *          the error message
@@ -165,35 +205,27 @@ public class Parser //extends PHPParserSuperclass
   //    throw new SyntaxError(startRow, 0, " ", error);
   //  }
   private void throwSyntaxError(String error, int problemStartPosition, int problemEndPosition) {
-    problemReporter.phpParsingError(new String[]{error}, problemStartPosition, problemEndPosition, referenceContext,
+    problemReporter.phpParsingError(new String[] { error }, problemStartPosition, problemEndPosition, referenceContext,
         compilationUnit.compilationResult);
     throw new SyntaxError(1, 0, " ", error);
   }
+
+  private void reportSyntaxError(String error) {
+    int problemStartPosition = scanner.getCurrentTokenStartPosition();
+    int problemEndPosition = scanner.getCurrentTokenEndPosition();
+    reportSyntaxError(error, problemStartPosition, problemEndPosition + 1);
+  }
+  
   private void reportSyntaxError(String error, int problemStartPosition, int problemEndPosition) {
-    problemReporter.phpParsingError(new String[]{error}, problemStartPosition, problemEndPosition, referenceContext,
+    problemReporter.phpParsingError(new String[] { error }, problemStartPosition, problemEndPosition, referenceContext,
         compilationUnit.compilationResult);
   }
+
   private void reportSyntaxWarning(String error, int problemStartPosition, int problemEndPosition) {
-    problemReporter.phpParsingWarning(new String[]{error}, problemStartPosition, problemEndPosition, referenceContext,
+    problemReporter.phpParsingWarning(new String[] { error }, problemStartPosition, problemEndPosition, referenceContext,
         compilationUnit.compilationResult);
   }
-  /**
-   * Method Declaration.
-   * 
-   * @see
-   */
-  //  private void getChar() {
-  //    if (str.length() > chIndx) {
-  //      ch = str.charAt(chIndx++);
-  //
-  //      return;
-  //    }
-  //
-  //    chIndx = str.length() + 1;
-  //    ch = ' ';
-  //    // token = TokenNameEOF;
-  //    phpEnd = true;
-  //  }
+
   /**
    * gets the next token from input
    */
@@ -209,15 +241,16 @@ public class Parser //extends PHPParserSuperclass
     } catch (InvalidInputException e) {
       token = TokenNameERROR;
       String detailedMessage = e.getMessage();
-      
-      if (detailedMessage==Scanner.UNTERMINATED_STRING) {
+
+      if (detailedMessage == Scanner.UNTERMINATED_STRING) {
         throwSyntaxError("Unterminated string.");
-      } else if (detailedMessage==Scanner.UNTERMINATED_COMMENT) {
+      } else if (detailedMessage == Scanner.UNTERMINATED_COMMENT) {
         throwSyntaxError("Unterminated commment.");
       }
     }
     return;
   }
+
   public void init(String s) {
     this.str = s;
     this.token = TokenNameEOF;
@@ -230,14 +263,16 @@ public class Parser //extends PHPParserSuperclass
     scanner.setSource(s.toCharArray());
     scanner.setPHPMode(false);
   }
+
   protected void initialize(boolean phpMode) {
     initialize(phpMode, null);
   }
+
   protected void initialize(boolean phpMode, IdentifierIndexManager indexManager) {
     compilationUnit = null;
     referenceContext = null;
     includesList = new ArrayList();
-//    this.indexManager = indexManager;
+    //    this.indexManager = indexManager;
     this.str = "";
     this.token = TokenNameEOF;
     //    this.chIndx = 0;
@@ -247,17 +282,17 @@ public class Parser //extends PHPParserSuperclass
     //    this.phpMode = phpMode;
     scanner.setPHPMode(phpMode);
   }
+
   /**
-   * Parses a string with php tags i.e. '<body> <?php phpinfo() ?>
-   * </body>'
+   * Parses a string with php tags i.e. '<body> <?php phpinfo() ?> </body>'
    */
   public void parse(String s) {
     init(s);
     parse();
   }
+
   /**
-   * Parses a string with php tags i.e. '<body> <?php phpinfo() ?>
-   * </body>'
+   * Parses a string with php tags i.e. '<body> <?php phpinfo() ?> </body>'
    */
   protected void parse() {
     getNextToken();
@@ -360,6 +395,7 @@ public class Parser //extends PHPParserSuperclass
     }
     return compilationUnit;
   }
+
   //  public PHPOutlineInfo parseInfo(Object parent, String s) {
   //    PHPOutlineInfo outlineInfo = new PHPOutlineInfo(parent);
   //    // Stack stack = new Stack();
@@ -382,6 +418,7 @@ public class Parser //extends PHPParserSuperclass
   private boolean isVariable() {
     return token == TokenNameVariable; //  || token == TokenNamethis;
   }
+
   //  private void parseDeclarations(PHPOutlineInfo outlineInfo,
   //      OutlineableWithChildren current, boolean goBack) {
   //    char[] ident;
@@ -554,11 +591,12 @@ public class Parser //extends PHPParserSuperclass
       if ((token == TokenNameRBRACE) || (token == TokenNamecase) || (token == TokenNamedefault) || (token == TokenNameelse)
           || (token == TokenNameelseif) || (token == TokenNameendif) || (token == TokenNameendfor)
           || (token == TokenNameendforeach) || (token == TokenNameendwhile) || (token == TokenNameendswitch)
-          || (token == TokenNameEOF) || (token == TokenNameERROR)) {
+          || (token == TokenNameenddeclare) || (token == TokenNameEOF) || (token == TokenNameERROR)) {
         return;
       }
     } while (true);
   }
+
   private void functionBody(MethodDeclaration methodDecl) {
     // '{' [statement-list] '}'
     if (token == TokenNameLBRACE) {
@@ -576,56 +614,11 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("'}' expected in compound-statement.");
     }
   }
-  private void statement(int previousToken) {
-    //   if (token > TokenNameKEYWORD && token != TokenNamelist && token !=
-    // TokenNamenew) {
-    //  char[] ident = scanner.getCurrentIdentifierSource();
-    //  String keyword = new String(ident);
-    //    if (token == TokenNameAT) {
-    //      getNextToken();
-    //      if (token != TokenNamerequire && token != TokenNamerequire_once
-    //          && token != TokenNameinclude && token != TokenNameinclude_once
-    //          && token != TokenNameIdentifier && token != TokenNameVariable
-    //          && token != TokenNameStringInterpolated) {
-    //        throwSyntaxError("identifier expected after '@'.");
-    //      }
-    //    }
-    //    if (token == TokenNameinclude || token == TokenNameinclude_once) {
-    //      getNextToken();
-    //      if (token == TokenNameLPAREN) {
-    //        expr();
-    //        if (token == TokenNameSEMICOLON) {
-    //          getNextToken();
-    //        } else {
-    //          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
-    //            throwSyntaxError("';' expected after 'include' or 'include_once'.");
-    //          }
-    //          // getNextToken();
-    //        }
-    //      } else {
-    //        concatenationExpression();
-    //      }
-    //      return;
-    //    } else if (token == TokenNamerequire || token ==
-    // TokenNamerequire_once)
-    // {
-    //      getNextToken();
-    //      //constant();
-    //      if (token == TokenNameLPAREN) {
-    //        expr();
-    //        if (token == TokenNameSEMICOLON) {
-    //          getNextToken();
-    //        } else {
-    //          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
-    //            throwSyntaxError("';' expected after 'require' or 'require_once'.");
-    //          }
-    //          // getNextToken();
-    //        }
-    //      } else {
-    //        concatenationExpression();
-    //      }
-    //      return;
-    //    } else
+
+  private Statement statement(int previousToken) {
+    Statement statement = null;
+    Expression expression;
+    int sourceStart = scanner.getCurrentTokenStartPosition();
     if (token == TokenNameif) {
       getNextToken();
       if (token == TokenNameLPAREN) {
@@ -633,14 +626,14 @@ public class Parser //extends PHPParserSuperclass
       } else {
         throwSyntaxError("'(' expected after 'if' keyword.");
       }
-      expr();
+      expression = expr();
       if (token == TokenNameRPAREN) {
         getNextToken();
       } else {
         throwSyntaxError("')' expected after 'if' condition.");
       }
       ifStatement();
-      return;
+      return new IfStatement(expression, statement, sourceStart, scanner.getCurrentTokenEndPosition());
     } else if (token == TokenNameswitch) {
       getNextToken();
       if (token == TokenNameLPAREN) {
@@ -655,7 +648,7 @@ public class Parser //extends PHPParserSuperclass
         throwSyntaxError("')' expected after 'switch' condition.");
       }
       switchStatement();
-      return;
+      return statement;
     } else if (token == TokenNamefor) {
       getNextToken();
       if (token == TokenNameLPAREN) {
@@ -694,7 +687,7 @@ public class Parser //extends PHPParserSuperclass
         }
       }
       forStatement();
-      return;
+      return statement;
     } else if (token == TokenNamewhile) {
       getNextToken();
       if (token == TokenNameLPAREN) {
@@ -709,7 +702,7 @@ public class Parser //extends PHPParserSuperclass
         throwSyntaxError("')' expected after 'while' condition.");
       }
       whileStatement();
-      return;
+      return statement;
     } else if (token == TokenNamedo) {
       getNextToken();
       if (token == TokenNameLBRACE) {
@@ -749,7 +742,7 @@ public class Parser //extends PHPParserSuperclass
         }
         getNextToken();
       }
-      return;
+      return statement;
     } else if (token == TokenNameforeach) {
       getNextToken();
       if (token == TokenNameLPAREN) {
@@ -776,7 +769,7 @@ public class Parser //extends PHPParserSuperclass
         throwSyntaxError("')' expected after 'foreach' expression.");
       }
       foreachStatement();
-      return;
+      return statement;
     } else if (token == TokenNamecontinue || token == TokenNamebreak || token == TokenNamereturn) {
       getNextToken();
       if (token != TokenNameSEMICOLON) {
@@ -790,7 +783,7 @@ public class Parser //extends PHPParserSuperclass
         }
         getNextToken();
       }
-      return;
+      return statement;
     } else if (token == TokenNameecho) {
       getNextToken();
       expressionList();
@@ -802,10 +795,10 @@ public class Parser //extends PHPParserSuperclass
         }
         getNextToken();
       }
-      return;
+      return statement;
     } else if (token == TokenNameINLINE_HTML) {
       getNextToken();
-      return;
+      return statement;
       //    } else if (token == TokenNameprint) {
       //      getNextToken();
       //      expression();
@@ -829,7 +822,7 @@ public class Parser //extends PHPParserSuperclass
         }
         getNextToken();
       }
-      return;
+      return statement;
     } else if (token == TokenNamestatic) {
       getNextToken();
       static_var_list();
@@ -841,7 +834,7 @@ public class Parser //extends PHPParserSuperclass
         }
         getNextToken();
       }
-      return;
+      return statement;
     } else if (token == TokenNameunset) {
       getNextToken();
       if (token == TokenNameLPAREN) {
@@ -863,14 +856,28 @@ public class Parser //extends PHPParserSuperclass
         }
         getNextToken();
       }
-      return;
+      return statement;
     } else if (token == TokenNamefunction) {
       MethodDeclaration methodDecl = new MethodDeclaration(this.compilationUnit.compilationResult);
       methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
       methodDecl.modifiers = AccDefault;
       getNextToken();
       functionDefinition(methodDecl);
-      return;
+      return statement;
+    } else if (token == TokenNamedeclare) {
+      //T_DECLARE '(' declare_list ')' declare_statement
+      getNextToken();
+      if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected in 'declare' statement.");
+      }
+      getNextToken();
+      declare_list();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in 'declare' statement.");
+      }
+      getNextToken();
+      declare_statement();
+      return statement;
     } else if (token == TokenNametry) {
       getNextToken();
       if (token != TokenNameLBRACE) {
@@ -882,7 +889,7 @@ public class Parser //extends PHPParserSuperclass
         throwSyntaxError("'}' expected in 'try' statement.");
       }
       getNextToken();
-      return;
+      return statement;
     } else if (token == TokenNamecatch) {
       getNextToken();
       if (token != TokenNameLPAREN) {
@@ -910,7 +917,7 @@ public class Parser //extends PHPParserSuperclass
       }
       getNextToken();
       additional_catches();
-      return;
+      return statement;
     } else if (token == TokenNamethrow) {
       getNextToken();
       expr();
@@ -919,12 +926,12 @@ public class Parser //extends PHPParserSuperclass
       } else {
         throwSyntaxError("';' expected after 'throw' exxpression.");
       }
-      return;
+      return statement;
     } else if (token == TokenNamefinal || token == TokenNameabstract || token == TokenNameclass || token == TokenNameinterface) {
       TypeDeclaration typeDecl = new TypeDeclaration(this.compilationUnit.compilationResult);
       typeDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
       typeDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
-      typeDecl.name = new char[]{' '};
+      typeDecl.name = new char[] { ' ' };
       // default super class
       typeDecl.superclass = new SingleTypeReference(TypeConstants.OBJECT, 0);
       compilationUnit.types.add(typeDecl);
@@ -936,7 +943,7 @@ public class Parser //extends PHPParserSuperclass
         astPtr--;
         astLengthPtr--;
       }
-      return;
+      return statement;
       //      } else {
       //        throwSyntaxError("Unexpected keyword '" + keyword + "'");
     } else if (token == TokenNameLBRACE) {
@@ -946,7 +953,7 @@ public class Parser //extends PHPParserSuperclass
       }
       if (token == TokenNameRBRACE) {
         getNextToken();
-        return;
+        return statement;
       } else {
         throwSyntaxError("'}' expected.");
       }
@@ -956,7 +963,7 @@ public class Parser //extends PHPParserSuperclass
       }
       if (token == TokenNameSEMICOLON) {
         getNextToken();
-        return;
+        return statement;
       } else {
         if (token != TokenNameINLINE_HTML && token != TokenNameEOF) {
           throwSyntaxError("';' expected after expression (Found token: " + scanner.toStringAction(token) + ")");
@@ -964,7 +971,51 @@ public class Parser //extends PHPParserSuperclass
         getNextToken();
       }
     }
+    // may be null
+    return statement;
+  }
+
+  private void declare_statement() {
+    // statement
+    //| ':' inner_statement_list T_ENDDECLARE ';'
+    //;
+    if (token == TokenNameCOLON) {
+      getNextToken();
+      // TODO: implement inner_statement_list();
+      statementList();
+      if (token != TokenNameenddeclare) {
+        throwSyntaxError("'enddeclare' expected in 'declare' statement.");
+      }
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after 'enddeclare' keyword.");
+      }
+      getNextToken();
+    } else {
+      statement(TokenNameRPAREN);
+    }
+  }
+
+  private void declare_list() {
+    // T_STRING '=' static_scalar
+    //| declare_list ',' T_STRING '=' static_scalar
+    while (true) {
+      if (token != TokenNameIdentifier) {
+        throwSyntaxError("Identifier expected in 'declare' list.");
+      }
+      getNextToken();
+      if (token != TokenNameEQUAL) {
+        throwSyntaxError("'=' expected in 'declare' list.");
+      }
+      getNextToken();
+      static_scalar();
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+    }
   }
+
   private void additional_catches() {
     while (token == TokenNamecatch) {
       getNextToken();
@@ -985,13 +1036,16 @@ public class Parser //extends PHPParserSuperclass
         throwSyntaxError("'{' expected in 'catch' statement.");
       }
       getNextToken();
-      statementList();
+      if (token != TokenNameRBRACE) {
+        statementList();
+      }
       if (token != TokenNameRBRACE) {
         throwSyntaxError("'}' expected in 'catch' statement.");
       }
       getNextToken();
     }
   }
+
   private void foreach_variable() {
     // w_variable
     //| '&' w_variable
@@ -1000,6 +1054,7 @@ public class Parser //extends PHPParserSuperclass
     }
     w_variable();
   }
+
   private void foreach_optional_arg() {
     // /* empty */
     //| T_DOUBLE_ARROW foreach_variable
@@ -1008,6 +1063,7 @@ public class Parser //extends PHPParserSuperclass
       foreach_variable();
     }
   }
+
   private void global_var_list() {
     //  global_var_list:
     // global_var_list ',' global_var
@@ -1020,6 +1076,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private void global_var() {
     //global_var:
     // T_VARIABLE
@@ -1041,6 +1098,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private void static_var_list() {
     //static_var_list:
     // static_var_list ',' T_VARIABLE
@@ -1063,6 +1121,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private void unset_variables() {
     //    unset_variables:
     //                 unset_variable
@@ -1077,15 +1136,18 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private final void initializeModifiers() {
     this.modifiers = 0;
     this.modifiersSourceStart = -1;
   }
+
   private final void checkAndSetModifiers(int flag) {
     this.modifiers |= flag;
     if (this.modifiersSourceStart < 0)
       this.modifiersSourceStart = this.scanner.startPosition;
   }
+
   private void unticked_class_declaration_statement(TypeDeclaration typeDecl) {
     initializeModifiers();
     if (token == TokenNameinterface) {
@@ -1100,15 +1162,15 @@ public class Parser //extends PHPParserSuperclass
       if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
         typeDecl.name = scanner.getCurrentIdentifierSource();
         if (token > TokenNameKEYWORD) {
-          problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
-              referenceContext, compilationUnit.compilationResult);
-//          throwSyntaxError("Don't use a keyword for interface declaration [" + scanner.toStringAction(token) + "].",
-//              typeDecl.sourceStart, typeDecl.sourceEnd);
+          problemReporter.phpKeywordWarning(new String[] { scanner.toStringAction(token) }, scanner.getCurrentTokenStartPosition(),
+              scanner.getCurrentTokenEndPosition(), referenceContext, compilationUnit.compilationResult);
+          //          throwSyntaxError("Don't use a keyword for interface declaration [" + scanner.toStringAction(token) + "].",
+          //              typeDecl.sourceStart, typeDecl.sourceEnd);
         }
         getNextToken();
         interface_extends_list();
       } else {
-        typeDecl.name = new char[]{' '};
+        typeDecl.name = new char[] { ' ' };
         throwSyntaxError("Interface name expected after keyword 'interface'.", typeDecl.sourceStart, typeDecl.sourceEnd);
         return;
       }
@@ -1125,10 +1187,10 @@ public class Parser //extends PHPParserSuperclass
       if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
         typeDecl.name = scanner.getCurrentIdentifierSource();
         if (token > TokenNameKEYWORD) {
-          problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
-              referenceContext, compilationUnit.compilationResult);
-//          throwSyntaxError("Don't use a keyword for class declaration [" + scanner.toStringAction(token) + "].",
-//              typeDecl.sourceStart, typeDecl.sourceEnd);
+          problemReporter.phpKeywordWarning(new String[] { scanner.toStringAction(token) }, scanner.getCurrentTokenStartPosition(),
+              scanner.getCurrentTokenEndPosition(), referenceContext, compilationUnit.compilationResult);
+          //          throwSyntaxError("Don't use a keyword for class declaration [" + scanner.toStringAction(token) + "].",
+          //              typeDecl.sourceStart, typeDecl.sourceEnd);
         }
         getNextToken();
         //    extends_from:
@@ -1146,7 +1208,7 @@ public class Parser //extends PHPParserSuperclass
         }
         implements_list();
       } else {
-        typeDecl.name = new char[]{' '};
+        typeDecl.name = new char[] { ' ' };
         throwSyntaxError("Class name expected after keyword 'class'.", typeDecl.sourceStart, typeDecl.sourceEnd);
         return;
       }
@@ -1172,6 +1234,7 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("'{' expected at start of class body.");
     }
   }
+
   private void class_entry_type() {
     // T_CLASS
     // | T_ABSTRACT T_CLASS
@@ -1196,6 +1259,7 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("Keyword 'class' 'final' or 'abstract' expected");
     }
   }
+
   private void interface_extends_list() {
     // /* empty */
     // | T_EXTENDS interface_list
@@ -1204,6 +1268,7 @@ public class Parser //extends PHPParserSuperclass
       interface_list();
     }
   }
+
   private void implements_list() {
     // /* empty */
     // | T_IMPLEMENTS interface_list
@@ -1212,6 +1277,7 @@ public class Parser //extends PHPParserSuperclass
       interface_list();
     }
   }
+
   private void interface_list() {
     //  interface_list:
     // fully_qualified_class_name
@@ -1228,6 +1294,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     } while (true);
   }
+
   //  private void classBody(TypeDeclaration typeDecl) {
   //    //'{' [class-element-list] '}'
   //    if (token == TokenNameLBRACE) {
@@ -1252,6 +1319,7 @@ public class Parser //extends PHPParserSuperclass
         || token == TokenNameabstract || token == TokenNamefinal || token == TokenNamefunction || token == TokenNamevar
         || token == TokenNameconst);
   }
+
   private void class_statement(ArrayList list) {
     //    class_statement:
     //         variable_modifiers class_variable_declaration ';'
@@ -1260,7 +1328,7 @@ public class Parser //extends PHPParserSuperclass
     //    '(' parameter_list ')' method_body
     initializeModifiers();
     int declarationSourceStart = scanner.getCurrentTokenStartPosition();
-    
+
     if (token == TokenNamevar) {
       checkAndSetModifiers(AccPublic);
       problemReporter.phpVarDeprecatedWarning(scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
@@ -1268,7 +1336,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
       class_variable_declaration(declarationSourceStart, list);
     } else if (token == TokenNameconst) {
-      checkAndSetModifiers(AccFinal|AccPublic);
+      checkAndSetModifiers(AccFinal | AccPublic);
       class_constant_declaration(declarationSourceStart, list);
       if (token != TokenNameSEMICOLON) {
         throwSyntaxError("';' expected after class const declaration.");
@@ -1293,6 +1361,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private void class_constant_declaration(int declarationSourceStart, ArrayList list) {
     // class_constant_declaration ',' T_STRING '=' static_scalar
     // | T_CONST T_STRING '=' static_scalar
@@ -1325,6 +1394,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   //  private void variable_modifiers() {
   //    // variable_modifiers:
   //    // non_empty_member_modifiers
@@ -1394,6 +1464,7 @@ public class Parser //extends PHPParserSuperclass
     }
     return foundToken;
   }
+
   private void class_variable_declaration(int declarationSourceStart, ArrayList list) {
     //    class_variable_declaration:
     //         class_variable_declaration ',' T_VARIABLE
@@ -1404,9 +1475,9 @@ public class Parser //extends PHPParserSuperclass
     do {
       if (token == TokenNameVariable) {
         classVariable = scanner.getCurrentIdentifierSource();
-      //  indexManager.addIdentifierInformation('v', classVariable, buf, -1, -1);
-        FieldDeclaration fieldDeclaration = new FieldDeclaration(classVariable, scanner
-            .getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition());
+        //  indexManager.addIdentifierInformation('v', classVariable, buf, -1, -1);
+        FieldDeclaration fieldDeclaration = new FieldDeclaration(classVariable, scanner.getCurrentTokenStartPosition(), scanner
+            .getCurrentTokenEndPosition());
         fieldDeclaration.modifiers = this.modifiers;
         fieldDeclaration.declarationSourceStart = declarationSourceStart;
         fieldDeclaration.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
@@ -1435,16 +1506,17 @@ public class Parser //extends PHPParserSuperclass
     }
     getNextToken();
   }
+
   private void functionDefinition(MethodDeclaration methodDecl) {
     boolean isAbstract = false;
     if (astPtr == 0) {
       compilationUnit.types.add(methodDecl);
     } else {
-      AstNode node = astStack[astPtr];
+      ASTNode node = astStack[astPtr];
       if (node instanceof TypeDeclaration) {
         TypeDeclaration typeDecl = ((TypeDeclaration) node);
         if (typeDecl.methods == null) {
-          typeDecl.methods = new AbstractMethodDeclaration[]{methodDecl};
+          typeDecl.methods = new AbstractMethodDeclaration[] { methodDecl };
         } else {
           AbstractMethodDeclaration[] newMethods;
           System.arraycopy(typeDecl.methods, 0, newMethods = new AbstractMethodDeclaration[typeDecl.methods.length + 1], 1,
@@ -1469,6 +1541,7 @@ public class Parser //extends PHPParserSuperclass
     }
     functionBody(methodDecl);
   }
+
   private void functionDeclarator(MethodDeclaration methodDecl) {
     //identifier '(' [parameter-list] ')'
     if (token == TokenNameAND) {
@@ -1479,10 +1552,10 @@ public class Parser //extends PHPParserSuperclass
     if (Scanner.isIdentifierOrKeyword(token)) {
       methodDecl.selector = scanner.getCurrentIdentifierSource();
       if (token > TokenNameKEYWORD) {
-        problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
-            referenceContext, compilationUnit.compilationResult);
-//        reportSyntaxWarning("Don't use keyword for function declaration [" + scanner.toStringAction(token) + "].",
-//          scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition());
+        problemReporter.phpKeywordWarning(new String[] { scanner.toStringAction(token) }, scanner.getCurrentTokenStartPosition(),
+            scanner.getCurrentTokenEndPosition(), referenceContext, compilationUnit.compilationResult);
+        //        reportSyntaxWarning("Don't use keyword for function declaration [" + scanner.toStringAction(token) + "].",
+        //          scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition());
       }
       getNextToken();
       if (token == TokenNameLPAREN) {
@@ -1491,7 +1564,7 @@ public class Parser //extends PHPParserSuperclass
         throwSyntaxError("'(' expected in function declaration.");
       }
       if (token != TokenNameRPAREN) {
-        parameter_list(); 
+        parameter_list();
       }
       if (token != TokenNameRPAREN) {
         throwSyntaxError("')' expected in function declaration.");
@@ -1504,12 +1577,14 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("Function name expected after keyword 'function'.");
     }
   }
+
   //
   private void parameter_list() {
     // non_empty_parameter_list
     // | /* empty */
     non_empty_parameter_list(true);
   }
+
   private void non_empty_parameter_list(boolean empty_allowed) {
     // optional_class_type T_VARIABLE
     // | optional_class_type '&' T_VARIABLE
@@ -1549,10 +1624,12 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("Identifier expected in parameter list.");
     }
   }
+
   private void optional_class_type() {
     // /* empty */
     //| T_STRING
   }
+
   private void parameterDeclaration() {
     //variable
     //variable-reference
@@ -1578,6 +1655,7 @@ public class Parser //extends PHPParserSuperclass
     // declaration.");
     //    }
   }
+
   private void labeledStatementList() {
     if (token != TokenNamecase && token != TokenNamedefault) {
       throwSyntaxError("'case' or 'default' expected.");
@@ -1612,14 +1690,14 @@ public class Parser //extends PHPParserSuperclass
         }
       } else { // TokenNamedefault
         getNextToken();
-        if (token == TokenNameCOLON) {
+        if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
           getNextToken();
           if (token == TokenNameRBRACE) {
             // empty default case
             break;
           }
           if (token != TokenNamecase) {
-            statementList();  
+            statementList();
           }
         } else {
           throwSyntaxError("':' character expected after 'default'.");
@@ -1627,6 +1705,7 @@ public class Parser //extends PHPParserSuperclass
       }
     } while (token == TokenNamecase || token == TokenNamedefault);
   }
+
   //  public void labeledStatement() {
   //    if (token == TokenNamecase) {
   //      getNextToken();
@@ -1682,26 +1761,26 @@ public class Parser //extends PHPParserSuperclass
       if (token != TokenNameendif) {
         statementList();
         switch (token) {
-          case TokenNameelse :
+        case TokenNameelse:
+          getNextToken();
+          if (token == TokenNameCOLON) {
             getNextToken();
-            if (token == TokenNameCOLON) {
+            if (token != TokenNameendif) {
+              statementList();
+            }
+          } else {
+            if (token == TokenNameif) { //'else if'
               getNextToken();
-              if (token != TokenNameendif) {
-                statementList();
-              }
+              elseifStatementList();
             } else {
-              if (token == TokenNameif) { //'else if'
-                getNextToken();
-                elseifStatementList();
-              } else {
-                throwSyntaxError("':' expected after 'else'.");
-              }
+              throwSyntaxError("':' expected after 'else'.");
             }
-            break;
-          case TokenNameelseif :
-            getNextToken();
-            elseifStatementList();
-            break;
+          }
+          break;
+        case TokenNameelseif:
+          getNextToken();
+          elseifStatementList();
+          break;
         }
       }
       if (token != TokenNameendif) {
@@ -1735,34 +1814,36 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private void elseifStatementList() {
     do {
       elseifStatement();
       switch (token) {
-        case TokenNameelse :
+      case TokenNameelse:
+        getNextToken();
+        if (token == TokenNameCOLON) {
           getNextToken();
-          if (token == TokenNameCOLON) {
+          if (token != TokenNameendif) {
+            statementList();
+          }
+          return;
+        } else {
+          if (token == TokenNameif) { //'else if'
             getNextToken();
-            if (token != TokenNameendif) {
-              statementList();
-            }
-            return;
           } else {
-            if (token == TokenNameif) { //'else if'
-              getNextToken();
-            } else {
-              throwSyntaxError("':' expected after 'else'.");
-            }
+            throwSyntaxError("':' expected after 'else'.");
           }
-          break;
-        case TokenNameelseif :
-          getNextToken();
-          break;
-        default :
-          return;
+        }
+        break;
+      case TokenNameelseif:
+        getNextToken();
+        break;
+      default:
+        return;
       }
     } while (true);
   }
+
   private void elseifStatement() {
     if (token == TokenNameLPAREN) {
       getNextToken();
@@ -1780,6 +1861,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private void switchStatement() {
     if (token == TokenNameCOLON) {
       // ':' [labeled-statement-list] 'endswitch' ';'
@@ -1808,6 +1890,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private void forStatement() {
     if (token == TokenNameCOLON) {
       getNextToken();
@@ -1824,6 +1907,7 @@ public class Parser //extends PHPParserSuperclass
       statement(TokenNameEOF);
     }
   }
+
   private void whileStatement() {
     // ':' statement-list 'endwhile' ';'
     if (token == TokenNameCOLON) {
@@ -1841,6 +1925,7 @@ public class Parser //extends PHPParserSuperclass
       statement(TokenNameEOF);
     }
   }
+
   private void foreachStatement() {
     if (token == TokenNameCOLON) {
       getNextToken();
@@ -1857,6 +1942,7 @@ public class Parser //extends PHPParserSuperclass
       statement(TokenNameEOF);
     }
   }
+
   //  private void exitStatus() {
   //    if (token == TokenNameLPAREN) {
   //      getNextToken();
@@ -1882,17 +1968,25 @@ public class Parser //extends PHPParserSuperclass
       }
     } while (true);
   }
-  private void expr() {
+
+  private Expression expr() {
     // r_variable
     // | expr_without_variable
     //    if (token!=TokenNameEOF) {
     if (Scanner.TRACE) {
       System.out.println("TRACE: expr()");
     }
-    expr_without_variable(true);
+    return expr_without_variable(true);
     //    }
   }
-  private void expr_without_variable(boolean only_variable) {
+
+  private Expression expr_without_variable(boolean only_variable) {
+    int exprSourceStart = scanner.getCurrentTokenStartPosition();
+    int exprSourceEnd = scanner.getCurrentTokenEndPosition();
+    Expression expression = new Expression();
+    expression.sourceStart = exprSourceStart;
+    // default, may be overwritten
+    expression.sourceEnd = exprSourceEnd;
     //         internal_functions_in_yacc
     // | T_CLONE expr
     // | T_PRINT expr
@@ -1963,255 +2057,275 @@ public class Parser //extends PHPParserSuperclass
       System.out.println("TRACE: expr_without_variable() PART 1");
     }
     switch (token) {
-      case TokenNameisset :
-      case TokenNameempty :
-      case TokenNameeval :
-      case TokenNameinclude :
-      case TokenNameinclude_once :
-      case TokenNamerequire :
-      case TokenNamerequire_once :
-        internal_functions_in_yacc();
-        break;
-      //       | '(' expr ')'
-      case TokenNameLPAREN :
+    case TokenNameisset:
+    case TokenNameempty:
+    case TokenNameeval:
+    case TokenNameinclude:
+    case TokenNameinclude_once:
+    case TokenNamerequire:
+    case TokenNamerequire_once:
+      internal_functions_in_yacc();
+      break;
+    //         | '(' expr ')'
+    case TokenNameLPAREN:
+      getNextToken();
+      expr();
+      if (token == TokenNameRPAREN) {
         getNextToken();
-        expr();
-        if (token == TokenNameRPAREN) {
-          getNextToken();
+      } else {
+        throwSyntaxError("')' expected in expression.");
+      }
+      break;
+    //    | T_CLONE expr
+    //    | T_PRINT expr
+    //    | '@' expr
+    //    | '+' expr
+    //    | '-' expr
+    //    | '!' expr
+    //    | '~' expr
+    //    | T_INT_CAST expr
+    // | T_DOUBLE_CAST expr
+    // | T_STRING_CAST expr
+    // | T_ARRAY_CAST expr
+    // | T_OBJECT_CAST expr
+    // | T_BOOL_CAST expr
+    // | T_UNSET_CAST expr
+    case TokenNameclone:
+    case TokenNameprint:
+    case TokenNameAT:
+    case TokenNamePLUS:
+    case TokenNameMINUS:
+    case TokenNameNOT:
+    case TokenNameTWIDDLE:
+    case TokenNameintCAST:
+    case TokenNamedoubleCAST:
+    case TokenNamestringCAST:
+    case TokenNamearrayCAST:
+    case TokenNameobjectCAST:
+    case TokenNameboolCAST:
+    case TokenNameunsetCAST:
+      getNextToken();
+      expr();
+      break;
+    case TokenNameexit:
+      getNextToken();
+      exit_expr();
+      break;
+    //  scalar:
+    // T_STRING
+    //| T_STRING_VARNAME
+    //| class_constant
+    //| T_START_HEREDOC encaps_list T_END_HEREDOC
+    //         | '`' encaps_list '`'
+    //  | common_scalar
+    // | '`' encaps_list '`'
+    case TokenNameEncapsedString0:
+      scanner.encapsedStringStack.push(new Character('`'));
+      getNextToken();
+      try {
+        if (token == TokenNameEncapsedString0) {
         } else {
-          throwSyntaxError("')' expected in expression.");
+          encaps_list();
+          if (token != TokenNameEncapsedString0) {
+            throwSyntaxError("\'`\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
+          }
         }
-        break;
-      //    | T_CLONE expr
-      //    | T_PRINT expr
-      //    | '@' expr
-      //    | '+' expr
-      //    | '-' expr
-      //    | '!' expr
-      //    | '~' expr
-      //    | T_INT_CAST expr
-      //       | T_DOUBLE_CAST expr
-      //       | T_STRING_CAST expr
-      //       | T_ARRAY_CAST expr
-      //       | T_OBJECT_CAST expr
-      //       | T_BOOL_CAST expr
-      //       | T_UNSET_CAST expr
-      case TokenNameclone :
-      case TokenNameprint :
-      case TokenNameAT :
-      case TokenNamePLUS :
-      case TokenNameMINUS :
-      case TokenNameNOT :
-      case TokenNameTWIDDLE :
-      case TokenNameintCAST :
-      case TokenNamedoubleCAST :
-      case TokenNamestringCAST :
-      case TokenNamearrayCAST :
-      case TokenNameobjectCAST :
-      case TokenNameboolCAST :
-      case TokenNameunsetCAST :
-        getNextToken();
-        expr();
-        break;
-      case TokenNameexit :
-        getNextToken();
-        exit_expr();
-        break;
-      //  scalar:
-      //       T_STRING
-      //| T_STRING_VARNAME
-      //| class_constant
-      //| T_START_HEREDOC encaps_list T_END_HEREDOC
-      //       | '`' encaps_list '`'
-      //  | common_scalar
-      //       | '`' encaps_list '`'
-      case TokenNameEncapsedString0 :
-        scanner.encapsedStringStack.push(new Character('`'));
+      } finally {
+        scanner.encapsedStringStack.pop();
         getNextToken();
-        try {
-          if (token == TokenNameEncapsedString0) {
+      }
+      break;
+    //      | '\'' encaps_list '\''
+    case TokenNameEncapsedString1:
+      scanner.encapsedStringStack.push(new Character('\''));
+      getNextToken();
+      try {
+        exprSourceStart = scanner.getCurrentTokenStartPosition();
+        if (token == TokenNameEncapsedString1) {
+          expression = new StringLiteralSQ(scanner.getCurrentStringLiteralSource(exprSourceStart), exprSourceStart, scanner
+              .getCurrentTokenEndPosition());
+        } else {
+          encaps_list();
+          if (token != TokenNameEncapsedString1) {
+            throwSyntaxError("\'\'\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
           } else {
-            encaps_list();
-            if (token != TokenNameEncapsedString0) {
-              throwSyntaxError("\'`\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
-            }
+            expression = new StringLiteralSQ(scanner.getCurrentStringLiteralSource(exprSourceStart), exprSourceStart, scanner
+                .getCurrentTokenEndPosition());
           }
-        } finally {
-          scanner.encapsedStringStack.pop();
-          getNextToken();
         }
-        break;
-      //      | '\'' encaps_list '\''
-      case TokenNameEncapsedString1 :
-        scanner.encapsedStringStack.push(new Character('\''));
+      } finally {
+        scanner.encapsedStringStack.pop();
         getNextToken();
-        try {
-          if (token == TokenNameEncapsedString1) {
+      }
+      break;
+    //| '"' encaps_list '"'
+    case TokenNameEncapsedString2:
+      scanner.encapsedStringStack.push(new Character('"'));
+      getNextToken();
+      try {
+        exprSourceStart = scanner.getCurrentTokenStartPosition();
+        if (token == TokenNameEncapsedString2) {
+          expression = new StringLiteralDQ(scanner.getCurrentStringLiteralSource(exprSourceStart), exprSourceStart, scanner
+              .getCurrentTokenEndPosition());
+        } else {
+          encaps_list();
+          if (token != TokenNameEncapsedString2) {
+            throwSyntaxError("'\"' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
           } else {
-            encaps_list();
-            if (token != TokenNameEncapsedString1) {
-              throwSyntaxError("\'\'\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
-            }
+            expression = new StringLiteralDQ(scanner.getCurrentStringLiteralSource(exprSourceStart), exprSourceStart, scanner
+                .getCurrentTokenEndPosition());
           }
-        } finally {
-          scanner.encapsedStringStack.pop();
-          getNextToken();
         }
-        break;
-      //| '"' encaps_list '"'
-      case TokenNameEncapsedString2 :
-        scanner.encapsedStringStack.push(new Character('"'));
+      } finally {
+        scanner.encapsedStringStack.pop();
         getNextToken();
-        try {
-          if (token == TokenNameEncapsedString2) {
-          } else {
-            encaps_list();
-            if (token != TokenNameEncapsedString2) {
-              throwSyntaxError("'\"' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
-            }
-          }
-        } finally {
-          scanner.encapsedStringStack.pop();
+      }
+      break;
+    case TokenNameStringDoubleQuote:
+      expression = new StringLiteralDQ(scanner.getCurrentStringLiteralSource(), scanner.getCurrentTokenStartPosition(), scanner
+          .getCurrentTokenEndPosition());
+      common_scalar();
+      break;
+    case TokenNameStringSingleQuote:
+      expression = new StringLiteralSQ(scanner.getCurrentStringLiteralSource(), scanner.getCurrentTokenStartPosition(), scanner
+          .getCurrentTokenEndPosition());
+      common_scalar();
+      break;
+    case TokenNameIntegerLiteral:
+    case TokenNameDoubleLiteral:
+    case TokenNameStringInterpolated:
+    case TokenNameFILE:
+    case TokenNameLINE:
+    case TokenNameCLASS_C:
+    case TokenNameMETHOD_C:
+    case TokenNameFUNC_C:
+      common_scalar();
+      break;
+    case TokenNameHEREDOC:
+      getNextToken();
+      break;
+    case TokenNamearray:
+      //    T_ARRAY '(' array_pair_list ')'
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+        if (token == TokenNameRPAREN) {
           getNextToken();
+          break;
+        }
+        array_pair_list();
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
         }
-        break;
-      case TokenNameIntegerLiteral :
-      case TokenNameDoubleLiteral :
-      case TokenNameStringDoubleQuote :
-      case TokenNameStringSingleQuote :
-      case TokenNameStringInterpolated :
-      case TokenNameFILE :
-      case TokenNameLINE :
-      case TokenNameCLASS_C :
-      case TokenNameMETHOD_C :
-      case TokenNameFUNC_C :
-        common_scalar();
-        break;
-      case TokenNameHEREDOC :
         getNextToken();
-        break;
-      case TokenNamearray :
-        //    T_ARRAY '(' array_pair_list ')'
+      } else {
+        throwSyntaxError("'(' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
+      }
+      break;
+    case TokenNamelist:
+      //    | T_LIST '(' assignment_list ')' '=' expr
+      getNextToken();
+      if (token == TokenNameLPAREN) {
         getNextToken();
-        if (token == TokenNameLPAREN) {
-          getNextToken();
-          if (token == TokenNameRPAREN) {
-            getNextToken();
-            break;
-          }
-          array_pair_list();
-          if (token != TokenNameRPAREN) {
-            throwSyntaxError("')' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
-          }
-          getNextToken();
-        } else {
-          throwSyntaxError("'(' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
+        assignment_list();
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after 'list' keyword.");
         }
-        break;
-      case TokenNamelist :
-        //    | T_LIST '(' assignment_list ')' '=' expr
         getNextToken();
-        if (token == TokenNameLPAREN) {
-          getNextToken();
-          assignment_list();
-          if (token != TokenNameRPAREN) {
-            throwSyntaxError("')' expected after 'list' keyword.");
-          }
+        if (token != TokenNameEQUAL) {
+          throwSyntaxError("'=' expected after 'list' keyword.");
+        }
+        getNextToken();
+        expr();
+      } else {
+        throwSyntaxError("'(' expected after 'list' keyword.");
+      }
+      break;
+    case TokenNamenew:
+      //       | T_NEW class_name_reference ctor_arguments
+      getNextToken();
+      class_name_reference();
+      ctor_arguments();
+      break;
+    //         | T_INC rw_variable
+    //         | T_DEC rw_variable
+    case TokenNamePLUS_PLUS:
+    case TokenNameMINUS_MINUS:
+      getNextToken();
+      rw_variable();
+      break;
+    // | variable '=' expr
+    // | variable '=' '&' variable
+    // | variable '=' '&' T_NEW class_name_reference ctor_arguments
+    // | variable T_PLUS_EQUAL expr
+    // | variable T_MINUS_EQUAL expr
+    // | variable T_MUL_EQUAL expr
+    // | variable T_DIV_EQUAL expr
+    // | variable T_CONCAT_EQUAL expr
+    // | variable T_MOD_EQUAL expr
+    // | variable T_AND_EQUAL expr
+    // | variable T_OR_EQUAL expr
+    // | variable T_XOR_EQUAL expr
+    // | variable T_SL_EQUAL expr
+    // | variable T_SR_EQUAL expr
+    // | rw_variable T_INC
+    // | rw_variable T_DEC
+    case TokenNameIdentifier:
+    case TokenNameVariable:
+    case TokenNameDOLLAR:
+      variable();
+      switch (token) {
+      case TokenNameEQUAL:
+        getNextToken();
+        if (token == TokenNameAND) {
           getNextToken();
-          if (token != TokenNameEQUAL) {
-            throwSyntaxError("'=' expected after 'list' keyword.");
+          if (token == TokenNamenew) {
+            // | variable '=' '&' T_NEW class_name_reference
+            // ctor_arguments
+            getNextToken();
+            class_name_reference();
+            ctor_arguments();
+          } else {
+            variable();
           }
-          getNextToken();
-          expr();
         } else {
-          throwSyntaxError("'(' expected after 'list' keyword.");
+          expr();
         }
         break;
-      case TokenNamenew :
-        //     | T_NEW class_name_reference ctor_arguments
+      case TokenNamePLUS_EQUAL:
+      case TokenNameMINUS_EQUAL:
+      case TokenNameMULTIPLY_EQUAL:
+      case TokenNameDIVIDE_EQUAL:
+      case TokenNameDOT_EQUAL:
+      case TokenNameREMAINDER_EQUAL:
+      case TokenNameAND_EQUAL:
+      case TokenNameOR_EQUAL:
+      case TokenNameXOR_EQUAL:
+      case TokenNameRIGHT_SHIFT_EQUAL:
+      case TokenNameLEFT_SHIFT_EQUAL:
         getNextToken();
-        class_name_reference();
-        ctor_arguments();
+        expr();
         break;
-      //       | T_INC rw_variable
-      //       | T_DEC rw_variable
-      case TokenNamePLUS_PLUS :
-      case TokenNameMINUS_MINUS :
+      case TokenNamePLUS_PLUS:
+      case TokenNameMINUS_MINUS:
         getNextToken();
-        rw_variable();
         break;
-      //       | variable '=' expr
-      //       | variable '=' '&' variable
-      //       | variable '=' '&' T_NEW class_name_reference ctor_arguments
-      //       | variable T_PLUS_EQUAL expr
-      //       | variable T_MINUS_EQUAL expr
-      //       | variable T_MUL_EQUAL expr
-      //       | variable T_DIV_EQUAL expr
-      //       | variable T_CONCAT_EQUAL expr
-      //       | variable T_MOD_EQUAL expr
-      //       | variable T_AND_EQUAL expr
-      //       | variable T_OR_EQUAL expr
-      //       | variable T_XOR_EQUAL expr
-      //       | variable T_SL_EQUAL expr
-      //       | variable T_SR_EQUAL expr
-      //       | rw_variable T_INC
-      //       | rw_variable T_DEC
-      case TokenNameIdentifier :
-      case TokenNameVariable :
-      case TokenNameDOLLAR :
-        variable();
-        switch (token) {
-          case TokenNameEQUAL :
-            getNextToken();
-            if (token == TokenNameAND) {
-              getNextToken();
-              if (token == TokenNamenew) {
-                // | variable '=' '&' T_NEW class_name_reference
-                // ctor_arguments
-                getNextToken();
-                class_name_reference();
-                ctor_arguments();
-              } else {
-                variable();
-              }
-            } else {
-              expr();
-            }
-            break;
-          case TokenNamePLUS_EQUAL :
-          case TokenNameMINUS_EQUAL :
-          case TokenNameMULTIPLY_EQUAL :
-          case TokenNameDIVIDE_EQUAL :
-          case TokenNameDOT_EQUAL :
-          case TokenNameREMAINDER_EQUAL :
-          case TokenNameAND_EQUAL :
-          case TokenNameOR_EQUAL :
-          case TokenNameXOR_EQUAL :
-          case TokenNameRIGHT_SHIFT_EQUAL :
-          case TokenNameLEFT_SHIFT_EQUAL :
-            getNextToken();
-            expr();
-            break;
-          case TokenNamePLUS_PLUS :
-          case TokenNameMINUS_MINUS :
-            getNextToken();
-            break;
-          default :
-            if (!only_variable) {
-              throwSyntaxError("Variable expression not allowed (found token '" + scanner.toStringAction(token) + "').");
-            }
+      default:
+        if (!only_variable) {
+          throwSyntaxError("Variable expression not allowed (found token '" + scanner.toStringAction(token) + "').");
         }
-        break;
-      default :
-        if (token != TokenNameINLINE_HTML) {
-          if (token > TokenNameKEYWORD) {
-            getNextToken();
-            break;
-          } else {
-            throwSyntaxError("Error in expression (found token '" + scanner.toStringAction(token) + "').");
-          }
+      }
+      break;
+    default:
+      if (token != TokenNameINLINE_HTML) {
+        if (token > TokenNameKEYWORD) {
+          getNextToken();
+          break;
+        } else {
+          throwSyntaxError("Error in expression (found token '" + scanner.toStringAction(token) + "').");
         }
-        return;
+      }
+      return expression;
     }
     if (Scanner.TRACE) {
       System.out.println("TRACE: expr_without_variable() PART 2");
@@ -2242,52 +2356,69 @@ public class Parser //extends PHPParserSuperclass
     // | expr T_IS_GREATER_OR_EQUAL expr
     while (true) {
       switch (token) {
-        case TokenNameOR_OR :
-        case TokenNameAND_AND :
-        case TokenNameand :
-        case TokenNameor :
-        case TokenNamexor :
-        case TokenNameAND :
-        case TokenNameOR :
-        case TokenNameXOR :
-        case TokenNameDOT :
-        case TokenNamePLUS :
-        case TokenNameMINUS :
-        case TokenNameMULTIPLY :
-        case TokenNameDIVIDE :
-        case TokenNameREMAINDER :
-        case TokenNameLEFT_SHIFT :
-        case TokenNameRIGHT_SHIFT :
-        case TokenNameEQUAL_EQUAL_EQUAL :
-        case TokenNameNOT_EQUAL_EQUAL :
-        case TokenNameEQUAL_EQUAL :
-        case TokenNameNOT_EQUAL :
-        case TokenNameLESS :
-        case TokenNameLESS_EQUAL :
-        case TokenNameGREATER :
-        case TokenNameGREATER_EQUAL :
-          getNextToken();
-          expr();
-          break;
-        //  | expr T_INSTANCEOF class_name_reference
-        //     | expr '?' expr ':' expr
-        case TokenNameinstanceof :
-          getNextToken();
-          class_name_reference();
-          break;
-        case TokenNameQUESTION :
-          getNextToken();
-          expr();
-          if (token == TokenNameCOLON) {
-            getNextToken();
-            expr();
-          }
-          break;
-        default :
-          return;
+      case TokenNameOR_OR:
+        getNextToken();
+        expression = new OR_OR_Expression(expression, expr(), token);
+        break;
+      case TokenNameAND_AND:
+        getNextToken();
+        expression = new AND_AND_Expression(expression, expr(), token);
+        break;
+      case TokenNameEQUAL_EQUAL:
+        getNextToken();
+        expression = new EqualExpression(expression, expr(), token);
+        break;
+      case TokenNameand:
+      case TokenNameor:
+      case TokenNamexor:
+      case TokenNameAND:
+      case TokenNameOR:
+      case TokenNameXOR:
+      case TokenNameDOT:
+      case TokenNamePLUS:
+      case TokenNameMINUS:
+      case TokenNameMULTIPLY:
+      case TokenNameDIVIDE:
+      case TokenNameREMAINDER:
+      case TokenNameLEFT_SHIFT:
+      case TokenNameRIGHT_SHIFT:
+      case TokenNameEQUAL_EQUAL_EQUAL:
+      case TokenNameNOT_EQUAL_EQUAL:
+      case TokenNameNOT_EQUAL:
+      case TokenNameLESS:
+      case TokenNameLESS_EQUAL:
+      case TokenNameGREATER:
+      case TokenNameGREATER_EQUAL:
+        getNextToken();
+        expression = new BinaryExpression(expression, expr(), token);
+        break;
+      //  | expr T_INSTANCEOF class_name_reference
+      //       | expr '?' expr ':' expr
+      case TokenNameinstanceof:
+        getNextToken();
+        class_name_reference();
+        // TODO use InstanceofExpression
+        expression = new Expression();
+        expression.sourceStart = exprSourceStart;
+        expression.sourceEnd = scanner.getCurrentTokenEndPosition();
+        break;
+      case TokenNameQUESTION:
+        getNextToken();
+        Expression valueIfTrue = expr();
+        if (token != TokenNameCOLON) {
+          throwSyntaxError("':' expected in conditional expression.");
+        }
+        getNextToken();
+        Expression valueIfFalse = expr();
+
+        expression = new ConditionalExpression(expression, valueIfTrue, valueIfFalse);
+        break;
+      default:
+        return expression;
       }
     }
   }
+
   private void class_name_reference() {
     //  class_name_reference:
     // T_STRING
@@ -2301,6 +2432,7 @@ public class Parser //extends PHPParserSuperclass
       dynamic_class_name_reference();
     }
   }
+
   private void dynamic_class_name_reference() {
     //dynamic_class_name_reference:
     // base_variable T_OBJECT_OPERATOR object_property
@@ -2316,6 +2448,7 @@ public class Parser //extends PHPParserSuperclass
       dynamic_class_name_variable_properties();
     }
   }
+
   private void dynamic_class_name_variable_properties() {
     //  dynamic_class_name_variable_properties:
     //                 dynamic_class_name_variable_properties
@@ -2328,6 +2461,7 @@ public class Parser //extends PHPParserSuperclass
       dynamic_class_name_variable_property();
     }
   }
+
   private void dynamic_class_name_variable_property() {
     //  dynamic_class_name_variable_property:
     // T_OBJECT_OPERATOR object_property
@@ -2339,6 +2473,7 @@ public class Parser //extends PHPParserSuperclass
       object_property();
     }
   }
+
   private void ctor_arguments() {
     //  ctor_arguments:
     // /* empty */
@@ -2356,6 +2491,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private void assignment_list() {
     //  assignment_list:
     // assignment_list ',' assignment_list_element
@@ -2368,6 +2504,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private void assignment_list_element() {
     //assignment_list_element:
     // variable
@@ -2391,6 +2528,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private void array_pair_list() {
     //  array_pair_list:
     // /* empty */
@@ -2400,6 +2538,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private void non_empty_array_pair_list() {
     //non_empty_array_pair_list:
     // non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr
@@ -2438,6 +2577,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   //  private void variableList() {
   //    do {
   //      variable();
@@ -2460,6 +2600,7 @@ public class Parser //extends PHPParserSuperclass
     }
     reference_variable();
   }
+
   private void function_call() {
     //  function_call:
     // T_STRING '(' function_call_parameter_list ')'
@@ -2467,68 +2608,57 @@ public class Parser //extends PHPParserSuperclass
     //| static_member '(' function_call_parameter_list ')'
     //| variable_without_objects '(' function_call_parameter_list ')'
     char[] defineName = null;
-    int startPos=0;
-    int endPos=0;
+    char[] ident = null;
+    int startPos = 0;
+    int endPos = 0;
     if (Scanner.TRACE) {
       System.out.println("TRACE: function_call()");
     }
     if (token == TokenNameIdentifier) {
-      defineName = scanner.getCurrentIdentifierSource();
+      ident = scanner.getCurrentIdentifierSource();
+      defineName = ident;
       startPos = scanner.getCurrentTokenStartPosition();
       endPos = scanner.getCurrentTokenEndPosition();
       getNextToken();
       switch (token) {
-        case TokenNamePAAMAYIM_NEKUDOTAYIM :
-          // static member:
-          defineName = null;
+      case TokenNamePAAMAYIM_NEKUDOTAYIM:
+        // static member:
+        defineName = null;
+        getNextToken();
+        if (token == TokenNameIdentifier) {
+          // class _constant
           getNextToken();
-          if (token == TokenNameIdentifier) {
-            // class _constant
-            getNextToken();
-          } else {
-            //        static member:
-            variable_without_objects();
-          }
-          break;
+        } else {
+          //        static member:
+          variable_without_objects();
+        }
+        break;
       }
     } else {
       variable_without_objects();
     }
     if (token != TokenNameLPAREN) {
-      if (defineName!=null) {
+      if (defineName != null) {
         // does this identifier contain only uppercase characters?
-        if (defineName.length==3) {
-          if (defineName[0]=='d' &&
-              defineName[1]=='i' &&
-              defineName[2]=='e' ) {
-            defineName=null;
-          } 
-        } else if (defineName.length==4) {
-          if (defineName[0]=='t' &&
-              defineName[1]=='r' &&
-              defineName[2]=='u' &&
-              defineName[3]=='e' ) {
-            defineName=null;
-          } else if (defineName[0]=='n' &&
-              defineName[1]=='u' &&
-              defineName[2]=='l' &&
-              defineName[3]=='l' ) {
-            defineName=null;
+        if (defineName.length == 3) {
+          if (defineName[0] == 'd' && defineName[1] == 'i' && defineName[2] == 'e') {
+            defineName = null;
           }
-        } else if (defineName.length==5) {
-          if (defineName[0]=='f' &&
-              defineName[1]=='a' &&
-              defineName[2]=='l' &&
-              defineName[3]=='s' &&
-              defineName[4]=='e' ) {
-            defineName=null;
+        } else if (defineName.length == 4) {
+          if (defineName[0] == 't' && defineName[1] == 'r' && defineName[2] == 'u' && defineName[3] == 'e') {
+            defineName = null;
+          } else if (defineName[0] == 'n' && defineName[1] == 'u' && defineName[2] == 'l' && defineName[3] == 'l') {
+            defineName = null;
+          }
+        } else if (defineName.length == 5) {
+          if (defineName[0] == 'f' && defineName[1] == 'a' && defineName[2] == 'l' && defineName[3] == 's' && defineName[4] == 'e') {
+            defineName = null;
           }
         }
-        if (defineName!=null) {
-          for (int i=0; i<defineName.length;i++) {
-            if (Character.isLowerCase(defineName[i])) {  
-              problemReporter.phpUppercaseIdentifierWarning(startPos, endPos,
-                referenceContext, compilationUnit.compilationResult);
+        if (defineName != null) {
+          for (int i = 0; i < defineName.length; i++) {
+            if (Character.isLowerCase(defineName[i])) {
+              problemReporter.phpUppercaseIdentifierWarning(startPos, endPos, referenceContext, compilationUnit.compilationResult);
               break;
             }
           }
@@ -2545,10 +2675,17 @@ public class Parser //extends PHPParserSuperclass
     }
     non_empty_function_call_parameter_list();
     if (token != TokenNameRPAREN) {
-      throwSyntaxError("')' expected in function call.");
+      String functionName;
+      if (ident == null) {
+        functionName = new String(" ");
+      } else {
+        functionName = new String(ident);
+      }
+      throwSyntaxError("')' expected in function call (" + functionName + ").");
     }
     getNextToken();
   }
+
   //  private void function_call_parameter_list() {
   //    function_call_parameter_list:
   //           non_empty_function_call_parameter_list { $$ = $1; }
@@ -2584,6 +2721,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private void fully_qualified_class_name() {
     if (token == TokenNameIdentifier) {
       getNextToken();
@@ -2591,6 +2729,7 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("Class name expected.");
     }
   }
+
   private void static_member() {
     //  static_member:
     // fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM
@@ -2605,6 +2744,7 @@ public class Parser //extends PHPParserSuperclass
     getNextToken();
     variable_without_objects();
   }
+
   private void base_variable_with_function_calls() {
     //  base_variable_with_function_calls:
     // base_variable
@@ -2632,6 +2772,7 @@ public class Parser //extends PHPParserSuperclass
     //      base_variable();
     //    }
   }
+
   private void base_variable() {
     //  base_variable:
     //                 reference_variable
@@ -2649,6 +2790,7 @@ public class Parser //extends PHPParserSuperclass
       reference_variable();
     }
   }
+
   //  private void simple_indirect_reference() {
   //    // simple_indirect_reference:
   //    // '$'
@@ -2686,6 +2828,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private void compound_variable() {
     //  compound_variable:
     //                 T_VARIABLE
@@ -2711,6 +2854,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   //  private void dim_offset() {
   //    // dim_offset:
   //    // /* empty */
@@ -2730,6 +2874,7 @@ public class Parser //extends PHPParserSuperclass
       object_dim_list();
     }
   }
+
   private void object_dim_list() {
     //object_dim_list:
     // object_dim_list '[' dim_offset ']'
@@ -2763,6 +2908,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private void variable_name() {
     //variable_name:
     // T_STRING
@@ -2787,15 +2933,19 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private void r_variable() {
     variable();
   }
+
   private void w_variable() {
     variable();
   }
+
   private void rw_variable() {
     variable();
   }
+
   private void variable() {
     //    variable:
     //         base_variable_with_function_calls T_OBJECT_OPERATOR
@@ -2835,6 +2985,7 @@ public class Parser //extends PHPParserSuperclass
     //      }
     //    }
   }
+
   private void variable_properties() {
     //  variable_properties:
     //                 variable_properties variable_property
@@ -2843,6 +2994,7 @@ public class Parser //extends PHPParserSuperclass
       variable_property();
     }
   }
+
   private void variable_property() {
     //  variable_property:
     //                 T_OBJECT_OPERATOR object_property method_or_not
@@ -2857,6 +3009,7 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("'->' expected in variable_property.");
     }
   }
+
   private void method_or_not() {
     //  method_or_not:
     //                 '(' function_call_parameter_list ')'
@@ -2877,6 +3030,7 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     }
   }
+
   private void exit_expr() {
     // /* empty */
     // | '(' ')'
@@ -2895,6 +3049,7 @@ public class Parser //extends PHPParserSuperclass
     }
     getNextToken();
   }
+
   private void encaps_list() {
     //                 encaps_list encaps_var
     //         | encaps_list T_STRING
@@ -2910,71 +3065,65 @@ public class Parser //extends PHPParserSuperclass
     //         | /* empty */
     while (true) {
       switch (token) {
-        case TokenNameSTRING :
-          getNextToken();
-          break;
-        case TokenNameLBRACE :
-          //          scanner.encapsedStringStack.pop();
-          getNextToken();
-          break;
-        case TokenNameRBRACE :
-          //          scanner.encapsedStringStack.pop();
-          getNextToken();
-          break;
-        case TokenNameLBRACKET :
-          //          scanner.encapsedStringStack.pop();
-          getNextToken();
-          break;
-        case TokenNameRBRACKET :
-          //          scanner.encapsedStringStack.pop();
-          getNextToken();
-          break;
-        case TokenNameMINUS_GREATER :
-          //          scanner.encapsedStringStack.pop();
-          getNextToken();
-          break;
-        case TokenNameVariable :
-        case TokenNameDOLLAR_LBRACE :
-        case TokenNameCURLY_OPEN :
-          encaps_var();
-          break;
-        //        case TokenNameDOLLAR :
-        //          getNextToken();
-        //          if (token == TokenNameLBRACE) {
-        //            token = TokenNameDOLLAR_LBRACE;
-        //            encaps_var();
-        //          }
-        //          break;
-        default :
-          char encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
-          if (encapsedChar == '$') {
-            scanner.encapsedStringStack.pop();
-            encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
-            switch (encapsedChar) {
-              case '`' :
-                if (token == TokenNameEncapsedString0) {
-                  return;
-                }
-                token = TokenNameSTRING;
-                continue;
-              case '\'' :
-                if (token == TokenNameEncapsedString1) {
-                  return;
-                }
-                token = TokenNameSTRING;
-                continue;
-              case '"' :
-                if (token == TokenNameEncapsedString2) {
-                  return;
-                }
-                token = TokenNameSTRING;
-                continue;
+      case TokenNameSTRING:
+        getNextToken();
+        break;
+      case TokenNameLBRACE:
+        //          scanner.encapsedStringStack.pop();
+        getNextToken();
+        break;
+      case TokenNameRBRACE:
+        //          scanner.encapsedStringStack.pop();
+        getNextToken();
+        break;
+      case TokenNameLBRACKET:
+        //          scanner.encapsedStringStack.pop();
+        getNextToken();
+        break;
+      case TokenNameRBRACKET:
+        //          scanner.encapsedStringStack.pop();
+        getNextToken();
+        break;
+      case TokenNameMINUS_GREATER:
+        //          scanner.encapsedStringStack.pop();
+        getNextToken();
+        break;
+      case TokenNameVariable:
+      case TokenNameDOLLAR_LBRACE:
+      case TokenNameLBRACE_DOLLAR:
+        encaps_var();
+        break;
+      default:
+        char encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
+        if (encapsedChar == '$') {
+          scanner.encapsedStringStack.pop();
+          encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
+          switch (encapsedChar) {
+          case '`':
+            if (token == TokenNameEncapsedString0) {
+              return;
+            }
+            token = TokenNameSTRING;
+            continue;
+          case '\'':
+            if (token == TokenNameEncapsedString1) {
+              return;
+            }
+            token = TokenNameSTRING;
+            continue;
+          case '"':
+            if (token == TokenNameEncapsedString2) {
+              return;
             }
+            token = TokenNameSTRING;
+            continue;
           }
-          return;
+        }
+        return;
       }
     }
   }
+
   private void encaps_var() {
     //                 T_VARIABLE
     //         | T_VARIABLE '[' encaps_var_offset ']'
@@ -2983,99 +3132,111 @@ public class Parser //extends PHPParserSuperclass
     //         | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}'
     //         | T_CURLY_OPEN variable '}'
     switch (token) {
-      case TokenNameVariable :
+    case TokenNameVariable:
+      getNextToken();
+      if (token == TokenNameLBRACKET) {
+        getNextToken();
+        expr(); //encaps_var_offset();
+        if (token != TokenNameRBRACKET) {
+          throwSyntaxError("']' expected after variable.");
+        }
+        //          scanner.encapsedStringStack.pop();
+        getNextToken();
+        //          }
+      } else if (token == TokenNameMINUS_GREATER) {
+        getNextToken();
+        if (token != TokenNameIdentifier) {
+          throwSyntaxError("Identifier expected after '->'.");
+        }
+        //          scanner.encapsedStringStack.pop();
+        getNextToken();
+      }
+      //        else {
+      //          // scanner.encapsedStringStack.pop();
+      //          int tempToken = TokenNameSTRING;
+      //          if (!scanner.encapsedStringStack.isEmpty()
+      //              && (token == TokenNameEncapsedString0
+      //                  || token == TokenNameEncapsedString1
+      //                  || token == TokenNameEncapsedString2 || token ==
+      // TokenNameERROR)) {
+      //            char encapsedChar = ((Character)
+      // scanner.encapsedStringStack.peek())
+      //                .charValue();
+      //            switch (token) {
+      //              case TokenNameEncapsedString0 :
+      //                if (encapsedChar == '`') {
+      //                  tempToken = TokenNameEncapsedString0;
+      //                }
+      //                break;
+      //              case TokenNameEncapsedString1 :
+      //                if (encapsedChar == '\'') {
+      //                  tempToken = TokenNameEncapsedString1;
+      //                }
+      //                break;
+      //              case TokenNameEncapsedString2 :
+      //                if (encapsedChar == '"') {
+      //                  tempToken = TokenNameEncapsedString2;
+      //                }
+      //                break;
+      //              case TokenNameERROR :
+      //                if (scanner.source[scanner.currentPosition - 1] == '\\') {
+      //                  scanner.currentPosition--;
+      //                  getNextToken();
+      //                }
+      //                break;
+      //            }
+      //          }
+      //          token = tempToken;
+      //        }
+      break;
+    case TokenNameDOLLAR_LBRACE:
+      getNextToken();
+      if (token == TokenNameDOLLAR_LBRACE) {
+        encaps_var();
+      } else if (token == TokenNameIdentifier) {
         getNextToken();
         if (token == TokenNameLBRACKET) {
           getNextToken();
-          //          if (token == TokenNameRBRACKET) {
-          //            getNextToken();
-          //          } else {
-          expr(); //encaps_var_offset();
+          //            if (token == TokenNameRBRACKET) {
+          //              getNextToken();
+          //            } else {
+          expr();
           if (token != TokenNameRBRACKET) {
-            throwSyntaxError("']' expected after variable.");
-          }
-          //          scanner.encapsedStringStack.pop();
-          getNextToken();
-          //          }
-        } else if (token == TokenNameMINUS_GREATER) {
-          getNextToken();
-          if (token != TokenNameIdentifier) {
-            throwSyntaxError("Identifier expected after '->'.");
+            throwSyntaxError("']' expected after '${'.");
           }
-          //          scanner.encapsedStringStack.pop();
           getNextToken();
+          //            }
         }
-        //        else {
-        //          // scanner.encapsedStringStack.pop();
-        //          int tempToken = TokenNameSTRING;
-        //          if (!scanner.encapsedStringStack.isEmpty()
-        //              && (token == TokenNameEncapsedString0
-        //                  || token == TokenNameEncapsedString1
-        //                  || token == TokenNameEncapsedString2 || token ==
-        // TokenNameERROR)) {
-        //            char encapsedChar = ((Character)
-        // scanner.encapsedStringStack.peek())
-        //                .charValue();
-        //            switch (token) {
-        //              case TokenNameEncapsedString0 :
-        //                if (encapsedChar == '`') {
-        //                  tempToken = TokenNameEncapsedString0;
-        //                }
-        //                break;
-        //              case TokenNameEncapsedString1 :
-        //                if (encapsedChar == '\'') {
-        //                  tempToken = TokenNameEncapsedString1;
-        //                }
-        //                break;
-        //              case TokenNameEncapsedString2 :
-        //                if (encapsedChar == '"') {
-        //                  tempToken = TokenNameEncapsedString2;
-        //                }
-        //                break;
-        //              case TokenNameERROR :
-        //                if (scanner.source[scanner.currentPosition - 1] == '\\') {
-        //                  scanner.currentPosition--;
-        //                  getNextToken();
-        //                }
-        //                break;
-        //            }
-        //          }
-        //          token = tempToken;
-        //        }
-        break;
-      case TokenNameDOLLAR_LBRACE :
+      } else {
+        expr();
+      }
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected.");
+      }
+      getNextToken();
+      break;
+    case TokenNameLBRACE_DOLLAR:
+      getNextToken();
+      if (token == TokenNameLBRACE_DOLLAR) {
+        encaps_var();
+      } else if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
         getNextToken();
-        if (token == TokenNameIdentifier) {
-          getNextToken();
-          if (token == TokenNameLBRACKET) {
-            getNextToken();
-            //            if (token == TokenNameRBRACKET) {
-            //              getNextToken();
-            //            } else {
-            expr();
-            if (token != TokenNameRBRACKET) {
-              throwSyntaxError("']' expected after '${'.");
-            }
-            getNextToken();
-            //            }
-          }
-          if (token != TokenNameRBRACE) {
-            throwSyntaxError("'}' expected after '${'.");
-          }
-          //          scanner.encapsedStringStack.pop();
+        if (token == TokenNameLBRACKET) {
           getNextToken();
-        } else {
+          //            if (token == TokenNameRBRACKET) {
+          //              getNextToken();
+          //            } else {
           expr();
-          if (token != TokenNameRBRACE) {
-            throwSyntaxError("'}' expected.");
+          if (token != TokenNameRBRACKET) {
+            throwSyntaxError("']' expected.");
           }
-          //          scanner.encapsedStringStack.pop();
           getNextToken();
-        }
-        break;
-      case TokenNameCURLY_OPEN :
-        getNextToken();
-        if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+          //            }
+        } else if (token == TokenNameMINUS_GREATER) {
+          getNextToken();
+          if (token != TokenNameIdentifier && token != TokenNameVariable) {
+            throwSyntaxError("String or Variable token expected.");
+          }
           getNextToken();
           if (token == TokenNameLBRACKET) {
             getNextToken();
@@ -3084,149 +3245,183 @@ public class Parser //extends PHPParserSuperclass
             //            } else {
             expr();
             if (token != TokenNameRBRACKET) {
-              throwSyntaxError("']' expected after '{$'.");
+              throwSyntaxError("']' expected after '${'.");
             }
             getNextToken();
             //            }
-          } else if (token == TokenNameMINUS_GREATER) {
-            getNextToken();
-            if (token != TokenNameIdentifier) {
-              throwSyntaxError("String token expected.");
-            }
-            getNextToken();
           }
-          //          if (token != TokenNameRBRACE) {
-          //            throwSyntaxError("'}' expected after '{$'.");
-          //          }
-          //          // scanner.encapsedStringStack.pop();
-          //          getNextToken();
-        } else {
-          expr();
-          if (token != TokenNameRBRACE) {
-            throwSyntaxError("'}' expected.");
-          }
-          //          scanner.encapsedStringStack.pop();
-          getNextToken();
         }
-        break;
+        //          if (token != TokenNameRBRACE) {
+        //            throwSyntaxError("'}' expected after '{$'.");
+        //          }
+        //          // scanner.encapsedStringStack.pop();
+        //          getNextToken();
+      } else {
+        expr();
+        if (token != TokenNameRBRACE) {
+          throwSyntaxError("'}' expected.");
+        }
+        //          scanner.encapsedStringStack.pop();
+        getNextToken();
+      }
+      break;
     }
   }
+
   private void encaps_var_offset() {
     //                 T_STRING
     //         | T_NUM_STRING
     //         | T_VARIABLE
     switch (token) {
-      case TokenNameSTRING :
-        getNextToken();
-        break;
-      case TokenNameIntegerLiteral :
-        getNextToken();
-        break;
-      case TokenNameVariable :
-        getNextToken();
-        break;
-      case TokenNameIdentifier :
-        getNextToken();
-        break;
-      default :
-        throwSyntaxError("Variable or String token expected.");
-        break;
+    case TokenNameSTRING:
+      getNextToken();
+      break;
+    case TokenNameIntegerLiteral:
+      getNextToken();
+      break;
+    case TokenNameVariable:
+      getNextToken();
+      break;
+    case TokenNameIdentifier:
+      getNextToken();
+      break;
+    default:
+      throwSyntaxError("Variable or String token expected.");
+      break;
     }
   }
+
   private void internal_functions_in_yacc() {
-    int start = 0;
+    //    int start = 0;
     ImportReference impt = null;
     switch (token) {
-      case TokenNameisset :
-        //     T_ISSET '(' isset_variables ')'
-        getNextToken();
-        if (token != TokenNameLPAREN) {
-          throwSyntaxError("'(' expected after keyword 'isset'");
-        }
-        getNextToken();
-        isset_variables();
-        if (token != TokenNameRPAREN) {
-          throwSyntaxError("')' expected after keyword 'isset'");
-        }
-        getNextToken();
-        break;
-      case TokenNameempty :
-        //     T_EMPTY '(' variable ')'
-        getNextToken();
-        if (token != TokenNameLPAREN) {
-          throwSyntaxError("'(' expected after keyword 'empty'");
-        }
-        getNextToken();
-        variable();
-        if (token != TokenNameRPAREN) {
-          throwSyntaxError("')' expected after keyword 'empty'");
-        }
-        getNextToken();
-        break;
-      case TokenNameinclude :
-        //T_INCLUDE expr
-        start = scanner.getCurrentTokenStartPosition();
-        getNextToken();
-        expr();
+    case TokenNameisset:
+      //       T_ISSET '(' isset_variables ')'
+      getNextToken();
+      if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected after keyword 'isset'");
+      }
+      getNextToken();
+      isset_variables();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected after keyword 'isset'");
+      }
+      getNextToken();
+      break;
+    case TokenNameempty:
+      //       T_EMPTY '(' variable ')'
+      getNextToken();
+      if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected after keyword 'empty'");
+      }
+      getNextToken();
+      variable();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected after keyword 'empty'");
+      }
+      getNextToken();
+      break;
+    case TokenNameinclude:
+      //T_INCLUDE expr
+      checkFileName(token, impt);
+      break;
+    case TokenNameinclude_once:
+      //       T_INCLUDE_ONCE expr
+      checkFileName(token, impt);
+      break;
+    case TokenNameeval:
+      //       T_EVAL '(' expr ')'
+      getNextToken();
+      if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected after keyword 'eval'");
+      }
+      getNextToken();
+      expr();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected after keyword 'eval'");
+      }
+      getNextToken();
+      break;
+    case TokenNamerequire:
+      //T_REQUIRE expr
+      checkFileName(token, impt);
+      break;
+    case TokenNamerequire_once:
+      //       T_REQUIRE_ONCE expr
+      checkFileName(token, impt);
+      break;
+    }
+  }
 
-        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
-        impt.declarationSourceEnd = impt.sourceEnd;
-        impt.declarationEnd = impt.declarationSourceEnd;
-        //endPosition is just before the ;
-        impt.declarationSourceStart = start;
-        includesList.add(impt);
-        break;
-      case TokenNameinclude_once :
-        //     T_INCLUDE_ONCE expr
-        start = scanner.getCurrentTokenStartPosition();
-        getNextToken();
-        expr();
-        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
-        impt.declarationSourceEnd = impt.sourceEnd;
-        impt.declarationEnd = impt.declarationSourceEnd;
-        //endPosition is just before the ;
-        impt.declarationSourceStart = start;
-        includesList.add(impt);
-        break;
-      case TokenNameeval :
-        //     T_EVAL '(' expr ')'
+  private void checkFileName(int includeToken, ImportReference impt) {
+    //<include-token> expr
+    int start = scanner.getCurrentTokenStartPosition();
+    boolean hasLPAREN = false;
+    getNextToken();
+    if (token == TokenNameLPAREN) {
+      hasLPAREN = true;
+      getNextToken();
+    }
+    Expression expression = expr();
+    if (hasLPAREN) {
+      if (token == TokenNameRPAREN) {
         getNextToken();
-        if (token != TokenNameLPAREN) {
-          throwSyntaxError("'(' expected after keyword 'eval'");
+      } else {
+        throwSyntaxError("')' expected for keyword '" + scanner.toStringAction(includeToken) + "'");
+      }
+    }
+    impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
+    impt.declarationSourceEnd = impt.sourceEnd;
+    impt.declarationEnd = impt.declarationSourceEnd;
+    //endPosition is just before the ;
+    impt.declarationSourceStart = start;
+    includesList.add(impt);
+
+    if (expression instanceof StringLiteral) {
+      StringLiteral literal = (StringLiteral) expression;
+      char[] includeName = literal.source();
+      if (includeName.length == 0) {
+        reportSyntaxError("Empty filename after keyword '" + scanner.toStringAction(includeToken) + "'", literal.sourceStart,
+            literal.sourceStart + 1);
+      }
+      String includeNameString = new String(includeName);
+      if (literal instanceof StringLiteralDQ) {
+        if (includeNameString.indexOf('$') >= 0) {
+          // assuming that the filename contains a variable => no filename check
+          return;
         }
-        getNextToken();
-        expr();
-        if (token != TokenNameRPAREN) {
-          throwSyntaxError("')' expected after keyword 'eval'");
+      }
+      if (includeNameString.startsWith("http://")) {
+        // assuming external include location
+        return;
+      }
+      if (scanner.compilationUnit != null) {
+        IResource resource = scanner.compilationUnit.getResource();
+        //        java.io.File f = new java.io.File(new String(compilationUnit.getFileName()));
+        //        System.out.println(expression.toStringExpression());
+        //      }
+        if (resource != null && resource instanceof IFile) {
+          // check the filename:
+          //      System.out.println(new String(compilationUnit.getFileName())+" - "+ expression.toStringExpression());
+          IProject project = resource.getProject();
+          if (project != null) {
+            IPath path = PHPFileUtil.determineFilePath(includeNameString, resource, project);
+            
+            if (path == null) {
+              //              reportSyntaxError("File: " + expression.toStringExpression() + " doesn't exist in project: "
+              //                  + project.getLocation().toString(), literal.sourceStart, literal.sourceEnd);
+              String[] args = { expression.toStringExpression(), project.getLocation().toString() };
+              problemReporter.phpIncludeNotExistWarning(args, literal.sourceStart, literal.sourceEnd, referenceContext,
+                  compilationUnit.compilationResult);
+            } else {
+              impt.setFile( PHPFileUtil.createFile(path, project) );
+            }
+          }
         }
-        getNextToken();
-        break;
-      case TokenNamerequire :
-        //T_REQUIRE expr
-        start = scanner.getCurrentTokenStartPosition();
-        getNextToken();
-        expr();
-        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
-        impt.declarationSourceEnd = impt.sourceEnd;
-        impt.declarationEnd = impt.declarationSourceEnd;
-        //endPosition is just before the ;
-        impt.declarationSourceStart = start;
-        includesList.add(impt);
-        break;
-      case TokenNamerequire_once :
-        //     T_REQUIRE_ONCE expr
-        start = scanner.getCurrentTokenStartPosition();
-        getNextToken();
-        expr();
-        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
-        impt.declarationSourceEnd = impt.sourceEnd;
-        impt.declarationEnd = impt.declarationSourceEnd;
-        //endPosition is just before the ;
-        impt.declarationSourceStart = start;
-        includesList.add(impt);
-        break;
+      }
     }
   }
+
   private void isset_variables() {
     // variable
     // | isset_variables ','
@@ -3242,6 +3437,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   private boolean common_scalar() {
     //  common_scalar:
     // T_LNUMBER
@@ -3253,39 +3449,40 @@ public class Parser //extends PHPParserSuperclass
     // | T_METHOD_C
     // | T_FUNC_C
     switch (token) {
-      case TokenNameIntegerLiteral :
-        getNextToken();
-        return true;
-      case TokenNameDoubleLiteral :
-        getNextToken();
-        return true;
-      case TokenNameStringDoubleQuote :
-        getNextToken();
-        return true;
-      case TokenNameStringSingleQuote :
-        getNextToken();
-        return true;
-      case TokenNameStringInterpolated :
-        getNextToken();
-        return true;
-      case TokenNameFILE :
-        getNextToken();
-        return true;
-      case TokenNameLINE :
-        getNextToken();
-        return true;
-      case TokenNameCLASS_C :
-        getNextToken();
-        return true;
-      case TokenNameMETHOD_C :
-        getNextToken();
-        return true;
-      case TokenNameFUNC_C :
-        getNextToken();
-        return true;
+    case TokenNameIntegerLiteral:
+      getNextToken();
+      return true;
+    case TokenNameDoubleLiteral:
+      getNextToken();
+      return true;
+    case TokenNameStringDoubleQuote:
+      getNextToken();
+      return true;
+    case TokenNameStringSingleQuote:
+      getNextToken();
+      return true;
+    case TokenNameStringInterpolated:
+      getNextToken();
+      return true;
+    case TokenNameFILE:
+      getNextToken();
+      return true;
+    case TokenNameLINE:
+      getNextToken();
+      return true;
+    case TokenNameCLASS_C:
+      getNextToken();
+      return true;
+    case TokenNameMETHOD_C:
+      getNextToken();
+      return true;
+    case TokenNameFUNC_C:
+      getNextToken();
+      return true;
     }
     return false;
   }
+
   private void scalar() {
     //  scalar:
     // T_STRING
@@ -3297,6 +3494,7 @@ public class Parser //extends PHPParserSuperclass
     //| T_START_HEREDOC encaps_list T_END_HEREDOC
     throwSyntaxError("Not yet implemented (scalar).");
   }
+
   private void static_scalar() {
     //    static_scalar: /* compile-time evaluated scalars */
     //         common_scalar
@@ -3309,98 +3507,99 @@ public class Parser //extends PHPParserSuperclass
       return;
     }
     switch (token) {
-      case TokenNameIdentifier :
+    case TokenNameIdentifier:
+      getNextToken();
+      //        static_class_constant:
+      //               T_STRING T_PAAMAYIM_NEKUDOTAYIM T_STRING
+      if (token == TokenNamePAAMAYIM_NEKUDOTAYIM) {
         getNextToken();
-        //        static_class_constant:
-        //             T_STRING T_PAAMAYIM_NEKUDOTAYIM T_STRING
-        if (token == TokenNamePAAMAYIM_NEKUDOTAYIM) {
+        if (token == TokenNameIdentifier) {
           getNextToken();
-          if (token == TokenNameIdentifier) {
-            getNextToken();
-          } else {
-            throwSyntaxError("Identifier expected after '::' operator.");
-          }
+        } else {
+          throwSyntaxError("Identifier expected after '::' operator.");
         }
-        break;
-      case TokenNameEncapsedString0 :
-        try {
-          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-          while (scanner.currentCharacter != '`') {
-            if (scanner.currentCharacter == '\\') {
-              scanner.currentPosition++;
-            }
-            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+      }
+      break;
+    case TokenNameEncapsedString0:
+      try {
+        scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+        while (scanner.currentCharacter != '`') {
+          if (scanner.currentCharacter == '\\') {
+            scanner.currentPosition++;
           }
-          getNextToken();
-        } catch (IndexOutOfBoundsException e) {
-          throwSyntaxError("'`' expected at end of static string.");
-        }
-        break;
-      case TokenNameEncapsedString1 :
-        try {
           scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-          while (scanner.currentCharacter != '\'') {
-            if (scanner.currentCharacter == '\\') {
-              scanner.currentPosition++;
-            }
-            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-          }
-          getNextToken();
-        } catch (IndexOutOfBoundsException e) {
-          throwSyntaxError("'\'' expected at end of static string.");
         }
-        break;
-      case TokenNameEncapsedString2 :
-        try {
-          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-          while (scanner.currentCharacter != '"') {
-            if (scanner.currentCharacter == '\\') {
-              scanner.currentPosition++;
-            }
-            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+        getNextToken();
+      } catch (IndexOutOfBoundsException e) {
+        throwSyntaxError("'`' expected at end of static string.");
+      }
+      break;
+    case TokenNameEncapsedString1:
+      try {
+        scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+        while (scanner.currentCharacter != '\'') {
+          if (scanner.currentCharacter == '\\') {
+            scanner.currentPosition++;
           }
-          getNextToken();
-        } catch (IndexOutOfBoundsException e) {
-          throwSyntaxError("'\"' expected at end of static string.");
+          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
         }
-        break;
-      case TokenNamePLUS :
-        getNextToken();
-        static_scalar();
-        break;
-      case TokenNameMINUS :
-        getNextToken();
-        static_scalar();
-        break;
-      case TokenNamearray :
         getNextToken();
-        if (token != TokenNameLPAREN) {
-          throwSyntaxError("'(' expected after keyword 'array'");
+      } catch (IndexOutOfBoundsException e) {
+        throwSyntaxError("'\'' expected at end of static string.");
+      }
+      break;
+    case TokenNameEncapsedString2:
+      try {
+        scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+        while (scanner.currentCharacter != '"') {
+          if (scanner.currentCharacter == '\\') {
+            scanner.currentPosition++;
+          }
+          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
         }
         getNextToken();
-        if (token == TokenNameRPAREN) {
-          getNextToken();
-          break;
-        }
-        non_empty_static_array_pair_list();
-        if (token != TokenNameRPAREN) {
-          throwSyntaxError("')' expected after keyword 'array'");
-        }
+      } catch (IndexOutOfBoundsException e) {
+        throwSyntaxError("'\"' expected at end of static string.");
+      }
+      break;
+    case TokenNamePLUS:
+      getNextToken();
+      static_scalar();
+      break;
+    case TokenNameMINUS:
+      getNextToken();
+      static_scalar();
+      break;
+    case TokenNamearray:
+      getNextToken();
+      if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected after keyword 'array'");
+      }
+      getNextToken();
+      if (token == TokenNameRPAREN) {
         getNextToken();
         break;
-      //      case TokenNamenull :
-      //        getNextToken();
-      //        break;
-      //      case TokenNamefalse :
-      //        getNextToken();
-      //        break;
-      //      case TokenNametrue :
-      //        getNextToken();
-      //        break;
-      default :
-        throwSyntaxError("Static scalar/constant expected.");
+      }
+      non_empty_static_array_pair_list();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected after keyword 'array'");
+      }
+      getNextToken();
+      break;
+    //      case TokenNamenull :
+    //        getNextToken();
+    //        break;
+    //      case TokenNamefalse :
+    //        getNextToken();
+    //        break;
+    //      case TokenNametrue :
+    //        getNextToken();
+    //        break;
+    default:
+      throwSyntaxError("Static scalar/constant expected.");
     }
   }
+
   private void non_empty_static_array_pair_list() {
     //  non_empty_static_array_pair_list:
     // non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW
@@ -3423,6 +3622,7 @@ public class Parser //extends PHPParserSuperclass
       }
     }
   }
+
   public void reportSyntaxError() { //int act, int currentKind, int
     // stateStackTop) {
     /* remember current scanner position */
@@ -3512,7 +3712,7 @@ public class Parser //extends PHPParserSuperclass
     try {
       tokenSource = this.scanner.getCurrentTokenSource();
     } catch (Exception e) {
-      tokenSource = new char[]{};
+      tokenSource = new char[] {};
     }
     //                         problemReporter().parseError(
     //                                 this.scanner.startPosition,
@@ -3527,31 +3727,48 @@ public class Parser //extends PHPParserSuperclass
     scanner.startPosition = startPos;
     scanner.currentPosition = currentPos;
   }
+
   public static final int RoundBracket = 0;
+
   public static final int SquareBracket = 1;
+
   public static final int CurlyBracket = 2;
+
   public static final int BracketKinds = 3;
+
   protected int[] nestedMethod; //the ptr is nestedType
+
   protected int nestedType, dimensions;
+
   //ast stack
   final static int AstStackIncrement = 100;
+
   protected int astPtr;
-  protected AstNode[] astStack = new AstNode[AstStackIncrement];
+
+  protected ASTNode[] astStack = new ASTNode[AstStackIncrement];
+
   protected int astLengthPtr;
+
   protected int[] astLengthStack;
-  AstNode[] noAstNodes = new AstNode[AstStackIncrement];
+
+  ASTNode[] noAstNodes = new ASTNode[AstStackIncrement];
+
   public CompilationUnitDeclaration compilationUnit; /*
                                                       * the result from parse()
                                                       */
+
   protected ReferenceContext referenceContext;
+
   protected ProblemReporter problemReporter;
+
   protected CompilerOptions options;
+
   private ArrayList includesList;
+
   //  protected CompilationResult compilationResult;
   /**
-   * Returns this parser's problem reporter initialized with its reference
-   * context. Also it is assumed that a problem is going to be reported, so
-   * initializes the compilation result's line positions.
+   * Returns this parser's problem reporter initialized with its reference context. Also it is assumed that a problem is going to be
+   * reported, so initializes the compilation result's line positions.
    */
   public ProblemReporter problemReporter() {
     if (scanner.recordLineSeparator) {
@@ -3560,6 +3777,7 @@ public class Parser //extends PHPParserSuperclass
     problemReporter.referenceContext = referenceContext;
     return problemReporter;
   }
+
   /*
    * Reconsider the entire source looking for inconsistencies in {} () []
    */
@@ -3568,13 +3786,13 @@ public class Parser //extends PHPParserSuperclass
     boolean anomaliesDetected = false;
     try {
       char[] source = scanner.source;
-      int[] leftCount = {0, 0, 0};
-      int[] rightCount = {0, 0, 0};
-      int[] depths = {0, 0, 0};
-      int[][] leftPositions = new int[][]{new int[10], new int[10], new int[10]};
-      int[][] leftDepths = new int[][]{new int[10], new int[10], new int[10]};
-      int[][] rightPositions = new int[][]{new int[10], new int[10], new int[10]};
-      int[][] rightDepths = new int[][]{new int[10], new int[10], new int[10]};
+      int[] leftCount = { 0, 0, 0 };
+      int[] rightCount = { 0, 0, 0 };
+      int[] depths = { 0, 0, 0 };
+      int[][] leftPositions = new int[][] { new int[10], new int[10], new int[10] };
+      int[][] leftDepths = new int[][] { new int[10], new int[10], new int[10] };
+      int[][] rightPositions = new int[][] { new int[10], new int[10], new int[10] };
+      int[][] rightDepths = new int[][] { new int[10], new int[10], new int[10] };
       scanner.currentPosition = scanner.initialPosition; //starting
       // point
       // (first-zero-based
@@ -3606,131 +3824,156 @@ public class Parser //extends PHPParserSuperclass
           } while (isWhiteSpace && (scanner.currentPosition < scanner.eofPosition));
           // -------consume token until } is found---------
           switch (scanner.currentCharacter) {
-            case '{' : {
-              int index = leftCount[CurlyBracket]++;
-              if (index == leftPositions[CurlyBracket].length) {
-                System.arraycopy(leftPositions[CurlyBracket], 0, (leftPositions[CurlyBracket] = new int[index * 2]), 0, index);
-                System.arraycopy(leftDepths[CurlyBracket], 0, (leftDepths[CurlyBracket] = new int[index * 2]), 0, index);
-              }
-              leftPositions[CurlyBracket][index] = scanner.startPosition;
-              leftDepths[CurlyBracket][index] = depths[CurlyBracket]++;
+          case '{': {
+            int index = leftCount[CurlyBracket]++;
+            if (index == leftPositions[CurlyBracket].length) {
+              System.arraycopy(leftPositions[CurlyBracket], 0, (leftPositions[CurlyBracket] = new int[index * 2]), 0, index);
+              System.arraycopy(leftDepths[CurlyBracket], 0, (leftDepths[CurlyBracket] = new int[index * 2]), 0, index);
             }
-              break;
-            case '}' : {
-              int index = rightCount[CurlyBracket]++;
-              if (index == rightPositions[CurlyBracket].length) {
-                System.arraycopy(rightPositions[CurlyBracket], 0, (rightPositions[CurlyBracket] = new int[index * 2]), 0, index);
-                System.arraycopy(rightDepths[CurlyBracket], 0, (rightDepths[CurlyBracket] = new int[index * 2]), 0, index);
-              }
-              rightPositions[CurlyBracket][index] = scanner.startPosition;
-              rightDepths[CurlyBracket][index] = --depths[CurlyBracket];
+            leftPositions[CurlyBracket][index] = scanner.startPosition;
+            leftDepths[CurlyBracket][index] = depths[CurlyBracket]++;
+          }
+            break;
+          case '}': {
+            int index = rightCount[CurlyBracket]++;
+            if (index == rightPositions[CurlyBracket].length) {
+              System.arraycopy(rightPositions[CurlyBracket], 0, (rightPositions[CurlyBracket] = new int[index * 2]), 0, index);
+              System.arraycopy(rightDepths[CurlyBracket], 0, (rightDepths[CurlyBracket] = new int[index * 2]), 0, index);
             }
-              break;
-            case '(' : {
-              int index = leftCount[RoundBracket]++;
-              if (index == leftPositions[RoundBracket].length) {
-                System.arraycopy(leftPositions[RoundBracket], 0, (leftPositions[RoundBracket] = new int[index * 2]), 0, index);
-                System.arraycopy(leftDepths[RoundBracket], 0, (leftDepths[RoundBracket] = new int[index * 2]), 0, index);
-              }
-              leftPositions[RoundBracket][index] = scanner.startPosition;
-              leftDepths[RoundBracket][index] = depths[RoundBracket]++;
+            rightPositions[CurlyBracket][index] = scanner.startPosition;
+            rightDepths[CurlyBracket][index] = --depths[CurlyBracket];
+          }
+            break;
+          case '(': {
+            int index = leftCount[RoundBracket]++;
+            if (index == leftPositions[RoundBracket].length) {
+              System.arraycopy(leftPositions[RoundBracket], 0, (leftPositions[RoundBracket] = new int[index * 2]), 0, index);
+              System.arraycopy(leftDepths[RoundBracket], 0, (leftDepths[RoundBracket] = new int[index * 2]), 0, index);
             }
-              break;
-            case ')' : {
-              int index = rightCount[RoundBracket]++;
-              if (index == rightPositions[RoundBracket].length) {
-                System.arraycopy(rightPositions[RoundBracket], 0, (rightPositions[RoundBracket] = new int[index * 2]), 0, index);
-                System.arraycopy(rightDepths[RoundBracket], 0, (rightDepths[RoundBracket] = new int[index * 2]), 0, index);
-              }
-              rightPositions[RoundBracket][index] = scanner.startPosition;
-              rightDepths[RoundBracket][index] = --depths[RoundBracket];
+            leftPositions[RoundBracket][index] = scanner.startPosition;
+            leftDepths[RoundBracket][index] = depths[RoundBracket]++;
+          }
+            break;
+          case ')': {
+            int index = rightCount[RoundBracket]++;
+            if (index == rightPositions[RoundBracket].length) {
+              System.arraycopy(rightPositions[RoundBracket], 0, (rightPositions[RoundBracket] = new int[index * 2]), 0, index);
+              System.arraycopy(rightDepths[RoundBracket], 0, (rightDepths[RoundBracket] = new int[index * 2]), 0, index);
             }
-              break;
-            case '[' : {
-              int index = leftCount[SquareBracket]++;
-              if (index == leftPositions[SquareBracket].length) {
-                System.arraycopy(leftPositions[SquareBracket], 0, (leftPositions[SquareBracket] = new int[index * 2]), 0, index);
-                System.arraycopy(leftDepths[SquareBracket], 0, (leftDepths[SquareBracket] = new int[index * 2]), 0, index);
-              }
-              leftPositions[SquareBracket][index] = scanner.startPosition;
-              leftDepths[SquareBracket][index] = depths[SquareBracket]++;
+            rightPositions[RoundBracket][index] = scanner.startPosition;
+            rightDepths[RoundBracket][index] = --depths[RoundBracket];
+          }
+            break;
+          case '[': {
+            int index = leftCount[SquareBracket]++;
+            if (index == leftPositions[SquareBracket].length) {
+              System.arraycopy(leftPositions[SquareBracket], 0, (leftPositions[SquareBracket] = new int[index * 2]), 0, index);
+              System.arraycopy(leftDepths[SquareBracket], 0, (leftDepths[SquareBracket] = new int[index * 2]), 0, index);
             }
-              break;
-            case ']' : {
-              int index = rightCount[SquareBracket]++;
-              if (index == rightPositions[SquareBracket].length) {
-                System.arraycopy(rightPositions[SquareBracket], 0, (rightPositions[SquareBracket] = new int[index * 2]), 0, index);
-                System.arraycopy(rightDepths[SquareBracket], 0, (rightDepths[SquareBracket] = new int[index * 2]), 0, index);
+            leftPositions[SquareBracket][index] = scanner.startPosition;
+            leftDepths[SquareBracket][index] = depths[SquareBracket]++;
+          }
+            break;
+          case ']': {
+            int index = rightCount[SquareBracket]++;
+            if (index == rightPositions[SquareBracket].length) {
+              System.arraycopy(rightPositions[SquareBracket], 0, (rightPositions[SquareBracket] = new int[index * 2]), 0, index);
+              System.arraycopy(rightDepths[SquareBracket], 0, (rightDepths[SquareBracket] = new int[index * 2]), 0, index);
+            }
+            rightPositions[SquareBracket][index] = scanner.startPosition;
+            rightDepths[SquareBracket][index] = --depths[SquareBracket];
+          }
+            break;
+          case '\'': {
+            if (scanner.getNextChar('\\')) {
+              scanner.scanEscapeCharacter();
+            } else { // consume next character
+              scanner.unicodeAsBackSlash = false;
+              //                                                                       if (((scanner.currentCharacter =
+              // source[scanner.currentPosition++]) ==
+              // '\\') &&
+              // (source[scanner.currentPosition] ==
+              // 'u')) {
+              //                                                                               scanner.getNextUnicodeChar();
+              //                                                                       } else {
+              if (scanner.withoutUnicodePtr != 0) {
+                scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
               }
-              rightPositions[SquareBracket][index] = scanner.startPosition;
-              rightDepths[SquareBracket][index] = --depths[SquareBracket];
+              //                                                                       }
             }
-              break;
-            case '\'' : {
-              if (scanner.getNextChar('\\')) {
+            scanner.getNextChar('\'');
+            break;
+          }
+          case '"':
+            // consume next character
+            scanner.unicodeAsBackSlash = false;
+            //                                                 if (((scanner.currentCharacter =
+            // source[scanner.currentPosition++]) == '\\') &&
+            // (source[scanner.currentPosition] == 'u')) {
+            //                                                         scanner.getNextUnicodeChar();
+            //                                                 } else {
+            if (scanner.withoutUnicodePtr != 0) {
+              scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+            }
+            //                                                 }
+            while (scanner.currentCharacter != '"') {
+              if (scanner.currentCharacter == '\r') {
+                if (source[scanner.currentPosition] == '\n')
+                  scanner.currentPosition++;
+                break; // the string cannot go further that
+                // the line
+              }
+              if (scanner.currentCharacter == '\n') {
+                break; // the string cannot go further that
+                // the line
+              }
+              if (scanner.currentCharacter == '\\') {
                 scanner.scanEscapeCharacter();
-              } else { // consume next character
-                scanner.unicodeAsBackSlash = false;
-                //                                                                     if (((scanner.currentCharacter =
-                // source[scanner.currentPosition++]) ==
-                // '\\') &&
-                // (source[scanner.currentPosition] ==
-                // 'u')) {
-                //                                                                             scanner.getNextUnicodeChar();
-                //                                                                     } else {
-                if (scanner.withoutUnicodePtr != 0) {
-                  scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
-                }
-                //                                                                     }
               }
-              scanner.getNextChar('\'');
-              break;
-            }
-            case '"' :
               // consume next character
               scanner.unicodeAsBackSlash = false;
-              //                                                       if (((scanner.currentCharacter =
-              // source[scanner.currentPosition++]) == '\\') &&
-              // (source[scanner.currentPosition] == 'u')) {
-              //                                                               scanner.getNextUnicodeChar();
-              //                                                       } else {
+              //                                                               if (((scanner.currentCharacter =
+              // source[scanner.currentPosition++]) == '\\')
+              // && (source[scanner.currentPosition] == 'u'))
+              // {
+              //                                                                       scanner.getNextUnicodeChar();
+              //                                                               } else {
               if (scanner.withoutUnicodePtr != 0) {
                 scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
               }
-              //                                                       }
-              while (scanner.currentCharacter != '"') {
-                if (scanner.currentCharacter == '\r') {
-                  if (source[scanner.currentPosition] == '\n')
-                    scanner.currentPosition++;
-                  break; // the string cannot go further that
-                  // the line
-                }
-                if (scanner.currentCharacter == '\n') {
-                  break; // the string cannot go further that
-                  // the line
-                }
-                if (scanner.currentCharacter == '\\') {
-                  scanner.scanEscapeCharacter();
+              //                                                               }
+            }
+            break;
+          case '/': {
+            int test;
+            if ((test = scanner.getNextChar('/', '*')) == 0) { //line
+              // comment
+              //get the next char
+              if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
+                  && (source[scanner.currentPosition] == 'u')) {
+                //-------------unicode traitement
+                // ------------
+                int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                scanner.currentPosition++;
+                while (source[scanner.currentPosition] == 'u') {
+                  scanner.currentPosition++;
                 }
-                // consume next character
-                scanner.unicodeAsBackSlash = false;
-                //                                                             if (((scanner.currentCharacter =
-                // source[scanner.currentPosition++]) == '\\')
-                // && (source[scanner.currentPosition] == 'u'))
-                // {
-                //                                                                     scanner.getNextUnicodeChar();
-                //                                                             } else {
-                if (scanner.withoutUnicodePtr != 0) {
-                  scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+                if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                    || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                    || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                    || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                  // don't
+                  // care of the
+                  // value
+                  scanner.currentCharacter = 'A';
+                } //something different from \n and \r
+                else {
+                  scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                 }
-                //                                                             }
               }
-              break;
-            case '/' : {
-              int test;
-              if ((test = scanner.getNextChar('/', '*')) == 0) { //line
-                // comment
+              while (scanner.currentCharacter != '\r' && scanner.currentCharacter != '\n') {
                 //get the next char
+                scanner.startPosition = scanner.currentPosition;
                 if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
                     && (source[scanner.currentPosition] == 'u')) {
                   //-------------unicode traitement
@@ -3744,75 +3987,76 @@ public class Parser //extends PHPParserSuperclass
                       || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
                       || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
                       || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
-                                                                                                               // don't
+                    // don't
                     // care of the
                     // value
                     scanner.currentCharacter = 'A';
-                  } //something different from \n and \r
+                  } //something different from \n
+                  // and \r
                   else {
                     scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                   }
                 }
-                while (scanner.currentCharacter != '\r' && scanner.currentCharacter != '\n') {
-                  //get the next char
-                  scanner.startPosition = scanner.currentPosition;
-                  if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
-                      && (source[scanner.currentPosition] == 'u')) {
-                    //-------------unicode traitement
-                    // ------------
-                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                    scanner.currentPosition++;
-                    while (source[scanner.currentPosition] == 'u') {
-                      scanner.currentPosition++;
-                    }
-                    if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
-                        || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
-                        || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
-                        || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
-                                                                                                                 // don't
-                      // care of the
-                      // value
-                      scanner.currentCharacter = 'A';
-                    } //something different from \n
-                    // and \r
-                    else {
-                      scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-                    }
-                  }
-                }
-                if (scanner.recordLineSeparator && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
-                  if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
-                    // only record line positions we
-                    // have not recorded yet
-                    scanner.pushLineSeparator();
-                    if (this.scanner.taskTags != null) {
-                      this.scanner.checkTaskTag(this.scanner.getCurrentTokenStartPosition(), this.scanner
-                          .getCurrentTokenEndPosition());
-                    }
+              }
+              if (scanner.recordLineSeparator && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
+                if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
+                  // only record line positions we
+                  // have not recorded yet
+                  scanner.pushLineSeparator();
+                  if (this.scanner.taskTags != null) {
+                    this.scanner.checkTaskTag(this.scanner.getCurrentTokenStartPosition(), this.scanner
+                        .getCurrentTokenEndPosition());
                   }
                 }
-                break;
               }
-              if (test > 0) { //traditional and annotation
-                // comment
-                boolean star = false;
-                // consume next character
-                scanner.unicodeAsBackSlash = false;
-                //                                                                     if (((scanner.currentCharacter =
-                // source[scanner.currentPosition++]) ==
-                // '\\') &&
-                // (source[scanner.currentPosition] ==
-                // 'u')) {
-                //                                                                             scanner.getNextUnicodeChar();
-                //                                                                     } else {
-                if (scanner.withoutUnicodePtr != 0) {
-                  scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+              break;
+            }
+            if (test > 0) { //traditional and annotation
+              // comment
+              boolean star = false;
+              // consume next character
+              scanner.unicodeAsBackSlash = false;
+              //                                                                       if (((scanner.currentCharacter =
+              // source[scanner.currentPosition++]) ==
+              // '\\') &&
+              // (source[scanner.currentPosition] ==
+              // 'u')) {
+              //                                                                               scanner.getNextUnicodeChar();
+              //                                                                       } else {
+              if (scanner.withoutUnicodePtr != 0) {
+                scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+              }
+              //                                                                       }
+              if (scanner.currentCharacter == '*') {
+                star = true;
+              }
+              //get the next char
+              if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
+                  && (source[scanner.currentPosition] == 'u')) {
+                //-------------unicode traitement
+                // ------------
+                int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                scanner.currentPosition++;
+                while (source[scanner.currentPosition] == 'u') {
+                  scanner.currentPosition++;
                 }
-                //                                                                     }
-                if (scanner.currentCharacter == '*') {
-                  star = true;
+                if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                    || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                    || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                    || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                  // don't
+                  // care of the
+                  // value
+                  scanner.currentCharacter = 'A';
+                } //something different from * and /
+                else {
+                  scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                 }
-                //get the next char
+              }
+              //loop until end of comment */
+              while ((scanner.currentCharacter != '/') || (!star)) {
+                star = scanner.currentCharacter == '*';
+                //get next char
                 if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
                     && (source[scanner.currentPosition] == 'u')) {
                   //-------------unicode traitement
@@ -3826,59 +4070,33 @@ public class Parser //extends PHPParserSuperclass
                       || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
                       || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
                       || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
-                                                                                                               // don't
+                    // don't
                     // care of the
                     // value
                     scanner.currentCharacter = 'A';
-                  } //something different from * and /
+                  } //something different from * and
+                  // /
                   else {
                     scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                   }
                 }
-                //loop until end of comment */
-                while ((scanner.currentCharacter != '/') || (!star)) {
-                  star = scanner.currentCharacter == '*';
-                  //get next char
-                  if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
-                      && (source[scanner.currentPosition] == 'u')) {
-                    //-------------unicode traitement
-                    // ------------
-                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                    scanner.currentPosition++;
-                    while (source[scanner.currentPosition] == 'u') {
-                      scanner.currentPosition++;
-                    }
-                    if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
-                        || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
-                        || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
-                        || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
-                                                                                                                 // don't
-                      // care of the
-                      // value
-                      scanner.currentCharacter = 'A';
-                    } //something different from * and
-                    // /
-                    else {
-                      scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-                    }
-                  }
-                }
-                if (this.scanner.taskTags != null) {
-                  this.scanner.checkTaskTag(this.scanner.getCurrentTokenStartPosition(), this.scanner.getCurrentTokenEndPosition());
-                }
-                break;
+              }
+              if (this.scanner.taskTags != null) {
+                this.scanner.checkTaskTag(this.scanner.getCurrentTokenStartPosition(), this.scanner.getCurrentTokenEndPosition());
               }
               break;
             }
-            default :
-              if (Scanner.isPHPIdentifierStart(scanner.currentCharacter)) {
-                scanner.scanIdentifierOrKeyword(false);
-                break;
-              }
-              if (Character.isDigit(scanner.currentCharacter)) {
-                scanner.scanNumber(false);
-                break;
-              }
+            break;
+          }
+          default:
+            if (Scanner.isPHPIdentifierStart(scanner.currentCharacter)) {
+              scanner.scanIdentifierOrKeyword(false);
+              break;
+            }
+            if (Character.isDigit(scanner.currentCharacter)) {
+              scanner.scanNumber(false);
+              break;
+            }
           }
           //-----------------end switch while
           // try--------------------
@@ -3955,6 +4173,7 @@ public class Parser //extends PHPParserSuperclass
       return anomaliesDetected;
     }
   }
+
   protected void pushOnAstLengthStack(int pos) {
     try {
       astLengthStack[++astLengthPtr] = pos;
@@ -3966,7 +4185,8 @@ public class Parser //extends PHPParserSuperclass
       astLengthStack[astLengthPtr] = pos;
     }
   }
-  protected void pushOnAstStack(AstNode node) {
+
+  protected void pushOnAstStack(ASTNode node) {
     /*
      * add a new obj on top of the ast stack
      */
@@ -3974,8 +4194,8 @@ public class Parser //extends PHPParserSuperclass
       astStack[++astPtr] = node;
     } catch (IndexOutOfBoundsException e) {
       int oldStackLength = astStack.length;
-      AstNode[] oldStack = astStack;
-      astStack = new AstNode[oldStackLength + AstStackIncrement];
+      ASTNode[] oldStack = astStack;
+      astStack = new ASTNode[oldStackLength + AstStackIncrement];
       System.arraycopy(oldStack, 0, astStack, 0, oldStackLength);
       astPtr = oldStackLength;
       astStack[astPtr] = node;