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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index 820b0c7..939f999 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -1,25 +1,30 @@
-/**********************************************************************
- Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de
- All rights reserved. This program and the accompanying material
- are made available under the terms of the Common Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/cpl-v10.html
-
- Contributors:
- Klaus Hartlage - www.eclipseproject.de
- **********************************************************************/
+/*******************************************************************************
+ * Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de All rights
+ * reserved. This program and the accompanying material are made available under
+ * the terms of the Common Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors: Klaus Hartlage - www.eclipseproject.de
+ ******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.parser;
 import java.util.ArrayList;
+
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
+import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.impl.ReferenceContext;
 import net.sourceforge.phpdt.internal.compiler.lookup.CompilerModifiers;
 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.phpeclipse.builder.IdentifierIndexManager;
 import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.AstNode;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
@@ -65,10 +70,15 @@ public class Parser //extends PHPParserSuperclass
   //private boolean phpMode;
   protected int modifiers;
   protected int modifiersSourceStart;
-  protected Parser() {
+//  protected IdentifierIndexManager indexManager;
+  
+  protected Parser(ProblemReporter problemReporter) {
+    this.problemReporter = problemReporter;
+    this.options = problemReporter.options;
     this.currentPHPString = 0;
     //		PHPParserSuperclass.fileToParse = fileToParse;
     this.phpList = null;
+//    this.indexManager = null;
     this.str = "";
     this.token = TokenNameEOF;
     //    this.chIndx = 0;
@@ -82,6 +92,7 @@ public class Parser //extends PHPParserSuperclass
     this.currentPHPString = 0;
     //    PHPParserSuperclass.fileToParse = fileToParse;
     this.phpList = null;
+//    this.indexManager = null;
     this.str = "";
     this.token = TokenNameEOF;
     this.phpEnd = false;
@@ -92,7 +103,7 @@ public class Parser //extends PHPParserSuperclass
    * 
    * @param s
    * @param sess
-   *            Description of Parameter
+   *          Description of Parameter
    * @see
    */
   public Parser(IFile fileToParse) {
@@ -105,6 +116,7 @@ public class Parser //extends PHPParserSuperclass
     this.currentPHPString = 0;
     //    PHPParserSuperclass.fileToParse = fileToParse;
     this.phpList = null;
+    this.includesList = null;
     this.str = "";
     this.token = TokenNameEOF;
     //    this.chIndx = 0;
@@ -115,7 +127,9 @@ public class Parser //extends PHPParserSuperclass
     this.initializeScanner();
   }
   public void initializeScanner() {
-    this.scanner = new Scanner(false, false, false, false);
+    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 */);
   }
   /**
    * Create marker for the parse error
@@ -129,46 +143,38 @@ public class Parser //extends PHPParserSuperclass
    * columns to the Error
    * 
    * @param error
-   *            the error message
+   *          the error message
    * @throws SyntaxError
-   *             the error raised
+   *           the error raised
    */
   private void throwSyntaxError(String error) {
     int problemStartPosition = scanner.getCurrentTokenStartPosition();
     int problemEndPosition = scanner.getCurrentTokenEndPosition();
-    throwSyntaxError(error, problemStartPosition, problemEndPosition);
+    throwSyntaxError(error, problemStartPosition, problemEndPosition + 1);
   }
   /**
    * This method will throw the SyntaxError. It will add the good lines and
    * columns to the Error
    * 
    * @param error
-   *            the error message
+   *          the error message
    * @throws SyntaxError
-   *             the error raised
+   *           the error raised
    */
   //  private void throwSyntaxError(String error, int startRow) {
   //    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);
+  private void throwSyntaxError(String error, int problemStartPosition, int problemEndPosition) {
+    problemReporter.phpParsingError(new String[]{error}, problemStartPosition, problemEndPosition, referenceContext,
+        compilationUnit.compilationResult);
     throw new SyntaxError(1, 0, " ", error);
   }
