Organized imports
[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / parser / Parser.java
index c81e972..50dc61f 100644 (file)
@@ -1,13 +1,15 @@
 /***********************************************************************************************************************************
- * 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
+ * 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 java.util.HashMap;
+import java.util.HashSet;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
@@ -19,35 +21,54 @@ 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.BinaryExpression;
+import net.sourceforge.phpeclipse.internal.compiler.ast.Block;
+import net.sourceforge.phpeclipse.internal.compiler.ast.BreakStatement;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.ConditionalExpression;
+import net.sourceforge.phpeclipse.internal.compiler.ast.ContinueStatement;
+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.FieldReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.IfStatement;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpeclipse.internal.compiler.ast.InstanceOfExpression;
 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.OperatorIds;
+import net.sourceforge.phpeclipse.internal.compiler.ast.ReturnStatement;
 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 net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
+import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
 
 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
+public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicInformation {
   protected final static int StackIncrement = 255;
 
   protected int stateStackTop;
 
-  protected int[] stack = new int[StackIncrement];
+  //  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;
+  //  protected RecoveredElement currentElement;
 
   public static boolean VERBOSE_RECOVERY = false;
 
@@ -58,11 +79,11 @@ public class Parser //extends PHPParserSuperclass
   //scanner token
   public Scanner scanner;
 
-  private ArrayList phpList;
+  //  private ArrayList phpList;
 
-  private int currentPHPString;
+  //  private int currentPHPString;
 
-  private boolean phpEnd;
+  //  private boolean phpEnd;
 
   // private static HashMap keywordMap = null;
   private String str;
@@ -80,11 +101,11 @@ public class Parser //extends PHPParserSuperclass
   //
   //   // current identifier
   //   String identifier;
-  Long longNumber;
+  //  Long longNumber;
 
-  Double doubleNumber;
+  //  Double doubleNumber;
 
-  private String stringValue;
+  //  private String stringValue;
 
   /** Contains the current expression. */
   // private StringBuffer expression;
@@ -93,33 +114,31 @@ public class Parser //extends PHPParserSuperclass
 
   protected int modifiersSourceStart;
 
-  //  protected IdentifierIndexManager indexManager;
-
   protected Parser(ProblemReporter problemReporter) {
     this.problemReporter = problemReporter;
     this.options = problemReporter.options;
-    this.currentPHPString = 0;
+    //    this.currentPHPString = 0;
     //         PHPParserSuperclass.fileToParse = fileToParse;
-    this.phpList = null;
+    //    this.phpList = null;
     //    this.indexManager = null;
     this.str = "";
     this.token = TokenNameEOF;
     //    this.chIndx = 0;
     //    this.rowCount = 1;
     //    this.columnCount = 0;
-    this.phpEnd = false;
+    //    this.phpEnd = false;
     //   getNextToken();
     this.initializeScanner();
   }
 
   public void setFileToParse(IFile fileToParse) {
-    this.currentPHPString = 0;
+    //    this.currentPHPString = 0;
     //    PHPParserSuperclass.fileToParse = fileToParse;
-    this.phpList = null;
+    //    this.phpList = null;
     //    this.indexManager = null;
     this.str = "";
     this.token = TokenNameEOF;
-    this.phpEnd = false;
+    //    this.phpEnd = false;
     this.initializeScanner();
   }
 
@@ -138,16 +157,16 @@ public class Parser //extends PHPParserSuperclass
     //        keywordMap.put(PHP_KEYWORS[i], new Integer(PHP_KEYWORD_TOKEN[i]));
     //      }
     //    }
-    this.currentPHPString = 0;
+    //    this.currentPHPString = 0;
     //    PHPParserSuperclass.fileToParse = fileToParse;
-    this.phpList = null;
+    //    this.phpList = null;
     this.includesList = null;
     this.str = "";
     this.token = TokenNameEOF;
     //    this.chIndx = 0;
     //    this.rowCount = 1;
     //    this.columnCount = 0;
-    this.phpEnd = false;
+    //    this.phpEnd = false;
     //   getNextToken();
     this.initializeScanner();
   }