-  private void reportSyntaxError(String error, int problemStartPosition,
-      int problemEndPosition) {
-    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,
+  private void reportSyntaxError(String error, int problemStartPosition, int problemEndPosition) {
+    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);
   }
   /**
@@ -197,435 +203,21 @@ public class Parser //extends PHPParserSuperclass
       if (Scanner.DEBUG) {
         int currentEndPosition = scanner.getCurrentTokenEndPosition();
         int currentStartPosition = scanner.getCurrentTokenStartPosition();
-        System.out
-            .print(currentStartPosition + "," + currentEndPosition + ": ");
+        System.out.print(currentStartPosition + "," + currentEndPosition + ": ");
         System.out.println(scanner.toStringAction(token));
       }
     } catch (InvalidInputException e) {
       token = TokenNameERROR;
+      String detailedMessage = e.getMessage();
+      
+      if (detailedMessage==Scanner.UNTERMINATED_STRING) {
+        throwSyntaxError("Unterminated string.");
+      } else if (detailedMessage==Scanner.UNTERMINATED_COMMENT) {
+        throwSyntaxError("Unterminated commment.");
+      }
     }
     return;
   }
-  /**
-   * Get a number. if it's a <code>double</code> the number will be stored in
-   * <code>doubleNumber</code> and the token will have the value
-   * {@link Parser#TokenNameDOUBLE_NUMBER}<br />
-   * if it's a <code>double</code> the number will be stored in <code>longNumber</code>
-   * and the token will have the value {@link Parser#TokenNameINT_NUMBER}
-   */
-  //  private void getNumber() {
-  //    StringBuffer inum = new StringBuffer();
-  //    char dFlag = ' ';
-  //    int numFormat = 10;
-  //
-  //    // save first digit
-  //    char firstCh = ch;
-  //    inum.append(ch);
-  //
-  //    getChar();
-  //    // determine number conversions:
-  //    if (firstCh == '0') {
-  //      switch (ch) {
-  //        case 'b' :
-  //          numFormat = 2;
-  //          getChar();
-  //          break;
-  //        case 'B' :
-  //          numFormat = 2;
-  //          getChar();
-  //          break;
-  //        case 'o' :
-  //          numFormat = 8;
-  //          getChar();
-  //          break;
-  //        case 'O' :
-  //          numFormat = 8;
-  //          getChar();
-  //          break;
-  //        case 'x' :
-  //          numFormat = 16;
-  //          getChar();
-  //          break;
-  //        case 'X' :
-  //          numFormat = 16;
-  //          getChar();
-  //          break;
-  //      }
-  //    }
-  //
-  //    if (numFormat == 16) {
-  //      while ((ch >= '0' && ch <= '9')
-  //        || (ch >= 'a' && ch <= 'f')
-  //        || (ch >= 'A' && ch <= 'F')) {
-  //        inum.append(ch);
-  //        getChar();
-  //      }
-  //    } else {
-  //      while ((ch >= '0' && ch <= '9')
-  //        || (ch == '.')
-  //        || (ch == 'E')
-  //        || (ch == 'e')) {
-  //        if ((ch == '.') || (ch == 'E') || (ch == 'e')) {
-  //          if (ch == '.' && dFlag != ' ') {
-  //            break;
-  //          }
-  //          if ((dFlag == 'E') || (dFlag == 'e')) {
-  //            break;
-  //          }
-  //          dFlag = ch;
-  //          inum.append(ch);
-  //          getChar();
-  //          if ((ch == '-') || (ch == '+')) {
-  //            inum.append(ch);
-  //            getChar();
-  //          }
-  //        } else {
-  //          inum.append(ch);
-  //          getChar();
-  //        }
-  //      }
-  //    }
-  //    chIndx--;
-  //
-  //    try {
-  //      if (dFlag != ' ') {
-  //        doubleNumber = new Double(inum.toString());
-  //        token = TokenNameDoubleLiteral;
-  //        return;
-  //      } else {
-  //        longNumber = Long.valueOf(inum.toString(), numFormat);
-  //        token = TokenNameIntegerLiteral;
-  //        return;
-  //      }
-  //
-  //    } catch (Throwable e) {
-  //      throwSyntaxError("Number format error: " + inum.toString());
-  //    }
-  //  }
-  //
-  //  /**
-  //   * Get a String.
-  //   * @param openChar the opening char ('\'', '"', '`')
-  //   * @param typeString the type of string {@link
-  // #TokenNameSTRING_CONSTANT},{@link #TokenNameINTERPOLATED_STRING}
-  //   * @param errorMsg the error message in case of parse error in the string
-  //   */
-  //  private void getString(
-  //    final char openChar,
-  //    final int typeString,
-  //    final String errorMsg) {
-  //    StringBuffer sBuffer = new StringBuffer();
-  //    boolean openString = true;
-  //    int startRow = rowCount;
-  //    while (str.length() > chIndx) {
-  //      ch = str.charAt(chIndx++);
-  //      if (ch == '\\') {
-  //        sBuffer.append(ch);
-  //        if (str.length() > chIndx) {
-  //          ch = str.charAt(chIndx++);
-  //          sBuffer.append(ch);
-  //        }
-  //      } else if (ch == openChar) {
-  //        openString = false;
-  //        break;
-  //      } else if (ch == '\n') {
-  //        rowCount++;
-  //        columnCount = chIndx;
-  //      } else {
-  //        sBuffer.append(ch);
-  //      }
-  //    }
-  //    if (openString) {
-  //      if (typeString == TokenNameStringConstant) {
-  //        throwSyntaxError(errorMsg, startRow);
-  //      } else {
-  //        throwSyntaxError(errorMsg);
-  //      }
-  //    }
-  //    token = typeString;
-  //    stringValue = sBuffer.toString();
-  //  }
-  //	public void htmlParserTester(String input) {
-  //		int lineNumber = 1;
-  //		int startLineNumber = 1;
-  //		int startIndex = 0;
-  //		char ch;
-  //		char ch2;
-  //		boolean phpMode = false;
-  //		boolean phpFound = false;
-  //
-  //		phpList = new ArrayList();
-  //		currentPHPString = 0;
-  //
-  //		try {
-  //			int i = 0;
-  //			while (i < input.length()) {
-  //				ch = input.charAt(i++);
-  //				if (ch == '\n') {
-  //					lineNumber++;
-  //				}
-  //				if ((!phpMode) && ch == '<') {
-  //					ch2 = input.charAt(i++);
-  //					if (ch2 == '?') {
-  //						ch2 = input.charAt(i++);
-  //						if (Character.isWhitespace(ch2)) {
-  //							// php start
-  //							phpMode = true;
-  //							phpFound = true;
-  //							startIndex = i;
-  //							startLineNumber = lineNumber;
-  //							continue;
-  //						} else if (ch2 == 'p') {
-  //							ch2 = input.charAt(i++);
-  //							if (ch2 == 'h') {
-  //								ch2 = input.charAt(i++);
-  //								if (ch2 == 'p') {
-  //									phpMode = true;
-  //									phpFound = true;
-  //									startIndex = i;
-  //									startLineNumber = lineNumber;
-  //									continue;
-  //								}
-  //								i--;
-  //							}
-  //							i--;
-  //						} else if (ch2 == 'P') {
-  //							ch2 = input.charAt(i++);
-  //							if (ch2 == 'H') {
-  //								ch2 = input.charAt(i++);
-  //								if (ch2 == 'P') {
-  //									phpMode = true;
-  //									phpFound = true;
-  //									startIndex = i;
-  //									startLineNumber = lineNumber;
-  //									continue;
-  //								}
-  //								i--;
-  //							}
-  //							i--;
-  //						}
-  //						i--;
-  //					}
-  //					i--;
-  //				}
-  //
-  //				if (phpMode) {
-  //					if (ch == '/' && i < input.length()) {
-  //						ch2 = input.charAt(i++);
-  //						if (ch2 == '/') {
-  //							while (i < input.length()) {
-  //								ch = input.charAt(i++);
-  //								if (ch == '?' && i < input.length()) {
-  //									ch2 = input.charAt(i++);
-  //									if (ch2 == '>') {
-  //										// php end
-  //										phpMode = false;
-  //										phpList.add(
-  //											new PHPString(
-  //												input.substring(
-  //													startIndex,
-  //													i - 2),
-  //												startLineNumber));
-  //										continue;
-  //									}
-  //									i--;
-  //								} else if (ch == '\n') {
-  //									lineNumber++;
-  //									break;
-  //								}
-  //							}
-  //							continue;
-  //						} else if (ch2 == '*') {
-  //							// multi-line comment
-  //							while (i < input.length()) {
-  //								ch = input.charAt(i++);
-  //								if (ch == '\n') {
-  //									lineNumber++;
-  //								} else if (ch == '*' && i < input.length()) {
-  //									ch2 = input.charAt(i++);
-  //									if (ch2 == '/') {
-  //										break;
-  //									}
-  //									i--;
-  //								}
-  //							}
-  //							continue;
-  //						} else {
-  //							i--;
-  //						}
-  //					} else if (ch == '#') {
-  //						while (i < input.length()) {
-  //							ch = input.charAt(i++);
-  //							if (ch == '?' && i < input.length()) {
-  //								ch2 = input.charAt(i++);
-  //								if (ch2 == '>') {
-  //									// php end
-  //									phpMode = false;
-  //									phpList.add(
-  //										new PHPString(
-  //											input.substring(startIndex, i - 2),
-  //											startLineNumber));
-  //									continue;
-  //								}
-  //								i--;
-  //							} else if (ch == '\n') {
-  //								lineNumber++;
-  //								break;
-  //							}
-  //						}
-  //						continue;
-  //					} else if (ch == '"') {
-  //						ch = ' ';
-  //						while (i < input.length()) {
-  //							ch = input.charAt(i++);
-  //							if (ch == '\n') {
-  //								lineNumber++;
-  //							} else if (
-  //								ch == '\\' && i < input.length()) { // escape
-  //								i++;
-  //							} else if (ch == '"') {
-  //								break;
-  //							}
-  //						}
-  //						continue;
-  //					} else if (ch == '\'') {
-  //						ch = ' ';
-  //						while (i < input.length()) {
-  //							ch = input.charAt(i++);
-  //							if (ch == '\n') {
-  //								lineNumber++;
-  //							} else if (
-  //								ch == '\\' && i < input.length()) { // escape
-  //								i++;
-  //							} else if (ch == '\'') {
-  //								break;
-  //							}
-  //						}
-  //						continue;
-  //					}
-  //
-  //					if (ch == '?' && i < input.length()) {
-  //						ch2 = input.charAt(i++);
-  //						if (ch2 == '>') {
-  //							// php end
-  //							phpMode = false;
-  //							phpList.add(
-  //								new PHPString(
-  //									input.substring(startIndex, i - 2),
-  //									startLineNumber));
-  //							continue;
-  //						}
-  //						i--;
-  //					}
-  //				}
-  //			}
-  //
-  //			if (!phpFound) {
-  //				setMarker(
-  //					"No PHP source code found.",
-  //					lineNumber,
-  //					PHPParser.INFO);
-  //			} else {
-  //				if (phpMode) {
-  //					setMarker(
-  //						"Open PHP tag at end of file.",
-  //						lineNumber,
-  //						PHPParser.INFO);
-  //					phpList.add(
-  //						new PHPString(
-  //							input.substring(startIndex, i - 2),
-  //							startLineNumber));
-  //				}
-  //				// for (int j=0;j<phpList.size();j++) {
-  //				// String temp = ((PHPString)phpList.get(j)).getPHPString();
-  //				// int startIndx = temp.length()-10;
-  //				// if (startIndx<0) {
-  //				// startIndx = 0;
-  //				// }
-  //				// System.out.println(temp.substring(startIndx)+"?>");
-  //				// }
-  //				phpParserTester(null, 1);
-  //				// PHPString temp;
-  //				// for(int j=0;j<phpList.size();j++) {
-  //				// temp = (PHPString) phpList.get(j);
-  //				// parser.start(temp.getPHPString(), temp.getLineNumber());
-  //				// }
-  //			}
-  //		} catch (CoreException e) {
-  //		}
-  //	}
-//  public void phpParserTester(String s, int rowCount) {
-//    this.str = s;
-//    if (s == null) {
-//      if (phpList.size() != 0) {
-//        this.str = ((PHPString) phpList.get(currentPHPString++)).getPHPString();
-//      }
-//    }
-//    this.token = TokenNameEOF;
-//    //    this.chIndx = 0;
-//    //    this.rowCount = rowCount;
-//    //    this.columnCount = 0;
-//    this.phpEnd = false;
-//    this.phpMode = true;
-//    scanner.setSource(s.toCharArray());
-//    scanner.setPHPMode(true);
-//    getNextToken();
-//    do {
-//      try {
-//        if (token != TokenNameEOF && token != TokenNameERROR) {
-//          statementList();
-//        }
-//        if (token != TokenNameEOF) {
-//          if (token == TokenNameERROR) {
-//            throwSyntaxError("Scanner error (Found unknown token: "
-//                + scanner.toStringAction(token) + ")");
-//          }
-//          if (token == TokenNameRPAREN) {
-//            throwSyntaxError("Too many closing ')'; end-of-file not reached.");
-//          }
-//          if (token == TokenNameRBRACE) {
-//            throwSyntaxError("Too many closing '}'; end-of-file not reached.");
-//          }
-//          if (token == TokenNameRBRACKET) {
-//            throwSyntaxError("Too many closing ']'; end-of-file not reached.");
-//          }
-//          if (token == TokenNameLPAREN) {
-//            throwSyntaxError("Read character '('; end-of-file not reached.");
-//          }
-//          if (token == TokenNameLBRACE) {
-//            throwSyntaxError("Read character '{';  end-of-file not reached.");
-//          }
-//          if (token == TokenNameLBRACKET) {
-//            throwSyntaxError("Read character '[';  end-of-file not reached.");
-//          }
-//          throwSyntaxError("End-of-file not reached.");
-//        }
-//        return;
-//      } catch (SyntaxError err) {
-//        if (s != null) {
-//          throw err;
-//        } else {
-//          //   setMarker(err.getMessage(), err.getLine(), ERROR);
-//          //          setMarker(err.getMessage(),
-//          // scanner.getCurrentTokenStartPosition(),
-//          // scanner.getCurrentTokenEndPosition(), ERROR);
-//        }
-//        // 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) {
-//          return;
-//        }
-//      }
-//    } while (true);
-//  }
   public void init(String s) {
     this.str = s;
     this.token = TokenNameEOF;
@@ -633,21 +225,26 @@ public class Parser //extends PHPParserSuperclass
     //    this.rowCount = 1;
     //    this.columnCount = 0;
     this.phpEnd = false;
-//    this.phpMode = false;
+    //    this.phpMode = false;
     /* scanner initialization */
     scanner.setSource(s.toCharArray());
     scanner.setPHPMode(false);
   }
   protected void initialize(boolean phpMode) {
+    initialize(phpMode, null);
+  }
+  protected void initialize(boolean phpMode, IdentifierIndexManager indexManager) {
     compilationUnit = null;
     referenceContext = null;
+    includesList = new ArrayList();
+//    this.indexManager = indexManager;
     this.str = "";
     this.token = TokenNameEOF;
     //    this.chIndx = 0;
     //    this.rowCount = 1;
     //    this.columnCount = 0;
     this.phpEnd = false;
-//    this.phpMode = phpMode;
+    //    this.phpMode = phpMode;
     scanner.setPHPMode(phpMode);
   }
   /**
@@ -671,8 +268,7 @@ public class Parser //extends PHPParserSuperclass
         }
         if (token != TokenNameEOF) {
           if (token == TokenNameERROR) {
-            throwSyntaxError("Scanner error (Found unknown token: "
-                + scanner.toStringAction(token) + ")");
+            throwSyntaxError("Scanner error (Found unknown token: " + scanner.toStringAction(token) + ")");
           }
           if (token == TokenNameRPAREN) {
             throwSyntaxError("Too many closing ')'; end-of-file not reached.");
@@ -694,7 +290,7 @@ public class Parser //extends PHPParserSuperclass
           }
           throwSyntaxError("End-of-file not reached.");
         }
-        return;
+        break;
       } catch (SyntaxError sytaxErr1) {
         // setMarker(sytaxErr1.getMessage(), sytaxErr1.getLine(),
         // ERROR);
@@ -706,14 +302,13 @@ public class Parser //extends PHPParserSuperclass
           // 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) {
+            if (token == TokenNameabstract || token == TokenNamefinal || token == TokenNameclass || token == TokenNamefunction) {
               break;
             }
             getNextToken();
           }
           if (token == TokenNameEOF || token == TokenNameERROR) {
-            return;
+            break;
           }
         } catch (SyntaxError sytaxErr2) {
           //    setMarker(sytaxErr2.getMessage(), sytaxErr2.getLine(),
@@ -721,10 +316,49 @@ public class Parser //extends PHPParserSuperclass
           //          setMarker(sytaxErr2.getMessage(),
           // scanner.getCurrentTokenStartPosition(),
           // scanner.getCurrentTokenEndPosition(), ERROR);
-          return;
+          break;
         }
       }
     } while (true);
+
+    endParse(0);
+  }
+
+  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 (scanner.recordLineSeparator) {
+      compilationUnit.compilationResult.lineSeparatorPositions = scanner.getLineEnds();
+    }
+    if (scanner.taskTags != null) {
+      for (int i = 0; i < scanner.foundTaskCount; i++) {
+        problemReporter().task(new String(scanner.foundTaskTags[i]), new String(scanner.foundTaskMessages[i]),
+            scanner.foundTaskPriorities[i] == null ? null : new String(scanner.foundTaskPriorities[i]),
+            scanner.foundTaskPositions[i][0], scanner.foundTaskPositions[i][1]);
+      }
+    }
+    compilationUnit.imports = new ImportReference[includesList.size()];
+    for (int i = 0; i < includesList.size(); i++) {
+      compilationUnit.imports[i] = (ImportReference) includesList.get(i);
+    }
+    return compilationUnit;
   }
   //  public PHPOutlineInfo parseInfo(Object parent, String s) {
   //    PHPOutlineInfo outlineInfo = new PHPOutlineInfo(parent);
@@ -917,11 +551,9 @@ public class Parser //extends PHPParserSuperclass
   private void statementList() {
     do {
       statement(TokenNameEOF);
-      if ((token == TokenNameRBRACE) || (token == TokenNamecase)
-          || (token == TokenNamedefault) || (token == TokenNameelse)
-          || (token == TokenNameelseif) || (token == TokenNameendif)
-          || (token == TokenNameendfor) || (token == TokenNameendforeach)
-          || (token == TokenNameendwhile) || (token == TokenNameendswitch)
+      if ((token == TokenNameRBRACE) || (token == TokenNamecase) || (token == TokenNamedefault) || (token == TokenNameelse)
+          || (token == TokenNameelseif) || (token == TokenNameendif) || (token == TokenNameendfor)
+          || (token == TokenNameendforeach) || (token == TokenNameendwhile) || (token == TokenNameendswitch)
           || (token == TokenNameEOF) || (token == TokenNameERROR)) {
         return;
       }
@@ -974,7 +606,8 @@ public class Parser //extends PHPParserSuperclass
     //        concatenationExpression();
     //      }
     //      return;
-    //    } else if (token == TokenNamerequire || token == TokenNamerequire_once)
+    //    } else if (token == TokenNamerequire || token ==
+    // TokenNamerequire_once)
     // {
     //      getNextToken();
     //      //constant();
@@ -1081,16 +714,16 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
       if (token == TokenNameLBRACE) {
         getNextToken();
+        if (token != TokenNameRBRACE) {
+          statementList();
+        }
+        if (token == TokenNameRBRACE) {
+          getNextToken();
+        } else {
+          throwSyntaxError("'}' expected after 'do' keyword.");
+        }
       } else {
-        throwSyntaxError("'{' expected after 'do' keyword.");
-      }
-      if (token != TokenNameRBRACE) {
-        statementList();
-      }
-      if (token == TokenNameRBRACE) {
-        getNextToken();
-      } else {
-        throwSyntaxError("'}' expected after 'do' keyword.");
+        statement(TokenNameEOF);
       }
       if (token == TokenNamewhile) {
         getNextToken();
@@ -1130,7 +763,9 @@ public class Parser //extends PHPParserSuperclass
       } else {
         throwSyntaxError("'as' expected after 'foreach' exxpression.");
       }
-      variable();
+      //      variable();
+      foreach_variable();
+      foreach_optional_arg();
       if (token == TokenNameEQUAL_GREATER) {
         getNextToken();
         variable();
@@ -1142,8 +777,7 @@ public class Parser //extends PHPParserSuperclass
       }
       foreachStatement();
       return;
-    } else if (token == TokenNamecontinue || token == TokenNamebreak
-        || token == TokenNamereturn) {
+    } else if (token == TokenNamecontinue || token == TokenNamebreak || token == TokenNamereturn) {
       getNextToken();
       if (token != TokenNameSEMICOLON) {
         expr();
@@ -1208,7 +842,7 @@ public class Parser //extends PHPParserSuperclass
         getNextToken();
       }
       return;
-    }else if (token == TokenNameunset) {
+    } else if (token == TokenNameunset) {
       getNextToken();
       if (token == TokenNameLPAREN) {
         getNextToken();
@@ -1231,28 +865,27 @@ public class Parser //extends PHPParserSuperclass
       }
       return;
     } else if (token == TokenNamefunction) {
-      MethodDeclaration methodDecl = new MethodDeclaration(
-          this.compilationUnit.compilationResult);
-      methodDecl.declarationSourceStart = scanner
-          .getCurrentTokenStartPosition();
+      MethodDeclaration methodDecl = new MethodDeclaration(this.compilationUnit.compilationResult);
+      methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
+      methodDecl.modifiers = AccDefault;
       getNextToken();
       functionDefinition(methodDecl);
       return;
     } else if (token == TokenNametry) {
       getNextToken();
-if (token != TokenNameLBRACE) {
+      if (token != TokenNameLBRACE) {
         throwSyntaxError("'{' expected in 'try' statement.");
       }
       getNextToken();
       statementList();
-if (token != TokenNameRBRACE) {
+      if (token != TokenNameRBRACE) {
         throwSyntaxError("'}' expected in 'try' statement.");
       }
-getNextToken();
+      getNextToken();
       return;
     } else if (token == TokenNamecatch) {
-getNextToken();
-if (token != TokenNameLPAREN) {
+      getNextToken();
+      if (token != TokenNameLPAREN) {
         throwSyntaxError("'(' expected in 'catch' statement.");
       }
       getNextToken();
@@ -1261,39 +894,37 @@ if (token != TokenNameLPAREN) {
         throwSyntaxError("Variable expected in 'catch' statement.");
       }
       getNextToken();
-
-      if (token != TokenNameRBRACE) {
+      if (token != TokenNameRPAREN) {
         throwSyntaxError("')' expected in 'catch' statement.");
       }
       getNextToken();
-getNextToken();
-if (token != TokenNameLBRACE) {
+      if (token != TokenNameLBRACE) {
         throwSyntaxError("'{' expected in 'catch' statement.");
       }
       getNextToken();
-      statementList();
-if (token != TokenNameRBRACE) {
-        throwSyntaxError("'}' expected in 'catch' statement.");
+      if (token != TokenNameRBRACE) {
+        statementList();
+        if (token != TokenNameRBRACE) {
+          throwSyntaxError("'}' expected in 'catch' statement.");
+        }
       }
-getNextToken();
+      getNextToken();
       additional_catches();
       return;
     } else if (token == TokenNamethrow) {
       getNextToken();
-      
       expr();
       if (token == TokenNameSEMICOLON) {
         getNextToken();
       } else {
         throwSyntaxError("';' expected after 'throw' exxpression.");
       }
-      
       return;
-    } else if (token == TokenNamefinal || token == TokenNameabstract
-        || token == TokenNameclass || token == TokenNameinterface) {
-      TypeDeclaration typeDecl = new TypeDeclaration(
-          this.compilationUnit.compilationResult);
+    } 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);
@@ -1328,8 +959,7 @@ getNextToken();
         return;
       } else {
         if (token != TokenNameINLINE_HTML && token != TokenNameEOF) {
-          throwSyntaxError("';' expected after expression (Found token: "
-              + scanner.toStringAction(token) + ")");
+          throwSyntaxError("';' expected after expression (Found token: " + scanner.toStringAction(token) + ")");
         }
         getNextToken();
       }
@@ -1347,12 +977,10 @@ getNextToken();
         throwSyntaxError("Variable expected in 'catch' statement.");
       }
       getNextToken();
-
-      if (token != TokenNameRBRACE) {
+      if (token != TokenNameRPAREN) {
         throwSyntaxError("')' expected in 'catch' statement.");
       }
       getNextToken();
-      getNextToken();
       if (token != TokenNameLBRACE) {
         throwSyntaxError("'{' expected in 'catch' statement.");
       }
@@ -1364,7 +992,22 @@ getNextToken();
       getNextToken();
     }
   }
-
+  private void foreach_variable() {
+    //	w_variable
+    //| '&' w_variable
+    if (token == TokenNameAND) {
+      getNextToken();
+    }
+    w_variable();
+  }
+  private void foreach_optional_arg() {
+    //	/* empty */
+    //| T_DOUBLE_ARROW foreach_variable
+    if (token == TokenNameEQUAL_GREATER) {
+      getNextToken();
+      foreach_variable();
+    }
+  }
   private void global_var_list() {
     //  global_var_list:
     //	global_var_list ',' global_var
@@ -1452,23 +1095,21 @@ getNextToken();
       checkAndSetModifiers(AccInterface);
       getNextToken();
       typeDecl.modifiers = this.modifiers;
+      typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+      typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
       if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
-        typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-        typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
         typeDecl.name = scanner.getCurrentIdentifierSource();
         if (token > TokenNameKEYWORD) {
-          throwSyntaxError("Don't use a keyword for interface declaration ["
-              + scanner.toStringAction(token) + "].", typeDecl.sourceStart,
-              typeDecl.sourceEnd);
+          problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+              referenceContext, compilationUnit.compilationResult);
+//          throwSyntaxError("Don't use a keyword for interface declaration [" + scanner.toStringAction(token) + "].",
+//              typeDecl.sourceStart, typeDecl.sourceEnd);
         }
         getNextToken();
         interface_extends_list();
       } else {
-        typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-        typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
         typeDecl.name = new char[]{' '};
-        throwSyntaxError("Interface name expected after keyword 'interface'.",
-            typeDecl.sourceStart, typeDecl.sourceEnd);
+        throwSyntaxError("Interface name expected after keyword 'interface'.", typeDecl.sourceStart, typeDecl.sourceEnd);
         return;
       }
     } else {
@@ -1477,38 +1118,36 @@ getNextToken();
       //		'{' class_statement_list'}'
       class_entry_type();
       typeDecl.modifiers = this.modifiers;
+      typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+      typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
       //identifier
       //identifier 'extends' identifier
       if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
-        typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-        typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
         typeDecl.name = scanner.getCurrentIdentifierSource();
         if (token > TokenNameKEYWORD) {
-          throwSyntaxError("Don't use a keyword for class declaration ["
-              + scanner.toStringAction(token) + "].", typeDecl.sourceStart,
-              typeDecl.sourceEnd);
+          problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+              referenceContext, compilationUnit.compilationResult);
+//          throwSyntaxError("Don't use a keyword for class declaration [" + scanner.toStringAction(token) + "].",
+//              typeDecl.sourceStart, typeDecl.sourceEnd);
         }
         getNextToken();
         //    extends_from:
         //		/* empty */
         //	| T_EXTENDS fully_qualified_class_name
         if (token == TokenNameextends) {
-          getNextToken();
-          if (token == TokenNameIdentifier) {
-            getNextToken();
-          } else {
-            throwSyntaxError("Class name expected after keyword 'extends'.",
-                scanner.getCurrentTokenStartPosition(), scanner
-                    .getCurrentTokenEndPosition());
-          }
+          interface_extends_list();
+          //          getNextToken();
+          //          if (token != TokenNameIdentifier) {
+          //            throwSyntaxError("Class name expected after keyword
+          // 'extends'.",
+          //                scanner.getCurrentTokenStartPosition(), scanner
+          //                    .getCurrentTokenEndPosition());
+          //          }
         }
         implements_list();
       } else {
-        typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-        typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
         typeDecl.name = new char[]{' '};
-        throwSyntaxError("Class name expected after keyword 'class'.",
-            typeDecl.sourceStart, typeDecl.sourceEnd);
+        throwSyntaxError("Class name expected after keyword 'class'.", typeDecl.sourceStart, typeDecl.sourceEnd);
         return;
       }
     }
@@ -1516,7 +1155,12 @@ getNextToken();
     if (token == TokenNameLBRACE) {
       getNextToken();
       if (token != TokenNameRBRACE) {
-        class_statement_list();
+        ArrayList list = new ArrayList();
+        class_statement_list(list);
+        typeDecl.fields = new FieldDeclaration[list.size()];
+        for (int i = 0; i < list.size(); i++) {
+          typeDecl.fields[i] = (FieldDeclaration) list.get(i);
+        }
       }
       if (token == TokenNameRBRACE) {
         typeDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
@@ -1601,39 +1245,43 @@ getNextToken();
   //      throwSyntaxError("'{' expected at start of class body.");
   //    }
   //  }
-  private void class_statement_list() {
+  private void class_statement_list(ArrayList list) {
     do {
-      class_statement();
-    } while (token == TokenNamepublic || token == TokenNameprotected
-        || token == TokenNameprivate || token == TokenNamestatic
-        || token == TokenNameabstract || token == TokenNamefinal
-        || token == TokenNamefunction || token == TokenNamevar);
+      class_statement(list);
+    } while (token == TokenNamepublic || token == TokenNameprotected || token == TokenNameprivate || token == TokenNamestatic
+        || token == TokenNameabstract || token == TokenNamefinal || token == TokenNamefunction || token == TokenNamevar
+        || token == TokenNameconst);
   }
-  private void class_statement() {
+  private void class_statement(ArrayList list) {
     //    class_statement:
     //		variable_modifiers class_variable_declaration ';'
     //	| class_constant_declaration ';'
     //	| method_modifiers T_FUNCTION is_reference T_STRING
     //    '(' parameter_list ')' method_body
     initializeModifiers();
+    int declarationSourceStart = scanner.getCurrentTokenStartPosition();
+    
     if (token == TokenNamevar) {
       checkAndSetModifiers(AccPublic);
-      problemReporter.phpVarDeprecatedWarning(scanner
-          .getCurrentTokenStartPosition(),
-          scanner.getCurrentTokenEndPosition(), referenceContext,
-          compilationUnit.compilationResult);
+      problemReporter.phpVarDeprecatedWarning(scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+          referenceContext, compilationUnit.compilationResult);
+      getNextToken();
+      class_variable_declaration(declarationSourceStart, list);
+    } else if (token == TokenNameconst) {
+      checkAndSetModifiers(AccFinal|AccPublic);
+      class_constant_declaration(declarationSourceStart, list);
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after class const declaration.");
+      }
       getNextToken();
-      class_variable_declaration();
     } else {
       boolean hasModifiers = member_modifiers();
       if (token == TokenNamefunction) {
         if (!hasModifiers) {
           checkAndSetModifiers(AccPublic);
         }
-        MethodDeclaration methodDecl = new MethodDeclaration(
-            this.compilationUnit.compilationResult);
-        methodDecl.declarationSourceStart = scanner
-            .getCurrentTokenStartPosition();
+        MethodDeclaration methodDecl = new MethodDeclaration(this.compilationUnit.compilationResult);
+        methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
         methodDecl.modifiers = this.modifiers;
         getNextToken();
         functionDefinition(methodDecl);
@@ -1641,22 +1289,41 @@ getNextToken();
         if (!hasModifiers) {
           throwSyntaxError("'public' 'private' or 'protected' modifier expected for field declarations.");
         }
-        class_variable_declaration();
+        class_variable_declaration(declarationSourceStart, list);
       }
     }
-    //    if (token == TokenNamefunction) {
-    //      MethodDeclaration methodDecl = new MethodDeclaration(
-    //          this.compilationUnit.compilationResult);
-    //      methodDecl.declarationSourceStart = scanner
-    //          .getCurrentTokenStartPosition();
-    //      getNextToken();
-    //      functionDefinition(methodDecl);
-    //    } else if (token == TokenNamevar) {
-    //      getNextToken();
-    //      classProperty();
-    //    } else {
-    //      throwSyntaxError("'function' or 'var' expected.");
-    //    }
+  }
+  private void class_constant_declaration(int declarationSourceStart, ArrayList list) {
+    //	class_constant_declaration ',' T_STRING '=' static_scalar
+    //	| T_CONST T_STRING '=' static_scalar
+    if (token != TokenNameconst) {
+      throwSyntaxError("'const' keyword expected in class declaration.");
+    } else {
+      getNextToken();
+    }
+    while (true) {
+      if (token != TokenNameIdentifier) {
+        throwSyntaxError("Identifier expected in class const declaration.");
+      }
+      FieldDeclaration fieldDeclaration = new FieldDeclaration(scanner.getCurrentIdentifierSource(), scanner
+          .getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition());
+      fieldDeclaration.modifiers = this.modifiers;
+      fieldDeclaration.declarationSourceStart = declarationSourceStart;
+      fieldDeclaration.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+      fieldDeclaration.modifiersSourceStart = declarationSourceStart;
+      //        fieldDeclaration.type
+      list.add(fieldDeclaration);
+      getNextToken();
+      if (token != TokenNameEQUAL) {
+        throwSyntaxError("'=' expected in class const declaration.");
+      }
+      getNextToken();
+      static_scalar();
+      if (token != TokenNameCOMMA) {
+        break; // while(true)-loop
+      }
+      getNextToken();
+    }
   }
   //  private void variable_modifiers() {
   //    // variable_modifiers:
@@ -1666,7 +1333,8 @@ getNextToken();
   //    if (token == TokenNamevar) {
   //      checkAndSetModifiers(AccPublic);
   //      reportSyntaxError(
-  //          "Keyword 'var' is deprecated. Please use 'public' 'private' or 'protected'
+  //          "Keyword 'var' is deprecated. Please use 'public' 'private' or
+  // 'protected'
   // modifier for field declarations.",
   //          scanner.getCurrentTokenStartPosition(), scanner
   //              .getCurrentTokenEndPosition());
@@ -1726,14 +1394,25 @@ getNextToken();
     }
     return foundToken;
   }