@@ -155,7 +174,7 @@ public class Parser //extends PHPParserSuperclass
   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 */);
   }
 
   /**
@@ -191,39 +210,34 @@ 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,
-        compilationUnit.compilationResult);
+    if (referenceContext != null) {
+      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,
-        compilationUnit.compilationResult);
+    if (referenceContext != null) {
+      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,
-        compilationUnit.compilationResult);
+    if (referenceContext != null) {
+      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
    */
   private void getNextToken() {
@@ -251,14 +265,16 @@ public class Parser //extends PHPParserSuperclass
   public void init(String s) {
     this.str = s;
     this.token = TokenNameEOF;
+    this.includesList = new ArrayList();
     //    this.chIndx = 0;
     //    this.rowCount = 1;
     //    this.columnCount = 0;
-    this.phpEnd = false;
+    //    this.phpEnd = false;
     //    this.phpMode = false;
     /* scanner initialization */
     scanner.setSource(s.toCharArray());
     scanner.setPHPMode(false);
+    astPtr = 0;
   }
 
   protected void initialize(boolean phpMode) {
@@ -268,22 +284,32 @@ public class Parser //extends PHPParserSuperclass
   protected void initialize(boolean phpMode, IdentifierIndexManager indexManager) {
     compilationUnit = null;
     referenceContext = null;
-    includesList = new ArrayList();
+    this.includesList = new ArrayList();
     //    this.indexManager = indexManager;
     this.str = "";
     this.token = TokenNameEOF;
     //    this.chIndx = 0;
     //    this.rowCount = 1;
     //    this.columnCount = 0;
-    this.phpEnd = false;
+    //    this.phpEnd = false;
     //    this.phpMode = phpMode;
     scanner.setPHPMode(phpMode);
+    astPtr = 0;
   }
 
   /**
    * Parses a string with php tags i.e. '<body> <?php phpinfo() ?> </body>'
    */
   public void parse(String s) {
+    parse(s, null);
+  }
+
+  /**
+   * Parses a string with php tags i.e. '<body> <?php phpinfo() ?> </body>'
+   */
+  public void parse(String s, HashMap variables) {
+    fMethodVariables = variables;
+    fStackUnassigned = new ArrayList();
     init(s);
     parse();
   }
@@ -292,6 +318,13 @@ public class Parser //extends PHPParserSuperclass
    * Parses a string with php tags i.e. '<body> <?php phpinfo() ?> </body>'
    */
   protected void parse() {
+    if (scanner.compilationUnit != null) {
+      IResource resource = scanner.compilationUnit.getResource();
+      if (resource != null && resource instanceof IFile) {
+        // set the package name
+        consumePackageDeclarationName((IFile) resource);
+      }
+    }
     getNextToken();
     do {
       try {
@@ -324,58 +357,96 @@ public class Parser //extends PHPParserSuperclass
         }
         break;
       } catch (SyntaxError sytaxErr1) {
-        // setMarker(sytaxErr1.getMessage(), sytaxErr1.getLine(),
-        // ERROR);
-        //        setMarker(sytaxErr1.getMessage(),
-        // scanner.getCurrentTokenStartPosition(),
-        // scanner.getCurrentTokenEndPosition(), ERROR);
-        try {
-          // if an error occured,
-          // try to find keywords 'class' or 'function'
-          // to parse the rest of the string
-          while (token != TokenNameEOF && token != TokenNameERROR) {
-            if (token == TokenNameabstract || token == TokenNamefinal || token == TokenNameclass || token == TokenNamefunction) {
-              break;
-            }
-            getNextToken();
-          }
-          if (token == TokenNameEOF || token == TokenNameERROR) {
-            break;
-          }
-        } catch (SyntaxError sytaxErr2) {
-          //    setMarker(sytaxErr2.getMessage(), sytaxErr2.getLine(),
-          // ERROR);
-          //          setMarker(sytaxErr2.getMessage(),
-          // scanner.getCurrentTokenStartPosition(),
-          // scanner.getCurrentTokenEndPosition(), ERROR);
-          break;
-        }
+        break;
+        //        // if an error occured,
+        //        // try to find keywords 'abstract' 'final' 'class' or 'function'
+        //        // to parse the rest of the string
+        //        boolean tokenize = scanner.tokenizeStrings;
+        //        if (!tokenize) {
+        //          scanner.tokenizeStrings = true;
+        //        }
+        //        try {
+        //          while (token != TokenNameEOF) {
+        //            if (token == TokenNameabstract || token == TokenNamefinal || token == TokenNameclass || token == TokenNamefunction) {
+        //              break;
+        //            }
+        //            getNextToken();
+        //          }
+        //          if (token == TokenNameEOF) {
+        //            break;
+        //          }
+        //        } catch (SyntaxError sytaxErr2) {
+        //          break;
+        //        } finally {
+        //          scanner.tokenizeStrings = tokenize;
+        //        }
       }
     } while (true);
 
     endParse(0);
   }
 
+  /**
+   * Parses a string with php tags i.e. '<body> <?php phpinfo() ?> </body>'
+   */
+  public void parseFunction(String s, HashMap variables) {
+    init(s);
+    scanner.phpMode = true;
+    parseFunction(variables);
+  }
+
+  /**
+   * Parses a string with php tags i.e. '<body> <?php phpinfo() ?> </body>'
+   */
+  protected void parseFunction(HashMap variables) {
+    getNextToken();
+    boolean hasModifiers = member_modifiers();
+    if (token == TokenNamefunction) {
+      if (!hasModifiers) {
+        checkAndSetModifiers(AccPublic);
+      }
+      this.fMethodVariables = variables;
+
+      MethodDeclaration methodDecl = new MethodDeclaration(null);
+      methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
+      methodDecl.modifiers = this.modifiers;
+      methodDecl.type = MethodDeclaration.METHOD_DEFINITION;
+      try {
+        getNextToken();
+        functionDefinition(methodDecl);
+      } catch (SyntaxError sytaxErr1) {
+        return;
+      } finally {
+        int sourceEnd = methodDecl.sourceEnd;
+        if (sourceEnd <= 0 || methodDecl.declarationSourceStart > sourceEnd) {
+          sourceEnd = methodDecl.declarationSourceStart + 1;
+        }
+        methodDecl.sourceEnd = sourceEnd;
+        methodDecl.declarationSourceEnd = sourceEnd;
+      }
+    }
+  }
+
   protected CompilationUnitDeclaration endParse(int act) {
 
     this.lastAct = act;
 
-    if (currentElement != null) {
-      currentElement.topElement().updateParseTree();
-      if (VERBOSE_RECOVERY) {
-        System.out.print(Util.bind("parser.syntaxRecovery")); //$NON-NLS-1$
-        System.out.println("--------------------------"); //$NON-NLS-1$
-        System.out.println(compilationUnit);
-        System.out.println("----------------------------------"); //$NON-NLS-1$
-      }
-    } else {
-      if (diet & VERBOSE_RECOVERY) {
-        System.out.print(Util.bind("parser.regularParse")); //$NON-NLS-1$
-        System.out.println("--------------------------"); //$NON-NLS-1$
-        System.out.println(compilationUnit);
-        System.out.println("----------------------------------"); //$NON-NLS-1$
-      }
+    //    if (currentElement != null) {
+    //      currentElement.topElement().updateParseTree();
+    //      if (VERBOSE_RECOVERY) {
+    //        System.out.print(Util.bind("parser.syntaxRecovery")); //$NON-NLS-1$
+    //        System.out.println("--------------------------"); //$NON-NLS-1$
+    //        System.out.println(compilationUnit);
+    //        System.out.println("----------------------------------"); //$NON-NLS-1$
+    //      }
+    //    } else {
+    if (diet & VERBOSE_RECOVERY) {
+      System.out.print(Util.bind("parser.regularParse")); //$NON-NLS-1$
+      System.out.println("--------------------------"); //$NON-NLS-1$
+      System.out.println(compilationUnit);
+      System.out.println("----------------------------------"); //$NON-NLS-1$
     }
+    //    }
     if (scanner.recordLineSeparator) {
       compilationUnit.compilationResult.lineSeparatorPositions = scanner.getLineEnds();
     }
@@ -393,230 +464,119 @@ public class Parser //extends PHPParserSuperclass
     return compilationUnit;
   }
 
-  //  public PHPOutlineInfo parseInfo(Object parent, String s) {
-  //    PHPOutlineInfo outlineInfo = new PHPOutlineInfo(parent);
-  //    // Stack stack = new Stack();
-  //    // stack.push(outlineInfo.getDeclarations());
-  //    this.str = s;
-  //    this.token = TokenNameEOF;
-  //    // this.chIndx = 0;
-  //    // this.rowCount = 1;
-  //    // this.columnCount = 0;
-  //    this.phpEnd = false;
-  //    this.phpMode = false;
-  //    scanner.setSource(s.toCharArray());
-  //    scanner.setPHPMode(false);
-  //    
-  //    getNextToken();
-  //    parseDeclarations(outlineInfo, outlineInfo.getDeclarations(), false);
-  //    
-  //    return outlineInfo;
-  //  }
-  private boolean isVariable() {
-    return token == TokenNameVariable; //  || token == TokenNamethis;
-  }
-
-  //  private void parseDeclarations(PHPOutlineInfo outlineInfo,
-  //      OutlineableWithChildren current, boolean goBack) {
-  //    char[] ident;
-  //    // PHPClassDeclaration current = (PHPClassDeclaration) stack.peek();
-  //    PHPSegmentWithChildren temp;
-  //    int counter = 0;
-  //    IPreferenceStore store =
-  // PHPeclipsePlugin.getDefault().getPreferenceStore();
-  //    try {
-  //      while (token != TokenNameEOF && token != TokenNameERROR) {
-  //        if (token == TokenNameVariable) {
-  //          ident = scanner.getCurrentIdentifierSource();
-  //          outlineInfo.addVariable(new String(ident));
-  //          getNextToken();
-  //        } else if (token == TokenNamevar) {
-  //          getNextToken();
-  //          if (token == TokenNameVariable
-  //              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_VAR)) {
-  //            ident = scanner.getCurrentIdentifierSource();
-  //            //substring(1) added because PHPVarDeclaration doesn't
-  //            // need the $ anymore
-  //            String variableName = new String(ident).substring(1);
-  //            outlineInfo.addVariable(variableName);
-  //            getNextToken();
-  //            if (token != TokenNameSEMICOLON) {
-  //              getNextToken();
-  //              ident = scanner.getCurrentTokenSource();
-  //              if (token > TokenNameKEYWORD) {
-  //                current.add(new PHPVarDeclaration(current, variableName,
-  //                // chIndx - ident.length,
-  //                    scanner.getCurrentTokenStartPosition(), new String(ident)));
-  //              } else {
-  //                switch (token) {
-  //                  case TokenNameVariable :
-  //                  case TokenNamethis :
-  //                    current.add(new PHPVarDeclaration(current, variableName,
-  //                    // chIndx -
-  //                        // ident.length,
-  //                        scanner.getCurrentTokenStartPosition(), new String(
-  //                            ident)));
-  //                    break;
-  //                  case TokenNameIdentifier :
-  //                    current.add(new PHPVarDeclaration(current, variableName,
-  //                    // chIndx -
-  //                        // ident.length,
-  //                        scanner.getCurrentTokenStartPosition(), new String(
-  //                            ident)));
-  //                    break;
-  //                  case TokenNameDoubleLiteral :
-  //                    current.add(new PHPVarDeclaration(current, variableName
-  //                        + doubleNumber,
-  //                    // chIndx -
-  //                        // ident.length,
-  //                        scanner.getCurrentTokenStartPosition(), new String(
-  //                            ident)));
-  //                    break;
-  //                  case TokenNameIntegerLiteral :
-  //                    current.add(new PHPVarDeclaration(current, variableName,
-  //                    // chIndx -
-  //                        // ident.length,
-  //                        scanner.getCurrentTokenStartPosition(), new String(
-  //                            ident)));
-  //                    break;
-  //                  case TokenNameStringInterpolated :
-  //                  case TokenNameStringLiteral :
-  //                    current.add(new PHPVarDeclaration(current, variableName,
-  //                    // chIndx -
-  //                        // ident.length,
-  //                        scanner.getCurrentTokenStartPosition(), new String(
-  //                            ident)));
-  //                    break;
-  //                  case TokenNameStringConstant :
-  //                    current.add(new PHPVarDeclaration(current, variableName,
-  //                    // chIndx -
-  //                        // ident.length,
-  //                        scanner.getCurrentTokenStartPosition(), new String(
-  //                            ident)));
-  //                    break;
-  //                  default :
-  //                    current.add(new PHPVarDeclaration(current, variableName,
-  //                    // chIndx -
-  //                        // ident.length
-  //                        scanner.getCurrentTokenStartPosition()));
-  //                    break;
-  //                }
-  //              }
-  //            } else {
-  //              ident = scanner.getCurrentIdentifierSource();
-  //              current.add(new PHPVarDeclaration(current, variableName,
-  //              // chIndx - ident.length
-  //                  scanner.getCurrentTokenStartPosition()));
-  //            }
-  //          }
-  //        } else if (token == TokenNamefunction) {
-  //          getNextToken();
-  //          if (token == TokenNameAND) {
-  //            getNextToken();
-  //          }
-  //          if (token == TokenNameIdentifier
-  //              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_FUNC)) {
-  //            ident = scanner.getCurrentIdentifierSource();
-  //            outlineInfo.addVariable(new String(ident));
-  //            temp = new PHPFunctionDeclaration(current, new String(ident),
-  //            // chIndx - ident.length
-  //                scanner.getCurrentTokenStartPosition());
-  //            current.add(temp);
-  //            getNextToken();
-  //            parseDeclarations(outlineInfo, temp, true);
-  //          }
-  //        } else if (token == TokenNameclass) {
-  //          getNextToken();
-  //          if (token == TokenNameIdentifier
-  //              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_CLASS)) {
-  //            ident = scanner.getCurrentIdentifierSource();
-  //            outlineInfo.addVariable(new String(ident));
-  //            temp = new PHPClassDeclaration(current, new String(ident),
-  //            // chIndx - ident.len
-  //                scanner.getCurrentTokenStartPosition());
-  //            current.add(temp);
-  //            // stack.push(temp);
-  //            getNextToken();
-  //            //skip tokens for classname, extends and others until
-  //            // we have the opening '{'
-  //            while (token != TokenNameLBRACE && token != TokenNameEOF
-  //                && token != TokenNameERROR) {
-  //              getNextToken();
-  //            }
-  //            parseDeclarations(outlineInfo, temp, true);
-  //            // stack.pop();
-  //          }
-  //        } else if ((token == TokenNameLBRACE)
-  //            || (token == TokenNameDOLLAR_LBRACE)) {
-  //          getNextToken();
-  //          counter++;
-  //        } else if (token == TokenNameRBRACE) {
-  //          getNextToken();
-  //          --counter;
-  //          if (counter == 0 && goBack) {
-  //            return;
-  //          }
-  //        } else if (token == TokenNamerequire || token == TokenNamerequire_once
-  //            || token == TokenNameinclude || token == TokenNameinclude_once) {
-  //          ident = scanner.getCurrentTokenSource();
-  //          getNextToken();
-  //          int startPosition = scanner.getCurrentTokenStartPosition();
-  //          expr();
-  //          char[] expr = scanner.getCurrentTokenSource(startPosition);
-  //          outlineInfo.addVariable(new String(ident));
-  //          current.add(new PHPReqIncDeclaration(current, new String(ident),
-  //          // chIndx - ident.length,
-  //              startPosition, new String(expr)));
-  //          getNextToken();
-  //        } else {
-  //          getNextToken();
-  //        }
-  //      }
-  //    } catch (SyntaxError sytaxErr) {
-  //      // try {
-  //      // // setMarker(sytaxErr.getMessage(), sytaxErr.getLine(), ERROR);
-  //      // setMarker(sytaxErr.getMessage(),
-  //      // scanner.getCurrentTokenStartPosition(),
-  //      // scanner.getCurrentTokenEndPosition(), ERROR);
-  //      // } catch (CoreException e) {
-  //      // }
-  //    }
-  //  }
-  private void statementList() {
+  private Block statementList() {
+    boolean branchStatement = false;
+    Statement statement;
+    int blockStart = scanner.getCurrentTokenStartPosition();
+    ArrayList blockStatements = new ArrayList();
     do {
-      statement(TokenNameEOF);
-      if ((token == TokenNameRBRACE) || (token == TokenNamecase) || (token == TokenNamedefault) || (token == TokenNameelse)
-          || (token == TokenNameelseif) || (token == TokenNameendif) || (token == TokenNameendfor)
-          || (token == TokenNameendforeach) || (token == TokenNameendwhile) || (token == TokenNameendswitch) || (token == TokenNameenddeclare)
-          || (token == TokenNameEOF) || (token == TokenNameERROR)) {
-        return;
+      try {
+        statement = statement();
+        blockStatements.add(statement);
+        if (branchStatement && statement != null) {
+          //          reportSyntaxError("Unreachable code", statement.sourceStart, statement.sourceEnd);
+          problemReporter.unreachableCode(new String(scanner.getCurrentIdentifierSource()), statement.sourceStart,
+              statement.sourceEnd, referenceContext, compilationUnit.compilationResult);
+        }
+        if ((token == TokenNameRBRACE) || (token == TokenNamecase) || (token == TokenNamedefault) || (token == TokenNameelse)
+            || (token == TokenNameelseif) || (token == TokenNameendif) || (token == TokenNameendfor)
+            || (token == TokenNameendforeach) || (token == TokenNameendwhile) || (token == TokenNameendswitch)
+            || (token == TokenNameenddeclare) || (token == TokenNameEOF) || (token == TokenNameERROR)) {
+          return createBlock(blockStart, blockStatements);
+        }
+        branchStatement = checkUnreachableStatements(statement);
+      } catch (SyntaxError sytaxErr1) {
+        // if an error occured,
+        // try to find keywords
+        // to parse the rest of the string
+        boolean tokenize = scanner.tokenizeStrings;
+        if (!tokenize) {
+          scanner.tokenizeStrings = true;
+        }
+        try {
+          while (token != TokenNameEOF) {
+            if ((token == TokenNameRBRACE) || (token == TokenNamecase) || (token == TokenNamedefault) || (token == TokenNameelse)
+                || (token == TokenNameelseif) || (token == TokenNameendif) || (token == TokenNameendfor)
+                || (token == TokenNameendforeach) || (token == TokenNameendwhile) || (token == TokenNameendswitch)
+                || (token == TokenNameenddeclare) || (token == TokenNameEOF) || (token == TokenNameERROR)) {
+              return createBlock(blockStart, blockStatements);
+            }
+            if (token == TokenNameif || token == TokenNameswitch || token == TokenNamefor || token == TokenNamewhile
+                || token == TokenNamedo || token == TokenNameforeach || token == TokenNamecontinue || token == TokenNamebreak
+                || token == TokenNamereturn || token == TokenNameexit || token == TokenNameecho || token == TokenNameglobal
+                || token == TokenNamestatic || token == TokenNameunset || token == TokenNamefunction || token == TokenNamedeclare
+                || token == TokenNametry || token == TokenNamecatch || token == TokenNamethrow || token == TokenNamefinal
+                || token == TokenNameabstract || token == TokenNameclass || token == TokenNameinterface) {
+              break;
+            }
+            //            System.out.println(scanner.toStringAction(token));
+            getNextToken();
+            //            System.out.println(scanner.toStringAction(token));
+          }
+          if (token == TokenNameEOF) {
+            throw sytaxErr1;
+          }
+        } finally {
+          scanner.tokenizeStrings = tokenize;
+        }
       }
     } while (true);
   }
 
+  /**
+   * @param statement
+   * @return
+   */
+  private boolean checkUnreachableStatements(Statement statement) {
+    if (statement instanceof ReturnStatement || statement instanceof ContinueStatement || statement instanceof BreakStatement) {
+      return true;
+    } else if (statement instanceof IfStatement && ((IfStatement) statement).checkUnreachable) {
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @param blockStart
+   * @param blockStatements
+   * @return
+   */
+  private Block createBlock(int blockStart, ArrayList blockStatements) {
+    int blockEnd = scanner.getCurrentTokenEndPosition();
+    Block b = Block.EmptyWith(blockStart, blockEnd);
+    b.statements = new Statement[blockStatements.size()];
+    blockStatements.toArray(b.statements);
+    return b;
+  }
+
   private void functionBody(MethodDeclaration methodDecl) {
     // '{' [statement-list] '}'
     if (token == TokenNameLBRACE) {
       getNextToken();
     } else {
+      methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
       throwSyntaxError("'{' expected in compound-statement.");
     }
     if (token != TokenNameRBRACE) {
       statementList();
     }
     if (token == TokenNameRBRACE) {
-      methodDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+      methodDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
       getNextToken();
     } else {
+      methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
       throwSyntaxError("'}' expected in compound-statement.");
     }
   }
 
-  private Statement statement(int previousToken) {
+  private Statement statement() {
     Statement statement = null;
     Expression expression;
     int sourceStart = scanner.getCurrentTokenStartPosition();
+    int sourceEnd;
     if (token == TokenNameif) {
+      // T_IF '(' expr ')' statement elseif_list else_single
+      // T_IF '(' expr ')' ':' inner_statement_list new_elseif_list new_else_single T_ENDIF ';'
       getNextToken();
       if (token == TokenNameLPAREN) {
         getNextToken();
@@ -629,8 +589,15 @@ public class Parser //extends PHPParserSuperclass
       } else {
         throwSyntaxError("')' expected after 'if' condition.");
       }
-      ifStatement();
-      return new IfStatement(expression, statement, sourceStart, scanner.getCurrentTokenEndPosition());
+      // create basic IfStatement
+      IfStatement ifStatement = new IfStatement(expression, null, null, sourceStart, -1);
+      if (token == TokenNameCOLON) {
+        getNextToken();
+        ifStatementColon(ifStatement);
+      } else {
+        ifStatement(ifStatement);
+      }
+      return ifStatement;
     } else if (token == TokenNameswitch) {
       getNextToken();
       if (token == TokenNameLPAREN) {
@@ -713,7 +680,7 @@ public class Parser //extends PHPParserSuperclass
           throwSyntaxError("'}' expected after 'do' keyword.");
         }
       } else {
-        statement(TokenNameEOF);
+        statement();
       }
       if (token == TokenNamewhile) {
         getNextToken();
@@ -758,7 +725,7 @@ public class Parser //extends PHPParserSuperclass
       foreach_optional_arg();
       if (token == TokenNameEQUAL_GREATER) {
         getNextToken();
-        variable();
+        variable(false, false);
       }
       if (token == TokenNameRPAREN) {
         getNextToken();
@@ -767,20 +734,57 @@ public class Parser //extends PHPParserSuperclass
       }
       foreachStatement();
       return statement;
-    } else if (token == TokenNamecontinue || token == TokenNamebreak || token == TokenNamereturn) {
+    } else if (token == TokenNamebreak) {
+      expression = null;
       getNextToken();
       if (token != TokenNameSEMICOLON) {
-        expr();
+        expression = expr();
       }
       if (token == TokenNameSEMICOLON) {
+        sourceEnd = scanner.getCurrentTokenEndPosition();
         getNextToken();
       } else {
         if (token != TokenNameINLINE_HTML) {
-          throwSyntaxError("';' expected after 'continue', 'break' or 'return'.");
+          throwSyntaxError("';' expected after 'break'.");
         }
+        sourceEnd = scanner.getCurrentTokenEndPosition();
         getNextToken();
       }
-      return statement;
+      return new BreakStatement(null, sourceStart, sourceEnd);
+    } else if (token == TokenNamecontinue) {
+      expression = null;
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        expression = expr();
+      }
+      if (token == TokenNameSEMICOLON) {
+        sourceEnd = scanner.getCurrentTokenEndPosition();
+        getNextToken();
+      } else {
+        if (token != TokenNameINLINE_HTML) {
+          throwSyntaxError("';' expected after 'continue'.");
+        }
+        sourceEnd = scanner.getCurrentTokenEndPosition();
+        getNextToken();
+      }
+      return new ContinueStatement(null, sourceStart, sourceEnd);
+    } else if (token == TokenNamereturn) {
+      expression = null;
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        expression = expr();
+      }
+      if (token == TokenNameSEMICOLON) {
+        sourceEnd = scanner.getCurrentTokenEndPosition();
+        getNextToken();
+      } else {
+        if (token != TokenNameINLINE_HTML) {
+          throwSyntaxError("';' expected after 'return'.");
+        }
+        sourceEnd = scanner.getCurrentTokenEndPosition();
+        getNextToken();
+      }
+      return new ReturnStatement(expression, sourceStart, sourceEnd);
     } else if (token == TokenNameecho) {
       getNextToken();
       expressionList();
@@ -858,8 +862,18 @@ public class Parser //extends PHPParserSuperclass
       MethodDeclaration methodDecl = new MethodDeclaration(this.compilationUnit.compilationResult);
       methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
       methodDecl.modifiers = AccDefault;
-      getNextToken();
-      functionDefinition(methodDecl);
+      methodDecl.type = MethodDeclaration.FUNCTION_DEFINITION;
+      try {
+        getNextToken();
+        functionDefinition(methodDecl);
+      } finally {
+        sourceEnd = methodDecl.sourceEnd;
+        if (sourceEnd <= 0 || methodDecl.declarationSourceStart > sourceEnd) {
+          sourceEnd = methodDecl.declarationSourceStart + 1;
+        }
+        methodDecl.declarationSourceEnd = sourceEnd;
+        methodDecl.sourceEnd = sourceEnd;
+      }
       return statement;
     } else if (token == TokenNamedeclare) {
       //T_DECLARE '(' declare_list ')' declare_statement
@@ -925,18 +939,18 @@ public class Parser //extends PHPParserSuperclass
       }
       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[] { ' ' };
-      // default super class
-      typeDecl.superclass = new SingleTypeReference(TypeConstants.OBJECT, 0);
-      compilationUnit.types.add(typeDecl);
       try {
+        TypeDeclaration typeDecl = new TypeDeclaration(this.compilationUnit.compilationResult);
+        typeDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
+        typeDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+        typeDecl.name = new char[] { ' ' };
+        // default super class
+        typeDecl.superclass = new SingleTypeReference(TypeConstants.OBJECT, 0);
+        compilationUnit.types.add(typeDecl);
         pushOnAstStack(typeDecl);
         unticked_class_declaration_statement(typeDecl);
-        //        classBody(typeDecl);
       } finally {
+        // reduce stack:
         astPtr--;
         astLengthPtr--;
       }
@@ -946,7 +960,7 @@ public class Parser //extends PHPParserSuperclass
     } else if (token == TokenNameLBRACE) {
       getNextToken();
       if (token != TokenNameRBRACE) {
-        statementList();
+        statement = statementList();
       }
       if (token == TokenNameRBRACE) {
         getNextToken();
@@ -962,10 +976,14 @@ public class Parser //extends PHPParserSuperclass
         getNextToken();
         return statement;
       } else {
-        if (token != TokenNameINLINE_HTML && token != TokenNameEOF) {
-          throwSyntaxError("';' expected after expression (Found token: " + scanner.toStringAction(token) + ")");
+        if (token == TokenNameRBRACE) {
+          reportSyntaxError("';' expected after expression (Found token: " + scanner.toStringAction(token) + ")");
+        } else {
+          if (token != TokenNameINLINE_HTML && token != TokenNameEOF) {
+            throwSyntaxError("';' expected after expression (Found token: " + scanner.toStringAction(token) + ")");
+          }
+          getNextToken();
         }
-        getNextToken();
       }
     }
     // may be null
@@ -989,7 +1007,7 @@ public class Parser //extends PHPParserSuperclass
       }
       getNextToken();
     } else {
-      statement(TokenNameRPAREN);
+      statement();
     }
   }
 
@@ -1035,9 +1053,9 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
       if (token != TokenNameRBRACE) {
         statementList();
-        if (token != TokenNameRBRACE) {
-          throwSyntaxError("'}' expected in 'catch' statement.");
-        }
+      }
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected in 'catch' statement.");
       }
       getNextToken();
     }
@@ -1049,7 +1067,7 @@ public class Parser //extends PHPParserSuperclass
     if (token == TokenNameAND) {
       getNextToken();
     }
-    w_variable();
+    w_variable(true);
   }
 
   private void foreach_optional_arg() {
@@ -1065,8 +1083,9 @@ public class Parser //extends PHPParserSuperclass
     //  global_var_list:
     // global_var_list ',' global_var
     //| global_var
+    HashSet set = peekVariableSet();
     while (true) {
-      global_var();
+      global_var(set);
       if (token != TokenNameCOMMA) {
         break;
       }
@@ -1074,20 +1093,25 @@ public class Parser //extends PHPParserSuperclass
     }
   }
 
-  private void global_var() {
+  private void global_var(HashSet set) {
     //global_var:
     // T_VARIABLE
     //| '$' r_variable
     //| '$' '{' expr '}'
     if (token == TokenNameVariable) {
+      if (fMethodVariables != null) {
+        VariableInfo info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_GLOBAL_VAR);
+        fMethodVariables.put(new String(scanner.getCurrentIdentifierSource()), info);
+      }
+      addVariableSet(set);
       getNextToken();
     } else if (token == TokenNameDOLLAR) {
       getNextToken();
-      if (token == TokenNameLPAREN) {
+      if (token == TokenNameLBRACE) {
         getNextToken();
         expr();
-        if (token != TokenNameLPAREN) {
-          throwSyntaxError("')' expected in global variable.");
+        if (token != TokenNameRBRACE) {
+          throwSyntaxError("'}' expected in global variable.");
         }
         getNextToken();
       } else {
@@ -1101,9 +1125,15 @@ public class Parser //extends PHPParserSuperclass
     // static_var_list ',' T_VARIABLE
     //| static_var_list ',' T_VARIABLE '=' static_scalar
     //| T_VARIABLE
-    //| T_VARIABLE '=' static_scalar
+    //| T_VARIABLE '=' static_scalar,
+    HashSet set = peekVariableSet();
     while (true) {
       if (token == TokenNameVariable) {
+        if (fMethodVariables != null) {
+          VariableInfo info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_STATIC_VAR);
+          fMethodVariables.put(new String(scanner.getCurrentIdentifierSource()), info);
+        }
+        addVariableSet(set);
         getNextToken();
         if (token == TokenNameEQUAL) {
           getNextToken();
@@ -1126,7 +1156,7 @@ public class Parser //extends PHPParserSuperclass
     //    unset_variable:
     //                 variable
     while (true) {
-      variable();
+      variable(false, false);
       if (token != TokenNameCOMMA) {
         break;
       }
@@ -1165,7 +1195,7 @@ public class Parser //extends PHPParserSuperclass
           //              typeDecl.sourceStart, typeDecl.sourceEnd);
         }
         getNextToken();
-        interface_extends_list();
+        interface_extends_list(typeDecl);
       } else {
         typeDecl.name = new char[] { ' ' };
         throwSyntaxError("Interface name expected after keyword 'interface'.", typeDecl.sourceStart, typeDecl.sourceEnd);
@@ -1194,7 +1224,7 @@ public class Parser //extends PHPParserSuperclass
         //             /* empty */
         //     | T_EXTENDS fully_qualified_class_name
         if (token == TokenNameextends) {
-          interface_extends_list();
+          interface_extends_list(typeDecl);
           //          getNextToken();
           //          if (token != TokenNameIdentifier) {
           //            throwSyntaxError("Class name expected after keyword
@@ -1203,7 +1233,7 @@ public class Parser //extends PHPParserSuperclass
           //                    .getCurrentTokenEndPosition());
           //          }
         }
-        implements_list();
+        implements_list(typeDecl);
       } else {
         typeDecl.name = new char[] { ' ' };
         throwSyntaxError("Class name expected after keyword 'class'.", typeDecl.sourceStart, typeDecl.sourceEnd);
@@ -1257,7 +1287,21 @@ public class Parser //extends PHPParserSuperclass
     }
   }
 
-  private void interface_extends_list() {
+  private void class_extends(TypeDeclaration typeDecl) {
+    // /* empty */
+    // | T_EXTENDS interface_list
+    if (token == TokenNameextends) {
+      getNextToken();
+
+      if (token == TokenNameIdentifier) {
+        getNextToken();
+      } else {
+        throwSyntaxError("Class name expected after keyword 'extends'.");
+      }
+    }
+  }
+
+  private void interface_extends_list(TypeDeclaration typeDecl) {
     // /* empty */
     // | T_EXTENDS interface_list
     if (token == TokenNameextends) {
@@ -1266,7 +1310,7 @@ public class Parser //extends PHPParserSuperclass
     }
   }
 
-  private void implements_list() {
+  private void implements_list(TypeDeclaration typeDecl) {
     // /* empty */
     // | T_IMPLEMENTS interface_list
     if (token == TokenNameimplements) {
@@ -1311,10 +1355,43 @@ public class Parser //extends PHPParserSuperclass
   //  }
   private void class_statement_list(ArrayList list) {
     do {
-      class_statement(list);
-    } while (token == TokenNamepublic || token == TokenNameprotected || token == TokenNameprivate || token == TokenNamestatic
-        || token == TokenNameabstract || token == TokenNamefinal || token == TokenNamefunction || token == TokenNamevar
-        || token == TokenNameconst);
+      try {
+        class_statement(list);
+        if (token == TokenNamepublic || token == TokenNameprotected || token == TokenNameprivate || token == TokenNamestatic
+            || token == TokenNameabstract || token == TokenNamefinal || token == TokenNamefunction || token == TokenNamevar
+            || token == TokenNameconst) {
+          continue;
+        }
+        if (token == TokenNameRBRACE) {
+          break;
+        }
+        throwSyntaxError("'}' at end of class statement.");
+      } catch (SyntaxError sytaxErr1) {
+        boolean tokenize = scanner.tokenizeStrings;
+        if (!tokenize) {
+          scanner.tokenizeStrings = true;
+        }
+        try {
+          // if an error occured,
+          // try to find keywords
+          // to parse the rest of the string
+          while (token != TokenNameEOF) {
+            if (token == TokenNamepublic || token == TokenNameprotected || token == TokenNameprivate || token == TokenNamestatic
+                || token == TokenNameabstract || token == TokenNamefinal || token == TokenNamefunction || token == TokenNamevar
+                || token == TokenNameconst) {
+              break;
+            }
+            //            System.out.println(scanner.toStringAction(token));
+            getNextToken();
+          }
+          if (token == TokenNameEOF) {
+            throw sytaxErr1;
+          }
+        } finally {
+          scanner.tokenizeStrings = tokenize;
+        }
+      }
+    } while (true);
   }
 
   private void class_statement(ArrayList list) {
@@ -1348,8 +1425,18 @@ public class Parser //extends PHPParserSuperclass
         MethodDeclaration methodDecl = new MethodDeclaration(this.compilationUnit.compilationResult);
         methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
         methodDecl.modifiers = this.modifiers;
-        getNextToken();
-        functionDefinition(methodDecl);
+        methodDecl.type = MethodDeclaration.METHOD_DEFINITION;
+        try {
+          getNextToken();
+          functionDefinition(methodDecl);
+        } finally {
+          int sourceEnd = methodDecl.sourceEnd;
+          if (sourceEnd <= 0 || methodDecl.declarationSourceStart > sourceEnd) {
+            sourceEnd = methodDecl.declarationSourceStart + 1;
+          }
+          methodDecl.declarationSourceEnd = sourceEnd;
+          methodDecl.sourceEnd = sourceEnd;
+        }
       } else {
         if (!hasModifiers) {
           throwSyntaxError("'public' 'private' or 'protected' modifier expected for field declarations.");
@@ -1479,8 +1566,11 @@ public class Parser //extends PHPParserSuperclass
         fieldDeclaration.declarationSourceStart = declarationSourceStart;
         fieldDeclaration.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
         fieldDeclaration.modifiersSourceStart = declarationSourceStart;
-        //        fieldDeclaration.type
         list.add(fieldDeclaration);
+        if (fTypeVariables != null) {
+          VariableInfo info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_CLASS_UNIT);
+          fTypeVariables.put(new String(scanner.getCurrentIdentifierSource()), info);
+        }
         getNextToken();
         if (token == TokenNameEQUAL) {
           getNextToken();
@@ -1507,7 +1597,9 @@ public class Parser //extends PHPParserSuperclass
   private void functionDefinition(MethodDeclaration methodDecl) {
     boolean isAbstract = false;
     if (astPtr == 0) {
-      compilationUnit.types.add(methodDecl);
+      if (compilationUnit != null) {
+        compilationUnit.types.add(methodDecl);
+      }
     } else {
       ASTNode node = astStack[astPtr];
       if (node instanceof TypeDeclaration) {
@@ -1516,9 +1608,9 @@ public class Parser //extends PHPParserSuperclass
           typeDecl.methods = new AbstractMethodDeclaration[] { methodDecl };
         } else {
           AbstractMethodDeclaration[] newMethods;
-          System.arraycopy(typeDecl.methods, 0, newMethods = new AbstractMethodDeclaration[typeDecl.methods.length + 1], 1,
+          System.arraycopy(typeDecl.methods, 0, newMethods = new AbstractMethodDeclaration[typeDecl.methods.length + 1], 0,
               typeDecl.methods.length);
-          newMethods[0] = methodDecl;
+          newMethods[typeDecl.methods.length] = methodDecl;
           typeDecl.methods = newMethods;
         }
         if ((typeDecl.modifiers & AccAbstract) == AccAbstract) {
@@ -1528,15 +1620,23 @@ public class Parser //extends PHPParserSuperclass
         }
       }
     }
-    functionDeclarator(methodDecl);
-    if (token == TokenNameSEMICOLON) {
-      if (!isAbstract) {
-        throwSyntaxError("Body declaration expected for method: " + new String(methodDecl.selector));
+    try {
+      pushFunctionVariableSet();
+      functionDeclarator(methodDecl);
+      if (token == TokenNameSEMICOLON) {
+        if (!isAbstract) {
+          methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
+          throwSyntaxError("Body declaration expected for method: " + new String(methodDecl.selector));
+        }
+        getNextToken();
+        return;
+      }
+      functionBody(methodDecl);
+    } finally {
+      if (!fStackUnassigned.isEmpty()) {
+        fStackUnassigned.remove(fStackUnassigned.size() - 1);
       }
-      getNextToken();
-      return;
     }
-    functionBody(methodDecl);
   }
 
   private void functionDeclarator(MethodDeclaration methodDecl) {
@@ -1551,19 +1651,19 @@ public class Parser //extends PHPParserSuperclass
       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());
       }
       getNextToken();
       if (token == TokenNameLPAREN) {
         getNextToken();
       } else {
+        methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
         throwSyntaxError("'(' expected in function declaration.");
       }
       if (token != TokenNameRPAREN) {
-        parameter_list();
+        parameter_list(methodDecl);
       }
       if (token != TokenNameRPAREN) {
+        methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
         throwSyntaxError("')' expected in function declaration.");
       } else {
         methodDecl.bodyStart = scanner.getCurrentTokenEndPosition() + 1;
@@ -1571,18 +1671,19 @@ public class Parser //extends PHPParserSuperclass
       }
     } else {
       methodDecl.selector = "<undefined>".toCharArray();
+      methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
       throwSyntaxError("Function name expected after keyword 'function'.");
     }
   }
 
   //
-  private void parameter_list() {
+  private void parameter_list(MethodDeclaration methodDecl) {
     // non_empty_parameter_list
     // | /* empty */
-    non_empty_parameter_list(true);
+    non_empty_parameter_list(methodDecl, true);
   }
 
-  private void non_empty_parameter_list(boolean empty_allowed) {
+  private void non_empty_parameter_list(MethodDeclaration methodDecl, boolean empty_allowed) {
     // optional_class_type T_VARIABLE
     // | optional_class_type '&' T_VARIABLE
     // | optional_class_type '&' T_VARIABLE '=' static_scalar
@@ -1593,15 +1694,29 @@ public class Parser //extends PHPParserSuperclass
     // static_scalar
     // | non_empty_parameter_list ',' optional_class_type T_VARIABLE '='
     // static_scalar
+    char[] typeIdentifier = null;
     if (token == TokenNameIdentifier || token == TokenNameVariable || token == TokenNameAND) {
+      HashSet set = peekVariableSet();
       while (true) {
         if (token == TokenNameIdentifier) {
+          typeIdentifier = scanner.getCurrentIdentifierSource();
           getNextToken();
         }
         if (token == TokenNameAND) {
           getNextToken();
         }
         if (token == TokenNameVariable) {
+          if (fMethodVariables != null) {
+            VariableInfo info;
+            if (methodDecl.type == MethodDeclaration.FUNCTION_DEFINITION) {
+              info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_FUNCTION_DEFINITION);
+            } else {
+              info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_METHOD_DEFINITION);
+            }
+            info.typeIdentifier = typeIdentifier;
+            fMethodVariables.put(new String(scanner.getCurrentIdentifierSource()), info);
+          }
+          addVariableSet(set);
           getNextToken();
           if (token == TokenNameEQUAL) {
             getNextToken();
@@ -1627,31 +1742,31 @@ public class Parser //extends PHPParserSuperclass
     //| T_STRING
   }
 
-  private void parameterDeclaration() {
-    //variable
-    //variable-reference
-    if (token == TokenNameAND) {
-      getNextToken();
-      if (isVariable()) {
-        getNextToken();
-      } else {
-        throwSyntaxError("Variable expected after reference operator '&'.");
-      }
-    }
-    //variable '=' constant
-    if (token == TokenNameVariable) {
-      getNextToken();
-      if (token == TokenNameEQUAL) {
-        getNextToken();
-        static_scalar();
-      }
-      return;
-    }
-    //    if (token == TokenNamethis) {
-    //      throwSyntaxError("Reserved word '$this' not allowed in parameter
-    // declaration.");
-    //    }
-  }
+  //  private void parameterDeclaration() {
+  //    //variable
+  //    //variable-reference
+  //    if (token == TokenNameAND) {
+  //      getNextToken();
+  //      if (isVariable()) {
+  //        getNextToken();
+  //      } else {
+  //        throwSyntaxError("Variable expected after reference operator '&'.");
+  //      }
+  //    }
+  //    //variable '=' constant
+  //    if (token == TokenNameVariable) {
+  //      getNextToken();
+  //      if (token == TokenNameEQUAL) {
+  //        getNextToken();
+  //        static_scalar();
+  //      }
+  //      return;
+  //    }
+  //    // if (token == TokenNamethis) {
+  //    // throwSyntaxError("Reserved word '$this' not allowed in parameter
+  //    // declaration.");
+  //    // }
+  //  }
 
   private void labeledStatementList() {
     if (token != TokenNamecase && token != TokenNamedefault) {
@@ -1687,7 +1802,7 @@ public class Parser //extends PHPParserSuperclass
         }
       } else { // TokenNamedefault
         getNextToken();
-        if (token == TokenNameCOLON) {
+        if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
           getNextToken();
           if (token == TokenNameRBRACE) {
             // empty default case
@@ -1703,162 +1818,270 @@ public class Parser //extends PHPParserSuperclass
     } while (token == TokenNamecase || token == TokenNamedefault);
   }
 
-  //  public void labeledStatement() {
-  //    if (token == TokenNamecase) {
-  //      getNextToken();
-  //      constant();
-  //      if (token == TokenNameDDOT) {
-  //        getNextToken();
-  //        statement();
-  //      } else {
-  //        throwSyntaxError("':' character after 'case' constant expected.");
-  //      }
-  //      return;
-  //    } else if (token == TokenNamedefault) {
-  //      getNextToken();
-  //      if (token == TokenNameDDOT) {
-  //        getNextToken();
-  //        statement();
-  //      } else {
-  //        throwSyntaxError("':' character after 'default' expected.");
-  //      }
-  //      return;
-  //    }
-  //  }
-  //  public void expressionStatement() {
-  //  }
-  //  private void inclusionStatement() {
-  //  }
-  //  public void compoundStatement() {
-  //  }
-  //  public void selectionStatement() {
-  //  }
-  //
-  //  public void iterationStatement() {
-  //  }
-  //
-  //  public void jumpStatement() {
-  //  }
-  //
-  //  public void outputStatement() {
-  //  }
-  //
-  //  public void scopeStatement() {
-  //  }
-  //
-  //  public void flowStatement() {
-  //  }
-  //
-  //  public void definitionStatement() {
-  //  }
-  private void ifStatement() {
-    // ':' statement-list [elseif-list] [else-colon-statement] 'endif' ';'
-    if (token == TokenNameCOLON) {
-      getNextToken();
-      if (token != TokenNameendif) {
-        statementList();
-        switch (token) {
-        case TokenNameelse:
-          getNextToken();
-          if (token == TokenNameCOLON) {
-            getNextToken();
-            if (token != TokenNameendif) {
-              statementList();
-            }
-          } else {
-            if (token == TokenNameif) { //'else if'
-              getNextToken();
-              elseifStatementList();
-            } else {
-              throwSyntaxError("':' expected after 'else'.");
-            }
-          }
-          break;
-        case TokenNameelseif:
-          getNextToken();
-          elseifStatementList();
-          break;
+  private void ifStatementColon(IfStatement iState) {
+    // T_IF '(' expr ')' ':' inner_statement_list new_elseif_list new_else_single T_ENDIF ';'
+    HashSet assignedVariableSet = null;
+    try {
+      Block b = inner_statement_list();
+      iState.thenStatement = b;
+      checkUnreachable(iState, b);
+    } finally {
+      assignedVariableSet = removeIfVariableSet();
+    }
+    if (token == TokenNameelseif) {
+      try {
+        pushIfVariableSet();
+        new_elseif_list(iState);
+      } finally {
+        HashSet set = removeIfVariableSet();
+        if (assignedVariableSet != null) {
+          assignedVariableSet.addAll(set);
         }
       }
-      if (token != TokenNameendif) {
-        throwSyntaxError("'endif' expected.");
+    }
+    try {
+      pushIfVariableSet();
+      new_else_single(iState);
+    } finally {
+      HashSet set = removeIfVariableSet();
+      if (assignedVariableSet != null) {
+        HashSet topSet = peekVariableSet();
+        if (topSet != null) {
+          topSet.addAll(set);
+          topSet.addAll(assignedVariableSet);
+        }
       }
+    }
+    if (token != TokenNameendif) {
+      throwSyntaxError("'endif' expected.");
+    }
+    getNextToken();
+    if (token != TokenNameSEMICOLON) {
+      reportSyntaxError("';' expected after if-statement.");
+      iState.sourceEnd = scanner.getCurrentTokenStartPosition();
+    } else {
+      iState.sourceEnd = scanner.getCurrentTokenEndPosition();
       getNextToken();
-      if (token != TokenNameSEMICOLON) {
-        throwSyntaxError("';' expected after if-statement.");
+    }
+  }
+
+  private void ifStatement(IfStatement iState) {
+    //  T_IF '(' expr ')' statement elseif_list else_single
+    HashSet assignedVariableSet = null;
+    try {
+      pushIfVariableSet();
+      Statement s = statement();
+      iState.thenStatement = s;
+      checkUnreachable(iState, s);
+    } finally {
+      assignedVariableSet = removeIfVariableSet();
+    }
+
+    if (token == TokenNameelseif) {
+      try {
+        pushIfVariableSet();
+        elseif_list(iState);
+      } finally {
+        HashSet set = removeIfVariableSet();
+        if (assignedVariableSet != null) {
+          assignedVariableSet.addAll(set);
+        }
+      }
+    }
+    try {
+      pushIfVariableSet();
+      else_single(iState);
+    } finally {
+      HashSet set = removeIfVariableSet();
+      if (assignedVariableSet != null) {
+        HashSet topSet = peekVariableSet();
+        if (topSet != null) {
+          topSet.addAll(set);
+          topSet.addAll(assignedVariableSet);
+        }
       }
+    }
+  }
+
+  private void elseif_list(IfStatement iState) {
+    // /* empty */
+    //| elseif_list T_ELSEIF '(' expr ')' statement
+    ArrayList conditionList = new ArrayList();
+    ArrayList statementList = new ArrayList();
+    Expression e;
+    Statement s;
+    while (token == TokenNameelseif) {
       getNextToken();
-    } else {
-      // statement [else-statement]
-      statement(TokenNameEOF);
-      if (token == TokenNameelseif) {
+      if (token == TokenNameLPAREN) {
         getNextToken();
-        if (token == TokenNameLPAREN) {
-          getNextToken();
-        } else {
-          throwSyntaxError("'(' expected after 'elseif' keyword.");
-        }
-        expr();
-        if (token == TokenNameRPAREN) {
-          getNextToken();
-        } else {
-          throwSyntaxError("')' expected after 'elseif' condition.");
-        }
-        ifStatement();
-      } else if (token == TokenNameelse) {
+      } else {
+        throwSyntaxError("'(' expected after 'elseif' keyword.");
+      }
+      e = expr();
+      conditionList.add(e);
+      if (token == TokenNameRPAREN) {
         getNextToken();
-        statement(TokenNameEOF);
+      } else {
+        throwSyntaxError("')' expected after 'elseif' condition.");
       }
+      s = statement();
+      statementList.add(s);
+      checkUnreachable(iState, s);
     }
+    iState.elseifConditions = new Expression[conditionList.size()];
+    iState.elseifStatements = new Statement[statementList.size()];
+    conditionList.toArray(iState.elseifConditions);
+    statementList.toArray(iState.elseifStatements);
   }
 
-  private void elseifStatementList() {
-    do {
-      elseifStatement();
-      switch (token) {
-      case TokenNameelse:
+  private void new_elseif_list(IfStatement iState) {
+    // /* empty */
+    //| new_elseif_list T_ELSEIF '(' expr ')' ':' inner_statement_list
+    ArrayList conditionList = new ArrayList();
+    ArrayList statementList = new ArrayList();
+    Expression e;
+    Block b;
+    while (token == TokenNameelseif) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
         getNextToken();
-        if (token == TokenNameCOLON) {
-          getNextToken();
-          if (token != TokenNameendif) {
-            statementList();
-          }
-          return;
-        } else {
-          if (token == TokenNameif) { //'else if'
-            getNextToken();
-          } else {
-            throwSyntaxError("':' expected after 'else'.");
-          }
-        }
-        break;
-      case TokenNameelseif:
+      } else {
+        throwSyntaxError("'(' expected after 'elseif' keyword.");
+      }
+      e = expr();
+      conditionList.add(e);
+      if (token == TokenNameRPAREN) {
         getNextToken();
-        break;
-      default:
-        return;
+      } else {
+        throwSyntaxError("')' expected after 'elseif' condition.");
       }
-    } while (true);
+      if (token == TokenNameCOLON) {
+        getNextToken();
+      } else {
+        throwSyntaxError("':' expected after 'elseif' keyword.");
+      }
+      b = inner_statement_list();
+      statementList.add(b);
+      checkUnreachable(iState, b);
+    }
+    iState.elseifConditions = new Expression[conditionList.size()];
+    iState.elseifStatements = new Statement[statementList.size()];
+    conditionList.toArray(iState.elseifConditions);
+    statementList.toArray(iState.elseifStatements);
   }
 
-  private void elseifStatement() {
-    if (token == TokenNameLPAREN) {
+  private void else_single(IfStatement iState) {
+    // /* empty */
+    // T_ELSE statement
+    if (token == TokenNameelse) {
       getNextToken();
-      expr();
-      if (token != TokenNameRPAREN) {
-        throwSyntaxError("')' expected in else-if-statement.");
-      }
+      Statement s = statement();
+      iState.elseStatement = s;
+      checkUnreachable(iState, s);
+    } else {
+      iState.checkUnreachable = false;
+    }
+    iState.sourceEnd = scanner.getCurrentTokenStartPosition();
+  }
+
+  private void new_else_single(IfStatement iState) {
+    // /* empty */
+    //| T_ELSE ':' inner_statement_list
+    if (token == TokenNameelse) {
       getNextToken();
-      if (token != TokenNameCOLON) {
-        throwSyntaxError("':' expected in else-if-statement.");
+      if (token == TokenNameCOLON) {
+        getNextToken();
+      } else {
+        throwSyntaxError("':' expected after 'else' keyword.");
       }
-      getNextToken();
-      if (token != TokenNameendif) {
-        statementList();
+      Block b = inner_statement_list();
+      iState.elseStatement = b;
+      checkUnreachable(iState, b);
+    } else {
+      iState.checkUnreachable = false;
+    }
+  }
+
+  private Block inner_statement_list() {
+    // inner_statement_list inner_statement
+    // /* empty */
+    return statementList();
+  }
+
+  /**
+   * @param iState
+   * @param b
+   */
+  private void checkUnreachable(IfStatement iState, Statement s) {
+    if (s instanceof Block) {
+      Block b = (Block) s;
+      if (b.statements == null || b.statements.length == 0) {
+        iState.checkUnreachable = false;
+      } else {
+        int off = b.statements.length - 1;
+        if (!(b.statements[off] instanceof ReturnStatement) && !(b.statements[off] instanceof ContinueStatement)
+            && !(b.statements[off] instanceof BreakStatement)) {
+          if (!(b.statements[off] instanceof IfStatement) || !((IfStatement) b.statements[off]).checkUnreachable) {
+            iState.checkUnreachable = false;
+          }
+        }
+      }
+    } else {
+      if (!(s instanceof ReturnStatement) && !(s instanceof ContinueStatement) && !(s instanceof BreakStatement)) {
+        if (!(s instanceof IfStatement) || !((IfStatement) s).checkUnreachable) {
+          iState.checkUnreachable = false;
+        }
       }
     }
   }
 
+  //  private void elseifStatementList() {
+  //    do {
+  //      elseifStatement();
+  //      switch (token) {
+  //      case TokenNameelse:
+  //        getNextToken();
+  //        if (token == TokenNameCOLON) {
+  //          getNextToken();
+  //          if (token != TokenNameendif) {
+  //            statementList();
+  //          }
+  //          return;
+  //        } else {
+  //          if (token == TokenNameif) { //'else if'
+  //            getNextToken();
+  //          } else {
+  //            throwSyntaxError("':' expected after 'else'.");
+  //          }
+  //        }
+  //        break;
+  //      case TokenNameelseif:
+  //        getNextToken();
+  //        break;
+  //      default:
+  //        return;
+  //      }
+  //    } while (true);
+  //  }
+
+  //  private void elseifStatement() {
+  //    if (token == TokenNameLPAREN) {
+  //      getNextToken();
+  //      expr();
+  //      if (token != TokenNameRPAREN) {
+  //        throwSyntaxError("')' expected in else-if-statement.");
+  //      }
+  //      getNextToken();
+  //      if (token != TokenNameCOLON) {
+  //        throwSyntaxError("':' expected in else-if-statement.");
+  //      }
+  //      getNextToken();
+  //      if (token != TokenNameendif) {
+  //        statementList();
+  //      }
+  //    }
+  //  }
+
   private void switchStatement() {
     if (token == TokenNameCOLON) {
       // ':' [labeled-statement-list] 'endswitch' ';'
@@ -1901,7 +2124,7 @@ public class Parser //extends PHPParserSuperclass
       }
       getNextToken();
     } else {
-      statement(TokenNameEOF);
+      statement();
     }
   }
 
@@ -1919,7 +2142,7 @@ public class Parser //extends PHPParserSuperclass
       }
       getNextToken();
     } else {
-      statement(TokenNameEOF);
+      statement();
     }
   }
 
@@ -1936,7 +2159,7 @@ public class Parser //extends PHPParserSuperclass
       }
       getNextToken();
     } else {
-      statement(TokenNameEOF);
+      statement();
     }
   }
 
@@ -1978,418 +2201,583 @@ public class Parser //extends PHPParserSuperclass
   }
 
   private Expression expr_without_variable(boolean only_variable) {
+    int exprSourceStart = scanner.getCurrentTokenStartPosition();
+    int exprSourceEnd = scanner.getCurrentTokenEndPosition();
     Expression expression = new Expression();
-    expression.sourceStart = scanner.getCurrentTokenStartPosition();
+    expression.sourceStart = exprSourceStart;
     // default, may be overwritten
-    expression.sourceEnd = scanner.getCurrentTokenEndPosition();
-    //         internal_functions_in_yacc
-    // | T_CLONE expr
-    // | T_PRINT expr
-    // | '(' expr ')'
-    // | '@' expr
-    // | '+' expr
-    // | '-' expr
-    // | '!' expr
-    // | '~' expr
-    // | T_INC rw_variable
-    // | T_DEC rw_variable
-    // | 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
-    // | T_EXIT exit_expr
-    // | scalar
-    // | T_ARRAY '(' array_pair_list ')'
-    // | '`' encaps_list '`'
-    // | T_LIST '(' assignment_list ')' '=' expr
-    // | T_NEW class_name_reference ctor_arguments
-    // | 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
-    // | expr T_BOOLEAN_OR expr
-    // | expr T_BOOLEAN_AND expr
-    // | expr T_LOGICAL_OR expr
-    // | expr T_LOGICAL_AND expr
-    // | expr T_LOGICAL_XOR expr
-    // | expr '|' expr
-    // | expr '&' expr
-    // | expr '^' expr
-    // | expr '.' expr
-    // | expr '+' expr
-    // | expr '-' expr
-    // | expr '*' expr
-    // | expr '/' expr
-    // | expr '%' expr
-    // | expr T_SL expr
-    // | expr T_SR expr
-    // | expr T_IS_IDENTICAL expr
-    // | expr T_IS_NOT_IDENTICAL expr
-    // | expr T_IS_EQUAL expr
-    // | expr T_IS_NOT_EQUAL expr
-    // | expr '<' expr
-    // | expr T_IS_SMALLER_OR_EQUAL expr
-    // | expr '>' expr
-    // | expr T_IS_GREATER_OR_EQUAL expr
-    // | expr T_INSTANCEOF class_name_reference
-    // | expr '?' expr ':' expr
-    if (Scanner.TRACE) {
-      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:
-      getNextToken();
-      expr();
-      if (token == TokenNameRPAREN) {
-        getNextToken();
-      } else {
-        throwSyntaxError("')' expected in expression.");
+    expression.sourceEnd = exprSourceEnd;
+    try {
+      //               internal_functions_in_yacc
+      //       | T_CLONE expr
+      //       | T_PRINT expr
+      //       | '(' expr ')'
+      //       | '@' expr
+      //       | '+' expr
+      //       | '-' expr
+      //       | '!' expr
+      //       | '~' expr
+      //       | T_INC rw_variable
+      //       | T_DEC rw_variable
+      //       | 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
+      //       | T_EXIT exit_expr
+      //       | scalar
+      //       | T_ARRAY '(' array_pair_list ')'
+      //       | '`' encaps_list '`'
+      //       | T_LIST '(' assignment_list ')' '=' expr
+      //       | T_NEW class_name_reference ctor_arguments
+      //       | 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
+      //       | expr T_BOOLEAN_OR expr
+      //       | expr T_BOOLEAN_AND expr
+      //       | expr T_LOGICAL_OR expr
+      //       | expr T_LOGICAL_AND expr
+      //       | expr T_LOGICAL_XOR expr
+      //       | expr '|' expr
+      //       | expr '&' expr
+      //       | expr '^' expr
+      //       | expr '.' expr
+      //       | expr '+' expr
+      //       | expr '-' expr
+      //       | expr '*' expr
+      //       | expr '/' expr
+      //       | expr '%' expr
+      //       | expr T_SL expr
+      //       | expr T_SR expr
+      //       | expr T_IS_IDENTICAL expr
+      //       | expr T_IS_NOT_IDENTICAL expr
+      //       | expr T_IS_EQUAL expr
+      //       | expr T_IS_NOT_EQUAL expr
+      //       | expr '<' expr
+      //       | expr T_IS_SMALLER_OR_EQUAL expr
+      //       | expr '>' expr
+      //       | expr T_IS_GREATER_OR_EQUAL expr
+      //       | expr T_INSTANCEOF class_name_reference
+      //       | expr '?' expr ':' expr
+      if (Scanner.TRACE) {
+        System.out.println("TRACE: expr_without_variable() PART 1");
       }
-      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 {
-          encaps_list();
-          if (token != TokenNameEncapsedString0) {
-            throwSyntaxError("\'`\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
-          }
+      switch (token) {
+      case TokenNameisset:
+        //     T_ISSET '(' isset_variables ')'
+        getNextToken();
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("'(' expected after keyword 'isset'");
         }
-      } finally {
-        scanner.encapsedStringStack.pop();
         getNextToken();
-      }
-      break;
-    //      | '\'' encaps_list '\''
-    case TokenNameEncapsedString1:
-      scanner.encapsedStringStack.push(new Character('\''));
-      getNextToken();
-      try {
-        if (token == TokenNameEncapsedString1) {
-        } else {
-          encaps_list();
-          if (token != TokenNameEncapsedString1) {
-            throwSyntaxError("\'\'\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
-          }
+        isset_variables();
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after keyword 'isset'");
         }
-      } finally {
-        scanner.encapsedStringStack.pop();
         getNextToken();
-      }
-      break;
-    //| '"' encaps_list '"'
-    case TokenNameEncapsedString2:
-      scanner.encapsedStringStack.push(new Character('"'));
-      getNextToken();
-      try {
-        if (token == TokenNameEncapsedString2) {
-        } else {
-          encaps_list();
-          if (token != TokenNameEncapsedString2) {
-            throwSyntaxError("'\"' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
-          }
+        break;
+      case TokenNameempty:
+        getNextToken();
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("'(' expected after keyword 'empty'");
         }
-      } finally {
-        scanner.encapsedStringStack.pop();
         getNextToken();
-      }
-      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 ')'
-      getNextToken();
-      if (token == TokenNameLPAREN) {
+        variable(true, false);
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after keyword 'empty'");
+        }
+        getNextToken();
+        break;
+      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();
-          break;
-        }
-        array_pair_list();
-        if (token != TokenNameRPAREN) {
-          throwSyntaxError("')' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
+        } 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();
-      } else {
-        throwSyntaxError("'(' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
-      }
-      break;
-    case TokenNamelist:
-      //    | T_LIST '(' assignment_list ')' '=' expr
-      getNextToken();
-      if (token == TokenNameLPAREN) {
+        expr();
+        break;
+      case TokenNameexit:
         getNextToken();
-        assignment_list();
-        if (token != TokenNameRPAREN) {
-          throwSyntaxError("')' expected after 'list' keyword.");
+        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 {
+            encaps_list();
+            if (token != TokenNameEncapsedString0) {
+              throwSyntaxError("\'`\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
+            }
+          }
+        } finally {
+          scanner.encapsedStringStack.pop();
+          getNextToken();
         }
+        break;
+      //      | '\'' encaps_list '\''
+      case TokenNameEncapsedString1:
+        scanner.encapsedStringStack.push(new Character('\''));
         getNextToken();
-        if (token != TokenNameEQUAL) {
-          throwSyntaxError("'=' expected after 'list' keyword.");
+        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 {
+              expression = new StringLiteralSQ(scanner.getCurrentStringLiteralSource(exprSourceStart), exprSourceStart, scanner
+                  .getCurrentTokenEndPosition());
+            }
+          }
+        } finally {
+          scanner.encapsedStringStack.pop();
+          getNextToken();
         }
+        break;
+      //| '"' encaps_list '"'
+      case TokenNameEncapsedString2:
+        scanner.encapsedStringStack.push(new Character('"'));
         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:
+        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 {
+              expression = new StringLiteralDQ(scanner.getCurrentStringLiteralSource(exprSourceStart), exprSourceStart, scanner
+                  .getCurrentTokenEndPosition());
+            }
+          }
+        } finally {
+          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        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();
-        if (token == TokenNameAND) {
+        break;
+      case TokenNamearray:
+        //    T_ARRAY '(' array_pair_list ')'
+        getNextToken();
+        if (token == TokenNameLPAREN) {
           getNextToken();
-          if (token == TokenNamenew) {
-            // | variable '=' '&' T_NEW class_name_reference
-            // ctor_arguments
+          if (token == TokenNameRPAREN) {
             getNextToken();
-            class_name_reference();
-            ctor_arguments();
-          } else {
-            variable();
+            break;
           }
+          array_pair_list();
+          if (token != TokenNameRPAREN) {
+            throwSyntaxError("')' or ',' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
+          }
+          getNextToken();
         } else {
+          throwSyntaxError("'(' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
+        }
+        break;
+      case TokenNamelist:
+        //    | T_LIST '(' assignment_list ')' '=' expr
+        getNextToken();
+        if (token == TokenNameLPAREN) {
+          getNextToken();
+          assignment_list();
+          if (token != TokenNameRPAREN) {
+            throwSyntaxError("')' expected after 'list' keyword.");
+          }
+          getNextToken();
+          if (token != TokenNameEQUAL) {
+            throwSyntaxError("'=' expected after 'list' keyword.");
+          }
+          getNextToken();
           expr();
+        } else {
+          throwSyntaxError("'(' expected after 'list' keyword.");
         }
         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:
+      case TokenNamenew:
+        //     | T_NEW class_name_reference ctor_arguments
         getNextToken();
-        expr();
+        Expression typeRef = class_name_reference();
+        ctor_arguments();
+        if (typeRef != null) {
+          expression = typeRef;
+        }
         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:
+        boolean rememberedVar = false; 
+        Expression lhs = variable(true, true);
+        if (lhs != null && lhs instanceof FieldReference && token != TokenNameEQUAL && token != TokenNamePLUS_EQUAL
+            && token != TokenNameMINUS_EQUAL && token != TokenNameMULTIPLY_EQUAL && token != TokenNameDIVIDE_EQUAL
+            && token != TokenNameDOT_EQUAL && token != TokenNameREMAINDER_EQUAL && token != TokenNameAND_EQUAL
+            && token != TokenNameOR_EQUAL && token != TokenNameXOR_EQUAL && token != TokenNameRIGHT_SHIFT_EQUAL
+            && token != TokenNameLEFT_SHIFT_EQUAL) {
+          FieldReference ref = (FieldReference) lhs;
+          if (!containsVariableSet(ref.token)) {
+            problemReporter.uninitializedLocalVariable(new String(ref.token), ref.sourceStart(), ref.sourceEnd(), referenceContext,
+                compilationUnit.compilationResult);
+            addVariableSet(ref.token);
+          }
+        }
+
+        switch (token) {
+        case TokenNameEQUAL:
+          if (lhs != null && lhs instanceof FieldReference) {
+            addVariableSet(((FieldReference) lhs).token);
+          }
+          //          if (lhsVar != null) {
+          //            addVariableSet(lhsVar);
+          //          }
+          getNextToken();
+          if (token == TokenNameAND) {
+            getNextToken();
+            if (token == TokenNamenew) {
+              // | variable '=' '&' T_NEW class_name_reference
+              // ctor_arguments
+              getNextToken();
+              SingleTypeReference classRef = class_name_reference();
+              ctor_arguments();
+              if (classRef != null) {
+                if (lhs != null && lhs instanceof FieldReference) {
+                  // example:
+                  // $var = & new Object();
+                  if (fMethodVariables != null) {
+                    VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+                    lhsInfo.reference = classRef;
+                    lhsInfo.typeIdentifier = classRef.token;
+                    fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
+                    rememberedVar = true;
+                  }
+                }
+              }
+            } else {
+              Expression rhs = variable(false, false);
+              if (rhs != null && rhs instanceof FieldReference && lhs != null && lhs instanceof FieldReference) {
+                // example:
+                // $var = &$ref;
+                if (fMethodVariables != null) {
+                  VariableInfo rhsInfo = (VariableInfo) fMethodVariables.get(((FieldReference) rhs).token);
+                  if (rhsInfo != null && rhsInfo.reference != null) {
+                    VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+                    lhsInfo.reference = rhsInfo.reference;
+                    lhsInfo.typeIdentifier = rhsInfo.typeIdentifier;
+                    fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
+                    rememberedVar = true;
+                  }
+                }
+              }
+            }
+          } else {
+            Expression rhs = expr();
+            if (lhs != null && lhs instanceof FieldReference) {
+              if (rhs != null && rhs instanceof FieldReference) {
+                // example:
+                // $var = $ref;
+                if (fMethodVariables != null) {
+                  VariableInfo rhsInfo = (VariableInfo) fMethodVariables.get(((FieldReference) rhs).token);
+                  if (rhsInfo != null && rhsInfo.reference != null) {
+                    VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+                    lhsInfo.reference = rhsInfo.reference;
+                    lhsInfo.typeIdentifier = rhsInfo.typeIdentifier;
+                    fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
+                    rememberedVar = true;
+                  }
+                }
+              } else if (rhs != null && rhs instanceof SingleTypeReference) {
+                // example:
+                // $var = new Object();
+                if (fMethodVariables != null) {
+                  VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+                  lhsInfo.reference = (SingleTypeReference) rhs;
+                  lhsInfo.typeIdentifier = ((SingleTypeReference) rhs).token;
+                  fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
+                  rememberedVar = true;
+                }
+              }
+            }
+          }
+          if (rememberedVar == false && lhs != null && lhs instanceof FieldReference) {
+            if (fMethodVariables != null) {
+              VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+              fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
+            }
+          }
+          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:
+          if (lhs != null && lhs instanceof FieldReference) {
+            addVariableSet(((FieldReference) lhs).token);
+          }
+          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) + "').");
+          }
+          if (lhs != null) {
+            expression = lhs;
+          }
+        }
         break;
       default:
-        if (!only_variable) {
-          throwSyntaxError("Variable expression not allowed (found token '" + scanner.toStringAction(token) + "').");
+        if (token != TokenNameINLINE_HTML) {
+          if (token > TokenNameKEYWORD) {
+            getNextToken();
+            break;
+          } else {
+            throwSyntaxError("Error in expression (found token '" + scanner.toStringAction(token) + "').");
+          }
         }
+        return expression;
       }
-      break;
-    default:
-      if (token != TokenNameINLINE_HTML) {
-        if (token > TokenNameKEYWORD) {
+      if (Scanner.TRACE) {
+        System.out.println("TRACE: expr_without_variable() PART 2");
+      }
+      //       | expr T_BOOLEAN_OR expr
+      //       | expr T_BOOLEAN_AND expr
+      //       | expr T_LOGICAL_OR expr
+      //       | expr T_LOGICAL_AND expr
+      //       | expr T_LOGICAL_XOR expr
+      //       | expr '|' expr
+      //       | expr '&' expr
+      //       | expr '^' expr
+      //       | expr '.' expr
+      //       | expr '+' expr
+      //       | expr '-' expr
+      //       | expr '*' expr
+      //       | expr '/' expr
+      //       | expr '%' expr
+      //       | expr T_SL expr
+      //       | expr T_SR expr
+      //       | expr T_IS_IDENTICAL expr
+      //       | expr T_IS_NOT_IDENTICAL expr
+      //       | expr T_IS_EQUAL expr
+      //       | expr T_IS_NOT_EQUAL expr
+      //       | expr '<' expr
+      //       | expr T_IS_SMALLER_OR_EQUAL expr
+      //       | expr '>' expr
+      //       | expr T_IS_GREATER_OR_EQUAL expr
+      while (true) {
+        switch (token) {
+        case TokenNameOR_OR:
           getNextToken();
+          expression = new OR_OR_Expression(expression, expr(), token);
           break;
-        } else {
-          throwSyntaxError("Error in expression (found token '" + scanner.toStringAction(token) + "').");
+        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();
+          TypeReference classRef = class_name_reference();
+          expression = new InstanceOfExpression(expression, classRef, OperatorIds.INSTANCEOF);
+          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;
         }
       }
-      return expression;
-    }
-    if (Scanner.TRACE) {
-      System.out.println("TRACE: expr_without_variable() PART 2");
-    }
-    // | expr T_BOOLEAN_OR expr
-    // | expr T_BOOLEAN_AND expr
-    // | expr T_LOGICAL_OR expr
-    // | expr T_LOGICAL_AND expr
-    // | expr T_LOGICAL_XOR expr
-    // | expr '|' expr
-    // | expr '&' expr
-    // | expr '^' expr
-    // | expr '.' expr
-    // | expr '+' expr
-    // | expr '-' expr
-    // | expr '*' expr
-    // | expr '/' expr
-    // | expr '%' expr
-    // | expr T_SL expr
-    // | expr T_SR expr
-    // | expr T_IS_IDENTICAL expr
-    // | expr T_IS_NOT_IDENTICAL expr
-    // | expr T_IS_EQUAL expr
-    // | expr T_IS_NOT_EQUAL expr
-    // | expr '<' expr
-    // | expr T_IS_SMALLER_OR_EQUAL expr
-    // | expr '>' expr
-    // | 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:
+    } catch (SyntaxError e) {
+      // try to find next token after expression with errors:
+      if (token == TokenNameSEMICOLON) {
         getNextToken();
-        class_name_reference();
-        break;
-      case TokenNameQUESTION:
+        return expression;
+      }
+      if (token == TokenNameRBRACE || token == TokenNameRPAREN || token == TokenNameRBRACKET) {
         getNextToken();
-        expr();
-        if (token == TokenNameCOLON) {
-          getNextToken();
-          expr();
-        }
-        break;
-      default:
         return expression;
       }
+      throw e;
     }
   }
 
-  private void class_name_reference() {
+  private SingleTypeReference class_name_reference() {
     //  class_name_reference:
     // T_STRING
     //| dynamic_class_name_reference
+    SingleTypeReference ref = null;
     if (Scanner.TRACE) {
       System.out.println("TRACE: class_name_reference()");
     }
     if (token == TokenNameIdentifier) {
+      ref = new SingleTypeReference(scanner.getCurrentIdentifierSource(), scanner.getCurrentTokenStartPosition());
       getNextToken();
     } else {
+      ref = null;
       dynamic_class_name_reference();
     }
+    return ref;
   }
 
   private void dynamic_class_name_reference() {
@@ -2469,8 +2857,10 @@ public class Parser //extends PHPParserSuperclass
     // variable
     //| T_LIST '(' assignment_list ')'
     //| /* empty */
-    if (token == TokenNameVariable || token == TokenNameDOLLAR) {
-      variable();
+    if (token == TokenNameVariable) {
+      variable(true, false);
+    } else if (token == TokenNameDOLLAR) {
+      variable(false, false);
     } else {
       if (token == TokenNamelist) {
         getNextToken();
@@ -2511,17 +2901,17 @@ public class Parser //extends PHPParserSuperclass
     while (true) {
       if (token == TokenNameAND) {
         getNextToken();
-        variable();
+        variable(true, false);
       } else {
         expr();
         if (token == TokenNameAND) {
           getNextToken();
-          variable();
+          variable(true, false);
         } else if (token == TokenNameEQUAL_GREATER) {
           getNextToken();
           if (token == TokenNameAND) {
             getNextToken();
-            variable();
+            variable(true, false);
           } else {
             expr();
           }
@@ -2547,7 +2937,7 @@ public class Parser //extends PHPParserSuperclass
   //      }
   //    } while (true);
   //  }
-  private void variable_without_objects() {
+  private Expression variable_without_objects(boolean lefthandside, boolean ignoreVar) {
     //  variable_without_objects:
     //                 reference_variable
     //         | simple_indirect_reference reference_variable
@@ -2557,10 +2947,10 @@ public class Parser //extends PHPParserSuperclass
     while (token == TokenNameDOLLAR) {
       getNextToken();
     }
-    reference_variable();
+    return reference_variable(lefthandside, ignoreVar);
   }
 
-  private void function_call() {
+  private Expression function_call(boolean lefthandside, boolean ignoreVar) {
     //  function_call:
     // T_STRING '(' function_call_parameter_list ')'
     //| class_constant '(' function_call_parameter_list ')'
@@ -2570,6 +2960,7 @@ public class Parser //extends PHPParserSuperclass
     char[] ident = null;
     int startPos = 0;
     int endPos = 0;
+    Expression ref = null;
     if (Scanner.TRACE) {
       System.out.println("TRACE: function_call()");
     }
@@ -2589,12 +2980,12 @@ public class Parser //extends PHPParserSuperclass
           getNextToken();
         } else {
           //        static member:
-          variable_without_objects();
+          variable_without_objects(true, false);
         }
         break;
       }
     } else {
-      variable_without_objects();
+      ref = variable_without_objects(lefthandside, ignoreVar);
     }
     if (token != TokenNameLPAREN) {
       if (defineName != null) {
@@ -2624,13 +3015,13 @@ public class Parser //extends PHPParserSuperclass
         }
       }
       // TODO is this ok ?
-      return;
+      return ref;
       //      throwSyntaxError("'(' expected in function call.");
     }
     getNextToken();
     if (token == TokenNameRPAREN) {
       getNextToken();
-      return;
+      return ref;
     }
     non_empty_function_call_parameter_list();
     if (token != TokenNameRPAREN) {
@@ -2643,6 +3034,7 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("')' expected in function call (" + functionName + ").");
     }
     getNextToken();
+    return ref;
   }
 
   //  private void function_call_parameter_list() {
@@ -2664,7 +3056,7 @@ public class Parser //extends PHPParserSuperclass
     while (true) {
       if (token == TokenNameAND) {
         getNextToken();
-        w_variable();
+        w_variable(true);
       } else {
         //        if (token == TokenNameIdentifier || token ==
         // TokenNameVariable
@@ -2701,10 +3093,10 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("'::' expected after class name (static_member).");
     }
     getNextToken();
-    variable_without_objects();
+    variable_without_objects(false, false);
   }
 
-  private void base_variable_with_function_calls() {
+  private Expression base_variable_with_function_calls(boolean lefthandside, boolean ignoreVar) {
     //  base_variable_with_function_calls:
     // base_variable
     //| function_call
@@ -2726,17 +3118,18 @@ public class Parser //extends PHPParserSuperclass
     //      scanner.phpMode = true;
     //    }
     //    if (functionCall) {
-    function_call();
+    return function_call(lefthandside, ignoreVar);
     //    } else {
     //      base_variable();
     //    }
   }
 
-  private void base_variable() {
+  private Expression base_variable() {
     //  base_variable:
     //                 reference_variable
     //         | simple_indirect_reference reference_variable
     //         | static_member
+    Expression ref = null;
     if (Scanner.TRACE) {
       System.out.println("TRACE: base_variable()");
     }
@@ -2746,8 +3139,9 @@ public class Parser //extends PHPParserSuperclass
       while (token == TokenNameDOLLAR) {
         getNextToken();
       }
-      reference_variable();
+      reference_variable(false, false);
     }
+    return ref;
   }
 
   //  private void simple_indirect_reference() {
@@ -2755,17 +3149,19 @@ public class Parser //extends PHPParserSuperclass
   //    // '$'
   //    //| simple_indirect_reference '$'
   //  }
-  private void reference_variable() {
+  private Expression reference_variable(boolean lefthandside, boolean ignoreVar) {
     //  reference_variable:
     //                 reference_variable '[' dim_offset ']'
     //         | reference_variable '{' expr '}'
     //         | compound_variable
+    Expression ref = null;
     if (Scanner.TRACE) {
       System.out.println("TRACE: reference_variable()");
     }
-    compound_variable();
+    ref = compound_variable(lefthandside, ignoreVar);
     while (true) {
       if (token == TokenNameLBRACE) {
+        ref = null;
         getNextToken();
         expr();
         if (token != TokenNameRBRACE) {
@@ -2773,6 +3169,11 @@ public class Parser //extends PHPParserSuperclass
         }
         getNextToken();
       } else if (token == TokenNameLBRACKET) {
+        if (ref != null && ref instanceof FieldReference) {
+          FieldReference fref = (FieldReference) ref;
+          addVariableSet(fref.token);
+        }
+        ref = null;
         getNextToken();
         if (token != TokenNameRBRACKET) {
           expr();
@@ -2786,9 +3187,10 @@ public class Parser //extends PHPParserSuperclass
         break;
       }
     }
+    return ref;
   }
 
-  private void compound_variable() {
+  private Expression compound_variable(boolean lefthandside, boolean ignoreVar) {
     //  compound_variable:
     //                 T_VARIABLE
     //         | '$' '{' expr '}'
@@ -2796,14 +3198,30 @@ public class Parser //extends PHPParserSuperclass
       System.out.println("TRACE: compound_variable()");
     }
     if (token == TokenNameVariable) {
+      if (!lefthandside) {
+        if (!containsVariableSet()) {
+          //          reportSyntaxError("The local variable " + new String(scanner.getCurrentIdentifierSource())
+          //              + " may not have been initialized");
+          problemReporter.uninitializedLocalVariable(new String(scanner.getCurrentIdentifierSource()), scanner
+              .getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(), referenceContext,
+              compilationUnit.compilationResult);
+        }
+      } else {
+        if (!ignoreVar) {
+          addVariableSet();
+        }
+      }
+      FieldReference ref = new FieldReference(scanner.getCurrentIdentifierSource(), scanner.getCurrentTokenStartPosition());
       getNextToken();
+      return ref;
     } else {
       // because of simple_indirect_reference
       while (token == TokenNameDOLLAR) {
         getNextToken();
       }
       if (token != TokenNameLBRACE) {
-        throwSyntaxError("'{' expected after compound variable token '$'.");
+        reportSyntaxError("'{' expected after compound variable token '$'.");
+        return null;
       }
       getNextToken();
       expr();
@@ -2812,11 +3230,9 @@ public class Parser //extends PHPParserSuperclass
       }
       getNextToken();
     }
-  }
+    return null;
+  } //  private void dim_offset() { // // dim_offset: // // /* empty */
 
-  //  private void dim_offset() {
-  //    // dim_offset:
-  //    // /* empty */
   //    // | expr
   //    expr();
   //  }
@@ -2828,7 +3244,7 @@ public class Parser //extends PHPParserSuperclass
       System.out.println("TRACE: object_property()");
     }
     if (token == TokenNameVariable || token == TokenNameDOLLAR) {
-      variable_without_objects();
+      variable_without_objects(false, false);
     } else {
       object_dim_list();
     }
@@ -2894,55 +3310,31 @@ public class Parser //extends PHPParserSuperclass
   }
 
   private void r_variable() {
-    variable();
+    variable(false, false);
   }
 
-  private void w_variable() {
-    variable();
+  private void w_variable(boolean lefthandside) {
+    variable(lefthandside, false);
   }
 
   private void rw_variable() {
-    variable();
+    variable(false, false);
   }
 
-  private void variable() {
+  private Expression variable(boolean lefthandside, boolean ignoreVar) {
     //    variable:
     //         base_variable_with_function_calls T_OBJECT_OPERATOR
     //                 object_property method_or_not variable_properties
     // | base_variable_with_function_calls
-    base_variable_with_function_calls();
+    Expression ref = base_variable_with_function_calls(lefthandside, ignoreVar);
     if (token == TokenNameMINUS_GREATER) {
+      ref = null;
       getNextToken();
       object_property();
       method_or_not();
       variable_properties();
     }
-    //    if (token == TokenNameDOLLAR_LBRACE) {
-    //      getNextToken();
-    //      expr();
-    //      ;
-    //      if (token != TokenNameRBRACE) {
-    //        throwSyntaxError("'}' expected after indirect variable token '${'.");
-    //      }
-    //      getNextToken();
-    //    } else {
-    //      if (token == TokenNameVariable) {
-    //        getNextToken();
-    //        if (token == TokenNameLBRACKET) {
-    //          getNextToken();
-    //          expr();
-    //          if (token != TokenNameRBRACKET) {
-    //            throwSyntaxError("']' expected in variable-list.");
-    //          }
-    //          getNextToken();
-    //        } else if (token == TokenNameEQUAL) {
-    //          getNextToken();
-    //          static_scalar();
-    //        }
-    //      } else {
-    //        throwSyntaxError("$-variable expected in variable-list.");
-    //      }
-    //    }
+    return ref;
   }
 
   private void variable_properties() {
@@ -3251,59 +3643,41 @@ public class Parser //extends PHPParserSuperclass
   }
 
   private void internal_functions_in_yacc() {
-    int start = 0;
-    ImportReference impt = null;
+    //    int start = 0;
     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 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(false);
+    //      if (token != TokenNameRPAREN) {
+    //        throwSyntaxError("')' expected after keyword 'empty'");
+    //      }
+    //      getNextToken();
+    //      break;
     case TokenNameinclude:
       //T_INCLUDE 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);
+      checkFileName(token);
       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);
+      checkFileName(token);
       break;
     case TokenNameeval:
       //       T_EVAL '(' expr ')'
@@ -3320,31 +3694,102 @@ public class Parser //extends PHPParserSuperclass
       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);
+      checkFileName(token);
       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);
+      checkFileName(token);
       break;
     }
   }
 
+  private void checkFileName(int includeToken) {
+    //<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();
+      } else {
+        throwSyntaxError("')' expected for keyword '" + scanner.toStringAction(includeToken) + "'");
+      }
+    }
+    char[] currTokenSource = scanner.getCurrentTokenSource(start);
+    IFile file = null;
+    if (scanner.compilationUnit != null) {
+      IResource resource = scanner.compilationUnit.getResource();
+      if (resource != null && resource instanceof IFile) {
+        file = (IFile) resource;
+      }
+    }
+    char[][] tokens;
+    tokens = new char[1][];
+    tokens[0] = currTokenSource;
+
+    ImportReference impt = new ImportReference(tokens, currTokenSource, 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;
+        }
+      }
+      if (includeNameString.startsWith("http://")) {
+        // assuming external include location
+        return;
+      }
+      if (file != null) {
+        // check the filename:
+        //      System.out.println(new String(compilationUnit.getFileName())+" - "+ expression.toStringExpression());
+        IProject project = file.getProject();
+        if (project != null) {
+          IPath path = PHPFileUtil.determineFilePath(includeNameString, file, 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 {
+            try {
+              //              String projectPath = ProjectPrefUtil.getDocumentRoot(file.getProject()).toString();
+              //              String filePath = file.getRawLocation().toString();
+              String filePath = path.toString();
+              String ext = file.getRawLocation().getFileExtension();
+              int fileExtensionLength = ext == null ? 0 : ext.length() + 1;
+              int length;
+
+              impt.tokens = CharOperation.splitOn('/', filePath.toCharArray(), 0, filePath.length() - fileExtensionLength);
+              impt.setFile(PHPFileUtil.createFile(path, project));
+            } catch (Exception e) {
+              // the file is outside of the workspace
+            }
+          }
+        }
+      }
+    }
+  }
+
   private void isset_variables() {
     // variable
     // | isset_variables ','
@@ -3352,7 +3797,7 @@ public class Parser //extends PHPParserSuperclass
       throwSyntaxError("Variable expected after keyword 'isset'");
     }
     while (true) {
-      variable();
+      variable(true, false);
       if (token == TokenNameCOMMA) {
         getNextToken();
       } else {
@@ -3505,7 +3950,7 @@ public class Parser //extends PHPParserSuperclass
       }
       non_empty_static_array_pair_list();
       if (token != TokenNameRPAREN) {
-        throwSyntaxError("')' expected after keyword 'array'");
+        throwSyntaxError("')' or ',' expected after keyword 'array'");
       }
       getNextToken();
       break;
@@ -3663,6 +4108,15 @@ public class Parser //extends PHPParserSuperclass
 
   protected int nestedType, dimensions;
 
+  //variable set stack
+  final static int VariableStackIncrement = 10;
+
+  HashMap fTypeVariables = null;
+
+  HashMap fMethodVariables = null;
+
+  ArrayList fStackUnassigned = new ArrayList();
+
   //ast stack
   final static int AstStackIncrement = 100;
 
@@ -4030,8 +4484,7 @@ public class Parser //extends PHPParserSuperclass
         }
       }
       if (scanner.recordLineSeparator) {
-        //                             compilationUnit.compilationResult.lineSeparatorPositions =
-        // scanner.getLineEnds();
+        compilationUnit.compilationResult.lineSeparatorPositions = scanner.getLineEnds();
       }
       // check placement anomalies against other kinds of brackets
       for (int kind = 0; kind < BracketKinds; kind++) {
@@ -4140,4 +4593,150 @@ public class Parser //extends PHPParserSuperclass
     // modifiersFlag(int)
     this.scanner.commentPtr = -1;
   }
+
+  protected void consumePackageDeclarationName(IFile file) {
+    // create a package name similar to java package names
+    String projectPath = ProjectPrefUtil.getDocumentRoot(file.getProject()).toString();
+    String filePath = file.getRawLocation().toString();
+    String ext = file.getRawLocation().getFileExtension();
+    int fileExtensionLength = ext == null ? 0 : ext.length() + 1;
+    ImportReference impt;
+    int length;
+    char[][] tokens;
+    if (filePath.startsWith(projectPath)) {
+      tokens = CharOperation
+          .splitOn('/', filePath.toCharArray(), projectPath.length() + 1, filePath.length() - fileExtensionLength);
+    } else {
+      String name = file.getName();
+      tokens = new char[1][];
+      tokens[0] = name.substring(0, name.length() - fileExtensionLength).toCharArray();
+    }
+
+    this.compilationUnit.currentPackage = impt = new ImportReference(tokens, new char[0], 0, 0, true);
+
+    impt.declarationSourceStart = 0;
+    impt.declarationSourceEnd = 0;
+    impt.declarationEnd = 0;
+    //endPosition is just before the ;
+
+  }
+
+  public final static String[] GLOBALS = {
+      "$this",
+      "$_COOKIE",
+      "$_ENV",
+      "$_FILES",
+      "$_GET",
+      "$GLOBALS",
+      "$_POST",
+      "$_REQUEST",
+      "$_SESSION",
+      "$_SERVER" };
+
+  /**
+   *  
+   */
+  private void pushFunctionVariableSet() {
+    HashSet set = new HashSet();
+    if (fStackUnassigned.isEmpty()) {
+      for (int i = 0; i < GLOBALS.length; i++) {
+        set.add(GLOBALS[i]);
+      }
+    }
+    fStackUnassigned.add(set);
+  }
+
+  private void pushIfVariableSet() {
+    if (!fStackUnassigned.isEmpty()) {
+      HashSet set = new HashSet();
+      fStackUnassigned.add(set);
+    }
+  }
+
+  private HashSet removeIfVariableSet() {
+    if (!fStackUnassigned.isEmpty()) {
+      return (HashSet) fStackUnassigned.remove(fStackUnassigned.size() - 1);
+    }
+    return null;
+  }
+
+  /**
+   * Returns the <i>set of assigned variables </i> returns null if no Set is defined at the current scanner position
+   */
+  private HashSet peekVariableSet() {
+    if (!fStackUnassigned.isEmpty()) {
+      return (HashSet) fStackUnassigned.get(fStackUnassigned.size() - 1);
+    }
+    return null;
+  }
+
+  /**
+   * add the current identifier source to the <i>set of assigned variables </i>
+   * 
+   * @param set
+   */
+  private void addVariableSet(HashSet set) {
+    if (set != null) {
+      set.add(new String(scanner.getCurrentTokenSource()));
+    }
+  }
+
+  /**
+   * add the current identifier source to the <i>set of assigned variables </i>
+   *  
+   */
+  private void addVariableSet() {
+    HashSet set = peekVariableSet();
+    if (set != null) {
+      set.add(new String(scanner.getCurrentTokenSource()));
+    }
+  }
+
+  /**
+   * add the current identifier source to the <i>set of assigned variables </i>
+   *  
+   */
+  private void addVariableSet(char[] token) {
+    HashSet set = peekVariableSet();
+    if (set != null) {
+      set.add(new String(token));
+    }
+  }
+
+  /**
+   * check if the current identifier source is in the <i>set of assigned variables </i> Returns true, if no set is defined for the
+   * current scanner position
+   *  
+   */
+  private boolean containsVariableSet() {
+    return containsVariableSet(scanner.getCurrentTokenSource());
+    //    if (!fStackUnassigned.isEmpty()) {
+    //      HashSet set;
+    //      String str = new String(scanner.getCurrentTokenSource());
+    //      for (int i = 0; i < fStackUnassigned.size(); i++) {
+    //        set = (HashSet) fStackUnassigned.get(i);
+    //        if (set.contains(str)) {
+    //          return true;
+    //        }
+    //      }
+    //      return false;
+    //    }
+    //    return true;
+  }
+
+  private boolean containsVariableSet(char[] token) {
+
+    if (!fStackUnassigned.isEmpty()) {
+      HashSet set;
+      String str = new String(token);
+      for (int i = 0; i < fStackUnassigned.size(); i++) {
+        set = (HashSet) fStackUnassigned.get(i);
+        if (set.contains(str)) {
+          return true;
+        }
+      }
+      return false;
+    }
+    return true;
+  }
 }
\ No newline at end of file