-  private void class_variable_declaration() {
+  private void class_variable_declaration(int declarationSourceStart, ArrayList list) {
     //    class_variable_declaration:
     //		class_variable_declaration ',' T_VARIABLE
     //	| class_variable_declaration ',' T_VARIABLE '=' static_scalar
     //	| T_VARIABLE
     //	| T_VARIABLE '=' static_scalar
+    char[] classVariable;
     do {
       if (token == TokenNameVariable) {
+        classVariable = scanner.getCurrentIdentifierSource();
+      //  indexManager.addIdentifierInformation('v', classVariable, buf, -1, -1);
+        FieldDeclaration fieldDeclaration = new FieldDeclaration(classVariable, scanner
+            .getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition());
+        fieldDeclaration.modifiers = this.modifiers;
+        fieldDeclaration.declarationSourceStart = declarationSourceStart;
+        fieldDeclaration.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+        fieldDeclaration.modifiersSourceStart = declarationSourceStart;
+        //        fieldDeclaration.type
+        list.add(fieldDeclaration);
         getNextToken();
         if (token == TokenNameEQUAL) {
           getNextToken();
@@ -1757,6 +1436,7 @@ getNextToken();
     getNextToken();
   }
   private void functionDefinition(MethodDeclaration methodDecl) {
+    boolean isAbstract = false;
     if (astPtr == 0) {
       compilationUnit.types.add(methodDecl);
     } else {
@@ -1767,18 +1447,26 @@ getNextToken();
           typeDecl.methods = new AbstractMethodDeclaration[]{methodDecl};
         } else {
           AbstractMethodDeclaration[] newMethods;
-          System
-              .arraycopy(
-                  typeDecl.methods,
-                  0,
-                  newMethods = new AbstractMethodDeclaration[typeDecl.methods.length + 1],
-                  1, typeDecl.methods.length);
+          System.arraycopy(typeDecl.methods, 0, newMethods = new AbstractMethodDeclaration[typeDecl.methods.length + 1], 1,
+              typeDecl.methods.length);
           newMethods[0] = methodDecl;
           typeDecl.methods = newMethods;
         }
+        if ((typeDecl.modifiers & AccAbstract) == AccAbstract) {
+          isAbstract = true;
+        } else if ((typeDecl.modifiers & AccInterface) == AccInterface) {
+          isAbstract = true;
+        }
       }
     }
     functionDeclarator(methodDecl);
+    if (token == TokenNameSEMICOLON) {
+      if (!isAbstract) {
+        throwSyntaxError("Body declaration expected for method: " + new String(methodDecl.selector));
+      }
+      getNextToken();
+      return;
+    }
     functionBody(methodDecl);
   }
   private void functionDeclarator(MethodDeclaration methodDecl) {
@@ -1786,10 +1474,16 @@ getNextToken();
     if (token == TokenNameAND) {
       getNextToken();
     }
-    if (token == TokenNameIdentifier) {
-      methodDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-      methodDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+    methodDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+    methodDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+    if (Scanner.isIdentifierOrKeyword(token)) {
       methodDecl.selector = scanner.getCurrentIdentifierSource();
+      if (token > TokenNameKEYWORD) {
+        problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+            referenceContext, compilationUnit.compilationResult);
+//        reportSyntaxWarning("Don't use keyword for function declaration [" + scanner.toStringAction(token) + "].",
+//          scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition());
+      }
       getNextToken();
       if (token == TokenNameLPAREN) {
         getNextToken();
@@ -1797,7 +1491,7 @@ getNextToken();
         throwSyntaxError("'(' expected in function declaration.");
       }
       if (token != TokenNameRPAREN) {
-        parameterList();
+        parameter_list(); 
       }
       if (token != TokenNameRPAREN) {
         throwSyntaxError("')' expected in function declaration.");
@@ -1806,24 +1500,58 @@ getNextToken();
         getNextToken();
       }
     } else {
-      if (token > TokenNameKEYWORD) {
-        throwSyntaxError("Don't use keyword for function declaration [" + token
-            + "].");
-      }
+      methodDecl.selector = "<undefined>".toCharArray();
       throwSyntaxError("Function name expected after keyword 'function'.");
     }
   }
   //
-  private void parameterList() {
-    //parameter-declaration
-    //parameter-list ',' parameter-declaration
-    do {
-      parameterDeclaration();
-      if (token != TokenNameCOMMA) {
-        break;
+  private void parameter_list() {
+    //	non_empty_parameter_list
+    //	| /* empty */
+    non_empty_parameter_list(true);
+  }
+  private void non_empty_parameter_list(boolean empty_allowed) {
+    //	optional_class_type T_VARIABLE
+    //	| optional_class_type '&' T_VARIABLE
+    //	| optional_class_type '&' T_VARIABLE '=' static_scalar
+    //	| optional_class_type T_VARIABLE '=' static_scalar
+    //	| non_empty_parameter_list ',' optional_class_type T_VARIABLE
+    //	| non_empty_parameter_list ',' optional_class_type '&' T_VARIABLE
+    //	| non_empty_parameter_list ',' optional_class_type '&' T_VARIABLE '='
+    // static_scalar
+    //	| non_empty_parameter_list ',' optional_class_type T_VARIABLE '='
+    // static_scalar
+    if (token == TokenNameIdentifier || token == TokenNameVariable || token == TokenNameAND) {
+      while (true) {
+        if (token == TokenNameIdentifier) {
+          getNextToken();
+        }
+        if (token == TokenNameAND) {
+          getNextToken();
+        }
+        if (token == TokenNameVariable) {
+          getNextToken();
+          if (token == TokenNameEQUAL) {
+            getNextToken();
+            static_scalar();
+          }
+        } else {
+          throwSyntaxError("Variable expected in parameter list.");
+        }
+        if (token != TokenNameCOMMA) {
+          break;
+        }
+        getNextToken();
       }
-      getNextToken();
-    } while (true);
+      return;
+    }
+    if (!empty_allowed) {
+      throwSyntaxError("Identifier expected in parameter list.");
+    }
+  }
+  private void optional_class_type() {
+    //	/* empty */
+    //| T_STRING
   }
   private void parameterDeclaration() {
     //variable
@@ -1860,10 +1588,8 @@ getNextToken();
         expr(); //constant();
         if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
           getNextToken();
-          if (token == TokenNamecase || token == TokenNamedefault) { // empty
-            // case
-            // statement
-            // ?
+          if (token == TokenNamecase || token == TokenNamedefault) {
+            // empty case statement ?
             continue;
           }
           statementList();
@@ -1882,16 +1608,21 @@ getNextToken();
         //          statementList();
         //        }
         else {
-          throwSyntaxError("':' character after 'case' constant expected (Found token: "
-              + scanner.toStringAction(token) + ")");
+          throwSyntaxError("':' character expected after 'case' constant (Found token: " + scanner.toStringAction(token) + ")");
         }
       } else { // TokenNamedefault
         getNextToken();
         if (token == TokenNameCOLON) {
           getNextToken();
-          statementList();
+          if (token == TokenNameRBRACE) {
+            // empty default case
+            break;
+          }
+          if (token != TokenNamecase) {
+            statementList();  
+          }
         } else {
-          throwSyntaxError("':' character after 'default' expected.");
+          throwSyntaxError("':' character expected after 'default'.");
         }
       }
     } while (token == TokenNamecase || token == TokenNamedefault);
@@ -2290,15 +2021,64 @@ getNextToken();
       //	T_STRING
       //| T_STRING_VARNAME
       //| class_constant
-      //| '"' encaps_list '"'
-      //| '\'' encaps_list '\''
       //| 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();
+        try {
+          if (token == TokenNameEncapsedString1) {
+          } else {
+            encaps_list();
+            if (token != TokenNameEncapsedString1) {
+              throwSyntaxError("\'\'\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
+            }
+          }
+        } 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) + " )");
+            }
+          }
+        } finally {
+          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        break;
       case TokenNameIntegerLiteral :
       case TokenNameDoubleLiteral :
-      case TokenNameStringLiteral :
-      case TokenNameStringConstant :
+      case TokenNameStringDoubleQuote :
+      case TokenNameStringSingleQuote :
       case TokenNameStringInterpolated :
       case TokenNameFILE :
       case TokenNameLINE :
@@ -2321,13 +2101,11 @@ getNextToken();
           }
           array_pair_list();
           if (token != TokenNameRPAREN) {
-            throwSyntaxError("')' expected after keyword 'array'"
-                + "(Found token: " + scanner.toStringAction(token) + ")");
+            throwSyntaxError("')' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
           }
           getNextToken();
         } else {
-          throwSyntaxError("'(' expected after keyword 'array'"
-              + "(Found token: " + scanner.toStringAction(token) + ")");
+          throwSyntaxError("'(' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
         }
         break;
       case TokenNamelist :
@@ -2388,10 +2166,11 @@ getNextToken();
             if (token == TokenNameAND) {
               getNextToken();
               if (token == TokenNamenew) {
+                // | variable '=' '&' T_NEW class_name_reference
+                // ctor_arguments
                 getNextToken();
-                throwSyntaxError("not yet implemented (= & new)");
-                //                class_name_reference();
-                //                ctor_arguments();
+                class_name_reference();
+                ctor_arguments();
               } else {
                 variable();
               }
@@ -2419,15 +2198,18 @@ getNextToken();
             break;
           default :
             if (!only_variable) {
-              throwSyntaxError("Variable expression not allowed (found token '"
-                  + scanner.toStringAction(token) + "').");
+              throwSyntaxError("Variable expression not allowed (found token '" + scanner.toStringAction(token) + "').");
             }
         }
         break;
       default :
         if (token != TokenNameINLINE_HTML) {
-          throwSyntaxError("Error in expression (found token '"
-              + scanner.toStringAction(token) + "').");
+          if (token > TokenNameKEYWORD) {
+            getNextToken();
+            break;
+          } else {
+            throwSyntaxError("Error in expression (found token '" + scanner.toStringAction(token) + "').");
+          }
         }
         return;
     }
@@ -2491,8 +2273,7 @@ getNextToken();
         //	| expr '?' expr ':' expr
         case TokenNameinstanceof :
           getNextToken();
-          throwSyntaxError("not yet implemented (class_name_reference)");
-          //            class_name_reference();
+          class_name_reference();
           break;
         case TokenNameQUESTION :
           getNextToken();
@@ -2630,18 +2411,22 @@ getNextToken();
     //| expr T_DOUBLE_ARROW '&' w_variable
     //| '&' w_variable
     while (true) {
-      expr();
       if (token == TokenNameAND) {
         getNextToken();
         variable();
-        return;
-      } else if (token == TokenNameEQUAL_GREATER) {
-        getNextToken();
+      } else {
+        expr();
         if (token == TokenNameAND) {
           getNextToken();
           variable();
-        } else {
-          expr();
+        } else if (token == TokenNameEQUAL_GREATER) {
+          getNextToken();
+          if (token == TokenNameAND) {
+            getNextToken();
+            variable();
+          } else {
+            expr();
+          }
         }
       }
       if (token != TokenNameCOMMA) {
@@ -2653,16 +2438,16 @@ getNextToken();
       }
     }
   }
-//  private void variableList() {
-//    do {
-//      variable();
-//      if (token == TokenNameCOMMA) {
-//        getNextToken();
-//      } else {
-//        break;
-//      }
-//    } while (true);
-//  }
+  //  private void variableList() {
+  //    do {
+  //      variable();
+  //      if (token == TokenNameCOMMA) {
+  //        getNextToken();
+  //      } else {
+  //        break;
+  //      }
+  //    } while (true);
+  //  }
   private void variable_without_objects() {
     //  variable_without_objects:
     //  		reference_variable
@@ -2681,14 +2466,23 @@ getNextToken();
     //| class_constant '(' function_call_parameter_list ')'
     //| static_member '(' function_call_parameter_list ')'
     //| variable_without_objects '(' function_call_parameter_list ')'
+    char[] defineName = null;
+    char[] ident = null;
+    int startPos=0;
+    int endPos=0;
     if (Scanner.TRACE) {
       System.out.println("TRACE: function_call()");
     }
     if (token == TokenNameIdentifier) {
+      ident = scanner.getCurrentIdentifierSource();
+      defineName = ident;
+      startPos = scanner.getCurrentTokenStartPosition();
+      endPos = scanner.getCurrentTokenEndPosition();
       getNextToken();
       switch (token) {
         case TokenNamePAAMAYIM_NEKUDOTAYIM :
           // static member:
+          defineName = null;
           getNextToken();
           if (token == TokenNameIdentifier) {
             // class _constant
@@ -2703,6 +2497,45 @@ getNextToken();
       variable_without_objects();
     }
     if (token != TokenNameLPAREN) {
+      if (defineName!=null) {
+        // does this identifier contain only uppercase characters?
+        if (defineName.length==3) {
+          if (defineName[0]=='d' &&
+              defineName[1]=='i' &&
+              defineName[2]=='e' ) {
+            defineName=null;
+          } 
+        } else if (defineName.length==4) {
+          if (defineName[0]=='t' &&
+              defineName[1]=='r' &&
+              defineName[2]=='u' &&
+              defineName[3]=='e' ) {
+            defineName=null;
+          } else if (defineName[0]=='n' &&
+              defineName[1]=='u' &&
+              defineName[2]=='l' &&
+              defineName[3]=='l' ) {
+            defineName=null;
+          }
+        } else if (defineName.length==5) {
+          if (defineName[0]=='f' &&
+              defineName[1]=='a' &&
+              defineName[2]=='l' &&
+              defineName[3]=='s' &&
+              defineName[4]=='e' ) {
+            defineName=null;
+          }
+        }
+        if (defineName!=null) {
+          for (int i=0; i<defineName.length;i++) {
+            if (Character.isLowerCase(defineName[i])) {  
+              problemReporter.phpUppercaseIdentifierWarning(startPos, endPos,
+                referenceContext, compilationUnit.compilationResult);
+              break;
+            }
+          }
+        }
+      }
       // TODO is this ok ?
       return;
       //      throwSyntaxError("'(' expected in function call.");
@@ -2714,7 +2547,13 @@ getNextToken();
     }
     non_empty_function_call_parameter_list();
     if (token != TokenNameRPAREN) {
-      throwSyntaxError("')' expected in function call.");
+      String functionName;
+      if (ident==null) {
+        functionName = new String(" ");
+      } else {
+        functionName = new String(ident);
+      }
+      throwSyntaxError("')' expected in function call ("+functionName+").");
     }
     getNextToken();
   }
@@ -2739,12 +2578,13 @@ getNextToken();
         getNextToken();
         w_variable();
       } else {
-//        if (token == TokenNameIdentifier || token == TokenNameVariable
-//            || token == TokenNameDOLLAR) {
-//          variable();
-//        } else {
-          expr_without_variable(true);
-//        }
+        //        if (token == TokenNameIdentifier || token ==
+        // TokenNameVariable
+        //            || token == TokenNameDOLLAR) {
+        //          variable();
+        //        } else {
+        expr_without_variable(true);
+        //        }
       }
       if (token != TokenNameCOMMA) {
         break;
@@ -2781,24 +2621,24 @@ getNextToken();
     if (Scanner.TRACE) {
       System.out.println("TRACE: base_variable_with_function_calls()");
     }
-    if (token == TokenNameIdentifier) {
-      functionCall = true;
-    } else if (token == TokenNameVariable) {
-      int tempToken = token;
-      int tempPosition = scanner.currentPosition;
-      getNextToken();
-      if (token == TokenNameLPAREN) {
-        functionCall = true;
-      }
-      token = tempToken;
-      scanner.currentPosition = tempPosition;
-      scanner.phpMode = true;
-    }
-    if (functionCall) {
-      function_call();
-    } else {
-      base_variable();
-    }
+    //    if (token == TokenNameIdentifier) {
+    //      functionCall = true;
+    //    } else if (token == TokenNameVariable) {
+    //      int tempToken = token;
+    //      int tempPosition = scanner.currentPosition;
+    //      getNextToken();
+    //      if (token == TokenNameLPAREN) {
+    //        functionCall = true;
+    //      }
+    //      token = tempToken;
+    //      scanner.currentPosition = tempPosition;
+    //      scanner.phpMode = true;
+    //    }
+    //    if (functionCall) {
+    function_call();
+    //    } else {
+    //      base_variable();
+    //    }
   }
   private void base_variable() {
     //  base_variable:
@@ -2938,7 +2778,10 @@ getNextToken();
     if (Scanner.TRACE) {
       System.out.println("TRACE: variable_name()");
     }
-    if (token == TokenNameIdentifier) {
+    if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+      if (token > TokenNameKEYWORD) {
+        // TODO show a warning "Keyword used as variable" ?
+      }
       getNextToken();
     } else {
       if (token != TokenNameLBRACE) {
@@ -2949,6 +2792,7 @@ getNextToken();
       if (token != TokenNameRBRACE) {
         throwSyntaxError("'}' expected in variable name.");
       }
+      getNextToken();
     }
   }
   private void r_variable() {
@@ -3059,7 +2903,247 @@ getNextToken();
     }
     getNextToken();
   }
+  private void encaps_list() {
+    //  		encaps_list encaps_var
+    //  	| encaps_list T_STRING
+    //  	| encaps_list T_NUM_STRING
+    //  	| encaps_list T_ENCAPSED_AND_WHITESPACE
+    //  	| encaps_list T_CHARACTER
+    //  	| encaps_list T_BAD_CHARACTER
+    //  	| encaps_list '['
+    //  	| encaps_list ']'
+    //  	| encaps_list '{'
+    //  	| encaps_list '}'
+    //  	| encaps_list T_OBJECT_OPERATOR
+    //  	| /* empty */
+    while (true) {
+      switch (token) {
+        case TokenNameSTRING :
+          getNextToken();
+          break;
+        case TokenNameLBRACE :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameRBRACE :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameLBRACKET :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameRBRACKET :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameMINUS_GREATER :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameVariable :
+        case TokenNameDOLLAR_LBRACE :
+        case TokenNameCURLY_OPEN :
+          encaps_var();
+          break;
+        //        case TokenNameDOLLAR :
+        //          getNextToken();
+        //          if (token == TokenNameLBRACE) {
+        //            token = TokenNameDOLLAR_LBRACE;
+        //            encaps_var();
+        //          }
+        //          break;
+        default :
+          char encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
+          if (encapsedChar == '$') {
+            scanner.encapsedStringStack.pop();
+            encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
+            switch (encapsedChar) {
+              case '`' :
+                if (token == TokenNameEncapsedString0) {
+                  return;
+                }
+                token = TokenNameSTRING;
+                continue;
+              case '\'' :
+                if (token == TokenNameEncapsedString1) {
+                  return;
+                }
+                token = TokenNameSTRING;
+                continue;
+              case '"' :
+                if (token == TokenNameEncapsedString2) {
+                  return;
+                }
+                token = TokenNameSTRING;
+                continue;
+            }
+          }
+          return;
+      }
+    }
+  }
+  private void encaps_var() {
+    //  		T_VARIABLE
+    //  	| T_VARIABLE '[' encaps_var_offset ']'
+    //  	| T_VARIABLE T_OBJECT_OPERATOR T_STRING
+    //  	| T_DOLLAR_OPEN_CURLY_BRACES expr '}'
+    //  	| T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}'
+    //  	| T_CURLY_OPEN variable '}'
+    switch (token) {
+      case TokenNameVariable :
+        getNextToken();
+        if (token == TokenNameLBRACKET) {
+          getNextToken();
+          //          if (token == TokenNameRBRACKET) {
+          //            getNextToken();
+          //          } else {
+          expr(); //encaps_var_offset();
+          if (token != TokenNameRBRACKET) {
+            throwSyntaxError("']' expected after variable.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          //          }
+        } else if (token == TokenNameMINUS_GREATER) {
+          getNextToken();
+          if (token != TokenNameIdentifier) {
+            throwSyntaxError("Identifier expected after '->'.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        //        else {
+        //          // scanner.encapsedStringStack.pop();
+        //          int tempToken = TokenNameSTRING;
+        //          if (!scanner.encapsedStringStack.isEmpty()
+        //              && (token == TokenNameEncapsedString0
+        //                  || token == TokenNameEncapsedString1
+        //                  || token == TokenNameEncapsedString2 || token ==
+        // TokenNameERROR)) {
+        //            char encapsedChar = ((Character)
+        // scanner.encapsedStringStack.peek())
+        //                .charValue();
+        //            switch (token) {
+        //              case TokenNameEncapsedString0 :
+        //                if (encapsedChar == '`') {
+        //                  tempToken = TokenNameEncapsedString0;
+        //                }
+        //                break;
+        //              case TokenNameEncapsedString1 :
+        //                if (encapsedChar == '\'') {
+        //                  tempToken = TokenNameEncapsedString1;
+        //                }
+        //                break;
+        //              case TokenNameEncapsedString2 :
+        //                if (encapsedChar == '"') {
+        //                  tempToken = TokenNameEncapsedString2;
+        //                }
+        //                break;
+        //              case TokenNameERROR :
+        //                if (scanner.source[scanner.currentPosition - 1] == '\\') {
+        //                  scanner.currentPosition--;
+        //                  getNextToken();
+        //                }
+        //                break;
+        //            }
+        //          }
+        //          token = tempToken;
+        //        }
+        break;
+      case TokenNameDOLLAR_LBRACE :
+        getNextToken();
+        if (token == TokenNameIdentifier) {
+          getNextToken();
+          if (token == TokenNameLBRACKET) {
+            getNextToken();
+            //            if (token == TokenNameRBRACKET) {
+            //              getNextToken();
+            //            } else {
+            expr();
+            if (token != TokenNameRBRACKET) {
+              throwSyntaxError("']' expected after '${'.");
+            }
+            getNextToken();
+            //            }
+          }
+          if (token != TokenNameRBRACE) {
+            throwSyntaxError("'}' expected after '${'.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+        } else {
+          expr();
+          if (token != TokenNameRBRACE) {
+            throwSyntaxError("'}' expected.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        break;
+      case TokenNameCURLY_OPEN :
+        getNextToken();
+        if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+          getNextToken();
+          if (token == TokenNameLBRACKET) {
+            getNextToken();
+            //            if (token == TokenNameRBRACKET) {
+            //              getNextToken();
+            //            } else {
+            expr();
+            if (token != TokenNameRBRACKET) {
+              throwSyntaxError("']' expected after '{$'.");
+            }
+            getNextToken();
+            //            }
+          } else if (token == TokenNameMINUS_GREATER) {
+            getNextToken();
+            if (token != TokenNameIdentifier) {
+              throwSyntaxError("String token expected.");
+            }
+            getNextToken();
+          }
+          //          if (token != TokenNameRBRACE) {
+          //            throwSyntaxError("'}' expected after '{$'.");
+          //          }
+          //          // scanner.encapsedStringStack.pop();
+          //          getNextToken();
+        } else {
+          expr();
+          if (token != TokenNameRBRACE) {
+            throwSyntaxError("'}' expected.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        break;
+    }
+  }
+  private void encaps_var_offset() {
+    //  		T_STRING
+    //  	| T_NUM_STRING
+    //  	| T_VARIABLE
+    switch (token) {
+      case TokenNameSTRING :
+        getNextToken();
+        break;
+      case TokenNameIntegerLiteral :
+        getNextToken();
+        break;
+      case TokenNameVariable :
+        getNextToken();
+        break;
+      case TokenNameIdentifier :
+        getNextToken();
+        break;
+      default :
+        throwSyntaxError("Variable or String token expected.");
+        break;
+    }
+  }
   private void internal_functions_in_yacc() {
+    int start = 0;
+    ImportReference impt = null;
     switch (token) {
       case TokenNameisset :
         //	T_ISSET '(' isset_variables ')'
@@ -3089,13 +3173,28 @@ 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);
         break;
       case TokenNameinclude_once :
         //	T_INCLUDE_ONCE expr
+        start = scanner.getCurrentTokenStartPosition();
         getNextToken();
         expr();
+        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
+        impt.declarationSourceEnd = impt.sourceEnd;
+        impt.declarationEnd = impt.declarationSourceEnd;
+        //endPosition is just before the ;
+        impt.declarationSourceStart = start;
+        includesList.add(impt);
         break;
       case TokenNameeval :
         //	T_EVAL '(' expr ')'
@@ -3112,13 +3211,27 @@ getNextToken();
         break;
       case TokenNamerequire :
         //T_REQUIRE expr
+        start = scanner.getCurrentTokenStartPosition();
         getNextToken();
         expr();
+        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
+        impt.declarationSourceEnd = impt.sourceEnd;
+        impt.declarationEnd = impt.declarationSourceEnd;
+        //endPosition is just before the ;
+        impt.declarationSourceStart = start;
+        includesList.add(impt);
         break;
       case TokenNamerequire_once :
         //	T_REQUIRE_ONCE expr
+        start = scanner.getCurrentTokenStartPosition();
         getNextToken();
         expr();
+        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
+        impt.declarationSourceEnd = impt.sourceEnd;
+        impt.declarationEnd = impt.declarationSourceEnd;
+        //endPosition is just before the ;
+        impt.declarationSourceStart = start;
+        includesList.add(impt);
         break;
     }
   }
@@ -3154,10 +3267,10 @@ getNextToken();
       case TokenNameDoubleLiteral :
         getNextToken();
         return true;
-      case TokenNameStringLiteral :
+      case TokenNameStringDoubleQuote :
         getNextToken();
         return true;
-      case TokenNameStringConstant :
+      case TokenNameStringSingleQuote :
         getNextToken();
         return true;
       case TokenNameStringInterpolated :
@@ -3217,6 +3330,48 @@ getNextToken();
           }
         }
         break;
+      case TokenNameEncapsedString0 :
+        try {
+          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          while (scanner.currentCharacter != '`') {
+            if (scanner.currentCharacter == '\\') {
+              scanner.currentPosition++;
+            }
+            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          }
+          getNextToken();
+        } catch (IndexOutOfBoundsException e) {
+          throwSyntaxError("'`' expected at end of static string.");
+        }
+        break;
+      case TokenNameEncapsedString1 :
+        try {
+          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          while (scanner.currentCharacter != '\'') {
+            if (scanner.currentCharacter == '\\') {
+              scanner.currentPosition++;
+            }
+            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          }
+          getNextToken();
+        } catch (IndexOutOfBoundsException e) {
+          throwSyntaxError("'\'' expected at end of static string.");
+        }
+        break;
+      case TokenNameEncapsedString2 :
+        try {
+          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          while (scanner.currentCharacter != '"') {
+            if (scanner.currentCharacter == '\\') {
+              scanner.currentPosition++;
+            }
+            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          }
+          getNextToken();
+        } catch (IndexOutOfBoundsException e) {
+          throwSyntaxError("'\"' expected at end of static string.");
+        }
+        break;
       case TokenNamePLUS :
         getNextToken();
         static_scalar();
@@ -3398,6 +3553,8 @@ getNextToken();
                                                       */
   protected ReferenceContext referenceContext;
   protected ProblemReporter problemReporter;
+  protected CompilerOptions options;
+  private ArrayList includesList;
   //  protected CompilationResult compilationResult;
   /**
    * Returns this parser's problem reporter initialized with its reference
@@ -3406,8 +3563,7 @@ getNextToken();
    */
   public ProblemReporter problemReporter() {
     if (scanner.recordLineSeparator) {
-      compilationUnit.compilationResult.lineSeparatorPositions = scanner
-          .getLineEnds();
+      compilationUnit.compilationResult.lineSeparatorPositions = scanner.getLineEnds();
     }
     problemReporter.referenceContext = referenceContext;
     return problemReporter;
@@ -3425,8 +3581,7 @@ getNextToken();
       int[] depths = {0, 0, 0};
       int[][] leftPositions = new int[][]{new int[10], new int[10], new int[10]};
       int[][] leftDepths = new int[][]{new int[10], new int[10], new int[10]};
-      int[][] rightPositions = new int[][]{new int[10], new int[10],
-          new int[10]};
+      int[][] rightPositions = new int[][]{new int[10], new int[10], new int[10]};
       int[][] rightDepths = new int[][]{new int[10], new int[10], new int[10]};
       scanner.currentPosition = scanner.initialPosition; //starting
       // point
@@ -3447,8 +3602,7 @@ getNextToken();
             // (source[scanner.currentPosition] == 'u')) {
             //							isWhiteSpace = scanner.jumpOverUnicodeWhiteSpace();
             //						} else {
-            if (scanner.recordLineSeparator
-                && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
+            if (scanner.recordLineSeparator && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
               if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
                 // only record line positions we have not
                 // recorded yet
@@ -3457,123 +3611,89 @@ getNextToken();
             }
             isWhiteSpace = CharOperation.isWhitespace(scanner.currentCharacter);
             //						}
-          } while (isWhiteSpace
-              && (scanner.currentPosition < scanner.eofPosition));
+          } while (isWhiteSpace && (scanner.currentPosition < scanner.eofPosition));
           // -------consume token until } is found---------
           switch (scanner.currentCharacter) {
-            case '{' :
-              {
-                int index = leftCount[CurlyBracket]++;
-                if (index == leftPositions[CurlyBracket].length) {
-                  System.arraycopy(leftPositions[CurlyBracket], 0,
-                      (leftPositions[CurlyBracket] = new int[index * 2]), 0,
-                      index);
-                  System
-                      .arraycopy(leftDepths[CurlyBracket], 0,
-                          (leftDepths[CurlyBracket] = new int[index * 2]), 0,
-                          index);
-                }
-                leftPositions[CurlyBracket][index] = scanner.startPosition;
-                leftDepths[CurlyBracket][index] = depths[CurlyBracket]++;
+            case '{' : {
+              int index = leftCount[CurlyBracket]++;
+              if (index == leftPositions[CurlyBracket].length) {
+                System.arraycopy(leftPositions[CurlyBracket], 0, (leftPositions[CurlyBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(leftDepths[CurlyBracket], 0, (leftDepths[CurlyBracket] = new int[index * 2]), 0, index);
               }
+              leftPositions[CurlyBracket][index] = scanner.startPosition;
+              leftDepths[CurlyBracket][index] = depths[CurlyBracket]++;
+            }
               break;
-            case '}' :
-              {
-                int index = rightCount[CurlyBracket]++;
-                if (index == rightPositions[CurlyBracket].length) {
-                  System.arraycopy(rightPositions[CurlyBracket], 0,
-                      (rightPositions[CurlyBracket] = new int[index * 2]), 0,
-                      index);
-                  System.arraycopy(rightDepths[CurlyBracket], 0,
-                      (rightDepths[CurlyBracket] = new int[index * 2]), 0,
-                      index);
-                }
-                rightPositions[CurlyBracket][index] = scanner.startPosition;
-                rightDepths[CurlyBracket][index] = --depths[CurlyBracket];
+            case '}' : {
+              int index = rightCount[CurlyBracket]++;
+              if (index == rightPositions[CurlyBracket].length) {
+                System.arraycopy(rightPositions[CurlyBracket], 0, (rightPositions[CurlyBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(rightDepths[CurlyBracket], 0, (rightDepths[CurlyBracket] = new int[index * 2]), 0, index);
               }
+              rightPositions[CurlyBracket][index] = scanner.startPosition;
+              rightDepths[CurlyBracket][index] = --depths[CurlyBracket];
+            }
               break;
-            case '(' :
-              {
-                int index = leftCount[RoundBracket]++;
-                if (index == leftPositions[RoundBracket].length) {
-                  System.arraycopy(leftPositions[RoundBracket], 0,
-                      (leftPositions[RoundBracket] = new int[index * 2]), 0,
-                      index);
-                  System
-                      .arraycopy(leftDepths[RoundBracket], 0,
-                          (leftDepths[RoundBracket] = new int[index * 2]), 0,
-                          index);
-                }
-                leftPositions[RoundBracket][index] = scanner.startPosition;
-                leftDepths[RoundBracket][index] = depths[RoundBracket]++;
+            case '(' : {
+              int index = leftCount[RoundBracket]++;
+              if (index == leftPositions[RoundBracket].length) {
+                System.arraycopy(leftPositions[RoundBracket], 0, (leftPositions[RoundBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(leftDepths[RoundBracket], 0, (leftDepths[RoundBracket] = new int[index * 2]), 0, index);
               }
+              leftPositions[RoundBracket][index] = scanner.startPosition;
+              leftDepths[RoundBracket][index] = depths[RoundBracket]++;
+            }
               break;
-            case ')' :
-              {
-                int index = rightCount[RoundBracket]++;
-                if (index == rightPositions[RoundBracket].length) {
-                  System.arraycopy(rightPositions[RoundBracket], 0,
-                      (rightPositions[RoundBracket] = new int[index * 2]), 0,
-                      index);
-                  System.arraycopy(rightDepths[RoundBracket], 0,
-                      (rightDepths[RoundBracket] = new int[index * 2]), 0,
-                      index);
-                }
-                rightPositions[RoundBracket][index] = scanner.startPosition;
-                rightDepths[RoundBracket][index] = --depths[RoundBracket];
+            case ')' : {
+              int index = rightCount[RoundBracket]++;
+              if (index == rightPositions[RoundBracket].length) {
+                System.arraycopy(rightPositions[RoundBracket], 0, (rightPositions[RoundBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(rightDepths[RoundBracket], 0, (rightDepths[RoundBracket] = new int[index * 2]), 0, index);
               }
+              rightPositions[RoundBracket][index] = scanner.startPosition;
+              rightDepths[RoundBracket][index] = --depths[RoundBracket];
+            }
               break;
-            case '[' :
-              {
-                int index = leftCount[SquareBracket]++;
-                if (index == leftPositions[SquareBracket].length) {
-                  System.arraycopy(leftPositions[SquareBracket], 0,
-                      (leftPositions[SquareBracket] = new int[index * 2]), 0,
-                      index);
-                  System.arraycopy(leftDepths[SquareBracket], 0,
-                      (leftDepths[SquareBracket] = new int[index * 2]), 0,
-                      index);
-                }
-                leftPositions[SquareBracket][index] = scanner.startPosition;
-                leftDepths[SquareBracket][index] = depths[SquareBracket]++;
+            case '[' : {
+              int index = leftCount[SquareBracket]++;
+              if (index == leftPositions[SquareBracket].length) {
+                System.arraycopy(leftPositions[SquareBracket], 0, (leftPositions[SquareBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(leftDepths[SquareBracket], 0, (leftDepths[SquareBracket] = new int[index * 2]), 0, index);
               }
+              leftPositions[SquareBracket][index] = scanner.startPosition;
+              leftDepths[SquareBracket][index] = depths[SquareBracket]++;
+            }
               break;
-            case ']' :
-              {
-                int index = rightCount[SquareBracket]++;
-                if (index == rightPositions[SquareBracket].length) {
-                  System.arraycopy(rightPositions[SquareBracket], 0,
-                      (rightPositions[SquareBracket] = new int[index * 2]), 0,
-                      index);
-                  System.arraycopy(rightDepths[SquareBracket], 0,
-                      (rightDepths[SquareBracket] = new int[index * 2]), 0,
-                      index);
-                }
-                rightPositions[SquareBracket][index] = scanner.startPosition;
-                rightDepths[SquareBracket][index] = --depths[SquareBracket];
+            case ']' : {
+              int index = rightCount[SquareBracket]++;
+              if (index == rightPositions[SquareBracket].length) {
+                System.arraycopy(rightPositions[SquareBracket], 0, (rightPositions[SquareBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(rightDepths[SquareBracket], 0, (rightDepths[SquareBracket] = new int[index * 2]), 0, index);
               }
+              rightPositions[SquareBracket][index] = scanner.startPosition;
+              rightDepths[SquareBracket][index] = --depths[SquareBracket];
+            }
               break;
-            case '\'' :
-              {
-                if (scanner.getNextChar('\\')) {
-                  scanner.scanEscapeCharacter();
-                } else { // consume next character
-                  scanner.unicodeAsBackSlash = false;
-                  //									if (((scanner.currentCharacter =
-                  // source[scanner.currentPosition++]) ==
-                  // '\\') &&
-                  // (source[scanner.currentPosition] ==
-                  // 'u')) {
-                  //										scanner.getNextUnicodeChar();
-                  //									} else {
-                  if (scanner.withoutUnicodePtr != 0) {
-                    scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
-                  }
-                  //									}
+            case '\'' : {
+              if (scanner.getNextChar('\\')) {
+                scanner.scanEscapeCharacter();
+              } else { // consume next character
+                scanner.unicodeAsBackSlash = false;
+                //									if (((scanner.currentCharacter =
+                // source[scanner.currentPosition++]) ==
+                // '\\') &&
+                // (source[scanner.currentPosition] ==
+                // 'u')) {
+                //										scanner.getNextUnicodeChar();
+                //									} else {
+                if (scanner.withoutUnicodePtr != 0) {
+                  scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
                 }
-                scanner.getNextChar('\'');
-                break;
+                //									}
               }
+              scanner.getNextChar('\'');
+              break;
+            }
             case '"' :
               // consume next character
               scanner.unicodeAsBackSlash = false;
@@ -3614,12 +3734,36 @@ getNextToken();
                 //								}
               }
               break;
-            case '/' :
-              {
-                int test;
-                if ((test = scanner.getNextChar('/', '*')) == 0) { //line
-                  // comment
+            case '/' : {
+              int test;
+              if ((test = scanner.getNextChar('/', '*')) == 0) { //line
+                // comment
+                //get the next char
+                if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
+                    && (source[scanner.currentPosition] == 'u')) {
+                  //-------------unicode traitement
+                  // ------------
+                  int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                  scanner.currentPosition++;
+                  while (source[scanner.currentPosition] == 'u') {
+                    scanner.currentPosition++;
+                  }
+                  if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                      || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                      || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                      || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                                                                                                               // don't
+                    // care of the
+                    // value
+                    scanner.currentCharacter = 'A';
+                  } //something different from \n and \r
+                  else {
+                    scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                  }
+                }
+                while (scanner.currentCharacter != '\r' && scanner.currentCharacter != '\n') {
                   //get the next char
+                  scanner.startPosition = scanner.currentPosition;
                   if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
                       && (source[scanner.currentPosition] == 'u')) {
                     //-------------unicode traitement
@@ -3629,96 +3773,80 @@ getNextToken();
                     while (source[scanner.currentPosition] == 'u') {
                       scanner.currentPosition++;
                     }
-                    if ((c1 = Character
-                        .getNumericValue(source[scanner.currentPosition++])) > 15
-                        || c1 < 0
-                        || (c2 = Character
-                            .getNumericValue(source[scanner.currentPosition++])) > 15
-                        || c2 < 0
-                        || (c3 = Character
-                            .getNumericValue(source[scanner.currentPosition++])) > 15
-                        || c3 < 0
-                        || (c4 = Character
-                            .getNumericValue(source[scanner.currentPosition++])) > 15
-                        || c4 < 0) { //error don't
+                    if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                        || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                        || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                        || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                                                                                                                 // don't
                       // care of the
                       // value
                       scanner.currentCharacter = 'A';
-                    } //something different from \n and \r
+                    } //something different from \n
+                    // and \r
                     else {
                       scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                     }
                   }
-                  while (scanner.currentCharacter != '\r'
-                      && scanner.currentCharacter != '\n') {
-                    //get the next char
-                    scanner.startPosition = scanner.currentPosition;
-                    if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
-                        && (source[scanner.currentPosition] == 'u')) {
-                      //-------------unicode traitement
-                      // ------------
-                      int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                      scanner.currentPosition++;
-                      while (source[scanner.currentPosition] == 'u') {
-                        scanner.currentPosition++;
-                      }
-                      if ((c1 = Character
-                          .getNumericValue(source[scanner.currentPosition++])) > 15
-                          || c1 < 0
-                          || (c2 = Character
-                              .getNumericValue(source[scanner.currentPosition++])) > 15
-                          || c2 < 0
-                          || (c3 = Character
-                              .getNumericValue(source[scanner.currentPosition++])) > 15
-                          || c3 < 0
-                          || (c4 = Character
-                              .getNumericValue(source[scanner.currentPosition++])) > 15
-                          || c4 < 0) { //error don't
-                        // care of the
-                        // value
-                        scanner.currentCharacter = 'A';
-                      } //something different from \n
-                      // and \r
-                      else {
-                        scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-                      }
-                    }
-                  }
-                  if (scanner.recordLineSeparator
-                      && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
-                    if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
-                      // only record line positions we
-                      // have not recorded yet
-                      scanner.pushLineSeparator();
-                      if (this.scanner.taskTags != null) {
-                        this.scanner.checkTaskTag(this.scanner
-                            .getCurrentTokenStartPosition(), this.scanner
-                            .getCurrentTokenEndPosition());
-                      }
+                }
+                if (scanner.recordLineSeparator && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
+                  if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
+                    // only record line positions we
+                    // have not recorded yet
+                    scanner.pushLineSeparator();
+                    if (this.scanner.taskTags != null) {
+                      this.scanner.checkTaskTag(this.scanner.getCurrentTokenStartPosition(), this.scanner
+                          .getCurrentTokenEndPosition());
                     }
                   }
-                  break;
                 }
-                if (test > 0) { //traditional and annotation
-                  // comment
-                  boolean star = false;
-                  // consume next character
-                  scanner.unicodeAsBackSlash = false;
-                  //									if (((scanner.currentCharacter =
-                  // source[scanner.currentPosition++]) ==
-                  // '\\') &&
-                  // (source[scanner.currentPosition] ==
-                  // 'u')) {
-                  //										scanner.getNextUnicodeChar();
-                  //									} else {
-                  if (scanner.withoutUnicodePtr != 0) {
-                    scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+                break;
+              }
+              if (test > 0) { //traditional and annotation
+                // comment
+                boolean star = false;
+                // consume next character
+                scanner.unicodeAsBackSlash = false;
+                //									if (((scanner.currentCharacter =
+                // source[scanner.currentPosition++]) ==
+                // '\\') &&
+                // (source[scanner.currentPosition] ==
+                // 'u')) {
+                //										scanner.getNextUnicodeChar();
+                //									} else {
+                if (scanner.withoutUnicodePtr != 0) {
+                  scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+                }
+                //									}
+                if (scanner.currentCharacter == '*') {
+                  star = true;
+                }
+                //get the next char
+                if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
+                    && (source[scanner.currentPosition] == 'u')) {
+                  //-------------unicode traitement
+                  // ------------
+                  int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                  scanner.currentPosition++;
+                  while (source[scanner.currentPosition] == 'u') {
+                    scanner.currentPosition++;
                   }
-                  //									}
-                  if (scanner.currentCharacter == '*') {
-                    star = true;
+                  if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                      || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                      || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                      || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                                                                                                               // don't
+                    // care of the
+                    // value
+                    scanner.currentCharacter = 'A';
+                  } //something different from * and /
+                  else {
+                    scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                   }
-                  //get the next char
+                }
+                //loop until end of comment */
+                while ((scanner.currentCharacter != '/') || (!star)) {
+                  star = scanner.currentCharacter == '*';
+                  //get next char
                   if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
                       && (source[scanner.currentPosition] == 'u')) {
                     //-------------unicode traitement
@@ -3728,70 +3856,28 @@ getNextToken();
                     while (source[scanner.currentPosition] == 'u') {
                       scanner.currentPosition++;
                     }
-                    if ((c1 = Character
-                        .getNumericValue(source[scanner.currentPosition++])) > 15
-                        || c1 < 0
-                        || (c2 = Character
-                            .getNumericValue(source[scanner.currentPosition++])) > 15
-                        || c2 < 0
-                        || (c3 = Character
-                            .getNumericValue(source[scanner.currentPosition++])) > 15
-                        || c3 < 0
-                        || (c4 = Character
-                            .getNumericValue(source[scanner.currentPosition++])) > 15
-                        || c4 < 0) { //error don't
+                    if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                        || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                        || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                        || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                                                                                                                 // don't
                       // care of the
                       // value
                       scanner.currentCharacter = 'A';
-                    } //something different from * and /
+                    } //something different from * and
+                    // /
                     else {
                       scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
                     }
                   }
-                  //loop until end of comment */
-                  while ((scanner.currentCharacter != '/') || (!star)) {
-                    star = scanner.currentCharacter == '*';
-                    //get next char
-                    if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
-                        && (source[scanner.currentPosition] == 'u')) {
-                      //-------------unicode traitement
-                      // ------------
-                      int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                      scanner.currentPosition++;
-                      while (source[scanner.currentPosition] == 'u') {
-                        scanner.currentPosition++;
-                      }
-                      if ((c1 = Character
-                          .getNumericValue(source[scanner.currentPosition++])) > 15
-                          || c1 < 0
-                          || (c2 = Character
-                              .getNumericValue(source[scanner.currentPosition++])) > 15
-                          || c2 < 0
-                          || (c3 = Character
-                              .getNumericValue(source[scanner.currentPosition++])) > 15
-                          || c3 < 0
-                          || (c4 = Character
-                              .getNumericValue(source[scanner.currentPosition++])) > 15
-                          || c4 < 0) { //error don't
-                        // care of the
-                        // value
-                        scanner.currentCharacter = 'A';
-                      } //something different from * and
-                      // /
-                      else {
-                        scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-                      }
-                    }
-                  }
-                  if (this.scanner.taskTags != null) {
-                    this.scanner.checkTaskTag(this.scanner
-                        .getCurrentTokenStartPosition(), this.scanner
-                        .getCurrentTokenEndPosition());
-                  }
-                  break;
+                }
+                if (this.scanner.taskTags != null) {
+                  this.scanner.checkTaskTag(this.scanner.getCurrentTokenStartPosition(), this.scanner.getCurrentTokenEndPosition());
                 }
                 break;
               }
+              break;
+            }
             default :
               if (Scanner.isPHPIdentifierStart(scanner.currentCharacter)) {
                 scanner.scanIdentifierOrKeyword(false);
@@ -3832,8 +3918,7 @@ getNextToken();
             }
           }
           if (end < 0) { // did not find a good closing match
-            problemReporter.unmatchedBracket(start, referenceContext,
-                compilationUnit.compilationResult);
+            problemReporter.unmatchedBracket(start, referenceContext, compilationUnit.compilationResult);
             return true;
           }
           // check if even number of opening/closing other brackets
@@ -3851,8 +3936,7 @@ getNextToken();
                 balance--;
             }
             if (balance != 0) {
-              problemReporter.unmatchedBracket(start, referenceContext,
-                  compilationUnit.compilationResult); //bracket
+              problemReporter.unmatchedBracket(start, referenceContext, compilationUnit.compilationResult); //bracket
               // anomaly
               return true;
             }
@@ -3861,14 +3945,13 @@ getNextToken();
         // too many opening brackets ?
         for (int i = rightCount[kind]; i < leftCount[kind]; i++) {
           anomaliesDetected = true;
-          problemReporter.unmatchedBracket(leftPositions[kind][leftCount[kind]
-              - i - 1], referenceContext, compilationUnit.compilationResult);
+          problemReporter.unmatchedBracket(leftPositions[kind][leftCount[kind] - i - 1], referenceContext,
+              compilationUnit.compilationResult);
         }
         // too many closing brackets ?
         for (int i = leftCount[kind]; i < rightCount[kind]; i++) {
           anomaliesDetected = true;
-          problemReporter.unmatchedBracket(rightPositions[kind][i],
-              referenceContext, compilationUnit.compilationResult);
+          problemReporter.unmatchedBracket(rightPositions[kind][i], referenceContext, compilationUnit.compilationResult);
         }
         if (anomaliesDetected)
           return true;
@@ -3915,4 +3998,11 @@ getNextToken();
       astLengthStack[astLengthPtr] = 1;
     }
   }
+
+  protected void resetModifiers() {
+    this.modifiers = AccDefault;
+    this.modifiersSourceStart = -1; // <-- see comment into
+    // modifiersFlag(int)
+    this.scanner.commentPtr = -1;
+  }
 }
\ No newline at end of file