misc changes
[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / parser / Scanner.java
index 0826535..8a7179b 100644 (file)
@@ -9,72 +9,61 @@
  *     IBM Corporation - initial API and implementation
  ******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.parser;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
-import net.sourceforge.phpdt.core.compiler.*;
+import java.util.Stack;
+import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.core.compiler.IScanner;
+import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
+import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
-
 public class Scanner implements IScanner, ITerminalSymbols {
-
-  /* APIs ares
-   - getNextToken() which return the current type of the token
-     (this value is not memorized by the scanner)
-   - getCurrentTokenSource() which provides with the token "REAL" source
-     (aka all unicode have been transformed into a correct char)
-   - sourceStart gives the position into the stream
-   - currentPosition-1 gives the sourceEnd position into the stream 
-  */
-
-  // 1.4 feature 
+  /*
+   * APIs ares - getNextToken() which return the current type of the token
+   * (this value is not memorized by the scanner) - getCurrentTokenSource()
+   * which provides with the token "REAL" source (aka all unicode have been
+   * transformed into a correct char) - sourceStart gives the position into the
+   * stream - currentPosition-1 gives the sourceEnd position into the stream
+   */
+  // 1.4 feature
   private boolean assertMode;
   public boolean useAssertAsAnIndentifier = false;
-  //flag indicating if processed source contains occurrences of keyword assert 
+  //flag indicating if processed source contains occurrences of keyword assert
   public boolean containsAssertKeyword = false;
-
   public boolean recordLineSeparator;
   public boolean phpMode = false;
-
+  public Stack encapsedStringStack = null;
   public char currentCharacter;
   public int startPosition;
   public int currentPosition;
   public int initialPosition, eofPosition;
-  // after this position eof are generated instead of real token from the source
-
+  // after this position eof are generated instead of real token from the
+  // source
   public boolean tokenizeComments;
   public boolean tokenizeWhiteSpace;
-
   //source should be viewed as a window (aka a part)
   //of a entire very large stream
   public char source[];
-
   //unicode support
   public char[] withoutUnicodeBuffer;
   public int withoutUnicodePtr;
   //when == 0 ==> no unicode in the current token
   public boolean unicodeAsBackSlash = false;
-
   public boolean scanningFloatLiteral = false;
-
   //support for /** comments
   //public char[][] comments = new char[10][];
   public int[] commentStops = new int[10];
   public int[] commentStarts = new int[10];
   public int commentPtr = -1; // no comment test with commentPtr value -1
-
   //diet parsing support - jump over some method body when requested
   public boolean diet = false;
-
-  //support for the  poor-line-debuggers ....
+  //support for the poor-line-debuggers ....
   //remember the position of the cr/lf
   public int[] lineEnds = new int[250];
   public int linePtr = -1;
   public boolean wasAcr = false;
-
   public static final String END_OF_SOURCE = "End_Of_Source"; //$NON-NLS-1$
-
   public static final String INVALID_HEXA = "Invalid_Hexa_Literal"; //$NON-NLS-1$
   public static final String INVALID_OCTAL = "Invalid_Octal_Literal"; //$NON-NLS-1$
   public static final String INVALID_CHARACTER_CONSTANT = "Invalid_Character_Constant"; //$NON-NLS-1$
@@ -82,48 +71,32 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public static final String INVALID_INPUT = "Invalid_Input"; //$NON-NLS-1$
   public static final String INVALID_UNICODE_ESCAPE = "Invalid_Unicode_Escape"; //$NON-NLS-1$
   public static final String INVALID_FLOAT = "Invalid_Float_Literal"; //$NON-NLS-1$
-
   public static final String NULL_SOURCE_STRING = "Null_Source_String"; //$NON-NLS-1$
   public static final String UNTERMINATED_STRING = "Unterminated_String"; //$NON-NLS-1$
   public static final String UNTERMINATED_COMMENT = "Unterminated_Comment"; //$NON-NLS-1$
   public static final String INVALID_CHAR_IN_STRING = "Invalid_Char_In_String"; //$NON-NLS-1$
-
   //----------------optimized identifier managment------------------
-  static final char[] charArray_a = new char[] { 'a' },
-    charArray_b = new char[] { 'b' },
-    charArray_c = new char[] { 'c' },
-    charArray_d = new char[] { 'd' },
-    charArray_e = new char[] { 'e' },
-    charArray_f = new char[] { 'f' },
-    charArray_g = new char[] { 'g' },
-    charArray_h = new char[] { 'h' },
-    charArray_i = new char[] { 'i' },
-    charArray_j = new char[] { 'j' },
-    charArray_k = new char[] { 'k' },
-    charArray_l = new char[] { 'l' },
-    charArray_m = new char[] { 'm' },
-    charArray_n = new char[] { 'n' },
-    charArray_o = new char[] { 'o' },
-    charArray_p = new char[] { 'p' },
-    charArray_q = new char[] { 'q' },
-    charArray_r = new char[] { 'r' },
-    charArray_s = new char[] { 's' },
-    charArray_t = new char[] { 't' },
-    charArray_u = new char[] { 'u' },
-    charArray_v = new char[] { 'v' },
-    charArray_w = new char[] { 'w' },
-    charArray_x = new char[] { 'x' },
-    charArray_y = new char[] { 'y' },
-    charArray_z = new char[] { 'z' };
-
-  static final char[] initCharArray =
-    new char[] { '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000' };
+  static final char[] charArray_a = new char[]{'a'},
+      charArray_b = new char[]{'b'}, charArray_c = new char[]{'c'},
+      charArray_d = new char[]{'d'}, charArray_e = new char[]{'e'},
+      charArray_f = new char[]{'f'}, charArray_g = new char[]{'g'},
+      charArray_h = new char[]{'h'}, charArray_i = new char[]{'i'},
+      charArray_j = new char[]{'j'}, charArray_k = new char[]{'k'},
+      charArray_l = new char[]{'l'}, charArray_m = new char[]{'m'},
+      charArray_n = new char[]{'n'}, charArray_o = new char[]{'o'},
+      charArray_p = new char[]{'p'}, charArray_q = new char[]{'q'},
+      charArray_r = new char[]{'r'}, charArray_s = new char[]{'s'},
+      charArray_t = new char[]{'t'}, charArray_u = new char[]{'u'},
+      charArray_v = new char[]{'v'}, charArray_w = new char[]{'w'},
+      charArray_x = new char[]{'x'}, charArray_y = new char[]{'y'},
+      charArray_z = new char[]{'z'};
+  static final char[] initCharArray = new char[]{'\u0000', '\u0000', '\u0000',
+      '\u0000', '\u0000', '\u0000'};
   static final int TableSize = 30, InternalTableSize = 6;
   //30*6 = 180 entries
   public static final int OptimizedLength = 6;
-  public /*static*/
-  final char[][][][] charArray_length =
-    new char[OptimizedLength][TableSize][InternalTableSize][];
+  public/* static */
+  final char[][][][] charArray_length = new char[OptimizedLength][TableSize][InternalTableSize][];
   // support for detecting non-externalized string literals
   int currentLineNr = -1;
   int previousLineNr = -1;
@@ -136,8 +109,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public StringLiteral[] nonNLSStrings = null;
   public boolean checkNonExternalizedStringLiterals = true;
   public boolean wasNonExternalizedStringLiteral = false;
-
-  /*static*/ {
+  /* static */{
     for (int i = 0; i < 6; i++) {
       for (int j = 0; j < TableSize; j++) {
         for (int k = 0; k < InternalTableSize; k++) {
@@ -146,83 +118,79 @@ public class Scanner implements IScanner, ITerminalSymbols {
       }
     }
   }
-  static int newEntry2 = 0,
-    newEntry3 = 0,
-    newEntry4 = 0,
-    newEntry5 = 0,
-    newEntry6 = 0;
-
+  static int newEntry2 = 0, newEntry3 = 0, newEntry4 = 0, newEntry5 = 0,
+      newEntry6 = 0;
   public static final int RoundBracket = 0;
   public static final int SquareBracket = 1;
   public static final int CurlyBracket = 2;
   public static final int BracketKinds = 3;
-
+  // task tag support
+  public char[][] foundTaskTags = null;
+  public char[][] foundTaskMessages;
+  public char[][] foundTaskPriorities = null;
+  public int[][] foundTaskPositions;
+  public int foundTaskCount = 0;
+  public char[][] taskTags = null;
+  public char[][] taskPriorities = null; 
   public static final boolean DEBUG = false;
+  public static final boolean TRACE = false;
   public Scanner() {
     this(false, false);
   }
   public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace) {
     this(tokenizeComments, tokenizeWhiteSpace, false);
   }
-
   /**
-   * Determines if the specified character is
-   * permissible as the first character in a PHP identifier
+   * Determines if the specified character is permissible as the first
+   * character in a PHP identifier
    */
   public static boolean isPHPIdentifierStart(char ch) {
-    return Character.isLetter(ch) || (ch == '_');
+    return Character.isLetter(ch) || (ch == '_') || (0x7F <= ch && ch <= 0xFF);
   }
-
   /**
    * Determines if the specified character may be part of a PHP identifier as
    * other than the first character
    */
   public static boolean isPHPIdentifierPart(char ch) {
-    return Character.isLetterOrDigit(ch) || (ch == '_');
+    return Character.isLetterOrDigit(ch) || (ch == '_')
+        || (0x7F <= ch && ch <= 0xFF);
   }
-
   public final boolean atEnd() {
-    // This code is not relevant if source is 
+    // This code is not relevant if source is
     // Only a part of the real stream input
-
     return source.length == currentPosition;
   }
   public char[] getCurrentIdentifierSource() {
     //return the token REAL source (aka unicodes are precomputed)
-
     char[] result;
-    if (withoutUnicodePtr != 0)
-      //0 is used as a fast test flag so the real first char is in position 1
-      System.arraycopy(
-        withoutUnicodeBuffer,
-        1,
-        result = new char[withoutUnicodePtr],
-        0,
-        withoutUnicodePtr);
-    else {
-      int length = currentPosition - startPosition;
-      switch (length) { // see OptimizedLength
-        case 1 :
-          return optimizedCurrentTokenSource1();
-        case 2 :
-          return optimizedCurrentTokenSource2();
-        case 3 :
-          return optimizedCurrentTokenSource3();
-        case 4 :
-          return optimizedCurrentTokenSource4();
-        case 5 :
-          return optimizedCurrentTokenSource5();
-        case 6 :
-          return optimizedCurrentTokenSource6();
-      }
-      //no optimization
-      System.arraycopy(
-        source,
-        startPosition,
-        result = new char[length],
-        0,
-        length);
+    //    if (withoutUnicodePtr != 0)
+    //      //0 is used as a fast test flag so the real first char is in position 1
+    //      System.arraycopy(
+    //        withoutUnicodeBuffer,
+    //        1,
+    //        result = new char[withoutUnicodePtr],
+    //        0,
+    //        withoutUnicodePtr);
+    //    else {
+    int length = currentPosition - startPosition;
+    switch (length) { // see OptimizedLength
+      case 1 :
+        return optimizedCurrentTokenSource1();
+      case 2 :
+        return optimizedCurrentTokenSource2();
+      case 3 :
+        return optimizedCurrentTokenSource3();
+      case 4 :
+        return optimizedCurrentTokenSource4();
+      case 5 :
+        return optimizedCurrentTokenSource5();
+      case 6 :
+        return optimizedCurrentTokenSource6();
     }
+    //no optimization
+    System.arraycopy(source, startPosition, result = new char[length], 0,
+        length);
+    //   }
     return result;
   }
   public int getCurrentTokenEndPosition() {
@@ -230,117 +198,108 @@ public class Scanner implements IScanner, ITerminalSymbols {
   }
   public final char[] getCurrentTokenSource() {
     // Return the token REAL source (aka unicodes are precomputed)
-
     char[] result;
-    if (withoutUnicodePtr != 0)
-      // 0 is used as a fast test flag so the real first char is in position 1
-      System.arraycopy(
-        withoutUnicodeBuffer,
-        1,
-        result = new char[withoutUnicodePtr],
-        0,
-        withoutUnicodePtr);
-    else {
-      int length;
-      System.arraycopy(
-        source,
-        startPosition,
-        result = new char[length = currentPosition - startPosition],
-        0,
-        length);
-    }
+    //    if (withoutUnicodePtr != 0)
+    //      // 0 is used as a fast test flag so the real first char is in position 1
+    //      System.arraycopy(
+    //        withoutUnicodeBuffer,
+    //        1,
+    //        result = new char[withoutUnicodePtr],
+    //        0,
+    //        withoutUnicodePtr);
+    //    else {
+    int length;
+    System.arraycopy(source, startPosition,
+        result = new char[length = currentPosition - startPosition], 0, length);
+    //    }
     return result;
   }
-
   public final char[] getCurrentTokenSource(int startPos) {
     // Return the token REAL source (aka unicodes are precomputed)
-
     char[] result;
-    if (withoutUnicodePtr != 0)
-      // 0 is used as a fast test flag so the real first char is in position 1
-      System.arraycopy(
-        withoutUnicodeBuffer,
-        1,
-        result = new char[withoutUnicodePtr],
-        0,
-        withoutUnicodePtr);
-    else {
-      int length;
-      System.arraycopy(
-        source,
-        startPos,
-        result = new char[length = currentPosition - startPos],
-        0,
-        length);
-    }
+    //    if (withoutUnicodePtr != 0)
+    //      // 0 is used as a fast test flag so the real first char is in position 1
+    //      System.arraycopy(
+    //        withoutUnicodeBuffer,
+    //        1,
+    //        result = new char[withoutUnicodePtr],
+    //        0,
+    //        withoutUnicodePtr);
+    //    else {
+    int length;
+    System.arraycopy(source, startPos,
+        result = new char[length = currentPosition - startPos], 0, length);
+    //  }
     return result;
   }
-
   public final char[] getCurrentTokenSourceString() {
     //return the token REAL source (aka unicodes are precomputed).
     //REMOVE the two " that are at the beginning and the end.
-
     char[] result;
     if (withoutUnicodePtr != 0)
       //0 is used as a fast test flag so the real first char is in position 1
-      System.arraycopy(withoutUnicodeBuffer, 2,
+      System.arraycopy(withoutUnicodeBuffer, 2, 
       //2 is 1 (real start) + 1 (to jump over the ")
-      result = new char[withoutUnicodePtr - 2], 0, withoutUnicodePtr - 2);
+          result = new char[withoutUnicodePtr - 2], 0, withoutUnicodePtr - 2);
     else {
       int length;
-      System.arraycopy(
-        source,
-        startPosition + 1,
-        result = new char[length = currentPosition - startPosition - 2],
-        0,
-        length);
+      System.arraycopy(source, startPosition + 1,
+          result = new char[length = currentPosition - startPosition - 2], 0,
+          length);
     }
     return result;
   }
   public int getCurrentTokenStartPosition() {
     return this.startPosition;
   }
+  public final char[] getCurrentStringLiteralSource() {
+    // Return the token REAL source (aka unicodes are precomputed)
+    char[] result;
+    int length;
+    System.arraycopy(source, startPosition + 1,
+        result = new char[length = currentPosition - startPosition - 2], 0,
+        length);
+    //    }
+    return result;
+  }
   /*
    * Search the source position corresponding to the end of a given line number
-   *
-   * Line numbers are 1-based, and relative to the scanner initialPosition. 
+   * 
+   * Line numbers are 1-based, and relative to the scanner initialPosition.
    * Character positions are 0-based.
-   *
+   * 
    * In case the given line number is inconsistent, answers -1.
    */
   public final int getLineEnd(int lineNumber) {
-
     if (lineEnds == null)
       return -1;
     if (lineNumber >= lineEnds.length)
       return -1;
     if (lineNumber <= 0)
       return -1;
-
     if (lineNumber == lineEnds.length - 1)
       return eofPosition;
     return lineEnds[lineNumber - 1];
     // next line start one character behind the lineEnd of the previous line
   }
   /**
-   * Search the source position corresponding to the beginning of a given line number
-   *
-   * Line numbers are 1-based, and relative to the scanner initialPosition. 
+   * Search the source position corresponding to the beginning of a given line
+   * number
+   * 
+   * Line numbers are 1-based, and relative to the scanner initialPosition.
    * Character positions are 0-based.
-   *
-   * e.g.      getLineStart(1) --> 0   i.e. first line starts at character 0.
-   *
+   * 
+   * e.g. getLineStart(1) --> 0 i.e. first line starts at character 0.
+   * 
    * In case the given line number is inconsistent, answers -1.
    */
   public final int getLineStart(int lineNumber) {
-
     if (lineEnds == null)
       return -1;
     if (lineNumber >= lineEnds.length)
       return -1;
     if (lineNumber <= 0)
       return -1;
-
     if (lineNumber == 1)
       return initialPosition;
     return lineEnds[lineNumber - 2] + 1;
@@ -349,72 +308,73 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public final boolean getNextChar(char testedChar) {
     //BOOLEAN
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
-    //Both previous lines are true if the currentCharacter is == to the testedChar
+    //Both previous lines are true if the currentCharacter is == to the
+    // testedChar
     //On false, no side effect has occured.
-
-    //ALL getNextChar.... ARE OPTIMIZED COPIES 
-
+    //ALL getNextChar.... ARE OPTIMIZED COPIES
     int temp = currentPosition;
     try {
-      if (((currentCharacter = source[currentPosition++]) == '\\')
-        && (source[currentPosition] == 'u')) {
-        //-------------unicode traitement ------------
-        int c1, c2, c3, c4;
-        int unicodeSize = 6;
-        currentPosition++;
-        while (source[currentPosition] == 'u') {
-          currentPosition++;
-          unicodeSize++;
-        }
-
-        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
-          || c1 < 0)
-          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c2 < 0)
-          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c3 < 0)
-          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c4 < 0)) {
-          currentPosition = temp;
-          return false;
-        }
-
-        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-        if (currentCharacter != testedChar) {
-          currentPosition = temp;
-          return false;
-        }
-        unicodeAsBackSlash = currentCharacter == '\\';
-
-        //need the unicode buffer
-        if (withoutUnicodePtr == 0) {
-          //buffer all the entries that have been left aside....
-          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
-          System.arraycopy(
-            source,
-            startPosition,
-            withoutUnicodeBuffer,
-            1,
-            withoutUnicodePtr);
-        }
-        //fill the buffer with the char
-        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return true;
-
-      } //-------------end unicode traitement--------------
-      else {
-        if (currentCharacter != testedChar) {
-          currentPosition = temp;
-          return false;
-        }
-        unicodeAsBackSlash = false;
-        if (withoutUnicodePtr != 0)
-          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return true;
+      currentCharacter = source[currentPosition++];
+      //      if (((currentCharacter = source[currentPosition++]) == '\\')
+      //        && (source[currentPosition] == 'u')) {
+      //        //-------------unicode traitement ------------
+      //        int c1, c2, c3, c4;
+      //        int unicodeSize = 6;
+      //        currentPosition++;
+      //        while (source[currentPosition] == 'u') {
+      //          currentPosition++;
+      //          unicodeSize++;
+      //        }
+      //
+      //        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
+      //          || c1 < 0)
+      //          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c2 < 0)
+      //          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c3 < 0)
+      //          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c4 < 0)) {
+      //          currentPosition = temp;
+      //          return false;
+      //        }
+      //
+      //        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+      //        if (currentCharacter != testedChar) {
+      //          currentPosition = temp;
+      //          return false;
+      //        }
+      //        unicodeAsBackSlash = currentCharacter == '\\';
+      //
+      //        //need the unicode buffer
+      //        if (withoutUnicodePtr == 0) {
+      //          //buffer all the entries that have been left aside....
+      //          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
+      //          System.arraycopy(
+      //            source,
+      //            startPosition,
+      //            withoutUnicodeBuffer,
+      //            1,
+      //            withoutUnicodePtr);
+      //        }
+      //        //fill the buffer with the char
+      //        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      //        return true;
+      //
+      //      } //-------------end unicode traitement--------------
+      //      else {
+      if (currentCharacter != testedChar) {
+        currentPosition = temp;
+        return false;
       }
+      unicodeAsBackSlash = false;
+      //        if (withoutUnicodePtr != 0)
+      //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      return true;
+      //      }
     } catch (IndexOutOfBoundsException e) {
       unicodeAsBackSlash = false;
       currentPosition = temp;
@@ -425,79 +385,79 @@ public class Scanner implements IScanner, ITerminalSymbols {
     //INT 0 : testChar1 \\\\///\\\\ 1 : testedChar2 \\\\///\\\\ -1 : others
     //test can be done with (x==0) for the first and (x>0) for the second
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
-    //Both previous lines are true if the currentCharacter is == to the testedChar1/2
+    //Both previous lines are true if the currentCharacter is == to the
+    // testedChar1/2
     //On false, no side effect has occured.
-
-    //ALL getNextChar.... ARE OPTIMIZED COPIES 
-
+    //ALL getNextChar.... ARE OPTIMIZED COPIES
     int temp = currentPosition;
     try {
       int result;
-      if (((currentCharacter = source[currentPosition++]) == '\\')
-        && (source[currentPosition] == 'u')) {
-        //-------------unicode traitement ------------
-        int c1, c2, c3, c4;
-        int unicodeSize = 6;
-        currentPosition++;
-        while (source[currentPosition] == 'u') {
-          currentPosition++;
-          unicodeSize++;
-        }
-
-        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
-          || c1 < 0)
-          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c2 < 0)
-          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c3 < 0)
-          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c4 < 0)) {
-          currentPosition = temp;
-          return 2;
-        }
-
-        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-        if (currentCharacter == testedChar1)
-          result = 0;
-        else if (currentCharacter == testedChar2)
-          result = 1;
-        else {
-          currentPosition = temp;
-          return -1;
-        }
-
-        //need the unicode buffer
-        if (withoutUnicodePtr == 0) {
-          //buffer all the entries that have been left aside....
-          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
-          System.arraycopy(
-            source,
-            startPosition,
-            withoutUnicodeBuffer,
-            1,
-            withoutUnicodePtr);
-        }
-        //fill the buffer with the char
-        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return result;
-      } //-------------end unicode traitement--------------
+      currentCharacter = source[currentPosition++];
+      //      if (((currentCharacter = source[currentPosition++]) == '\\')
+      //        && (source[currentPosition] == 'u')) {
+      //        //-------------unicode traitement ------------
+      //        int c1, c2, c3, c4;
+      //        int unicodeSize = 6;
+      //        currentPosition++;
+      //        while (source[currentPosition] == 'u') {
+      //          currentPosition++;
+      //          unicodeSize++;
+      //        }
+      //
+      //        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
+      //          || c1 < 0)
+      //          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c2 < 0)
+      //          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c3 < 0)
+      //          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c4 < 0)) {
+      //          currentPosition = temp;
+      //          return 2;
+      //        }
+      //
+      //        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+      //        if (currentCharacter == testedChar1)
+      //          result = 0;
+      //        else if (currentCharacter == testedChar2)
+      //          result = 1;
+      //        else {
+      //          currentPosition = temp;
+      //          return -1;
+      //        }
+      //
+      //        //need the unicode buffer
+      //        if (withoutUnicodePtr == 0) {
+      //          //buffer all the entries that have been left aside....
+      //          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
+      //          System.arraycopy(
+      //            source,
+      //            startPosition,
+      //            withoutUnicodeBuffer,
+      //            1,
+      //            withoutUnicodePtr);
+      //        }
+      //        //fill the buffer with the char
+      //        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      //        return result;
+      //      } //-------------end unicode traitement--------------
+      //      else {
+      if (currentCharacter == testedChar1)
+        result = 0;
+      else if (currentCharacter == testedChar2)
+        result = 1;
       else {
-        if (currentCharacter == testedChar1)
-          result = 0;
-        else if (currentCharacter == testedChar2)
-          result = 1;
-        else {
-          currentPosition = temp;
-          return -1;
-        }
-
-        if (withoutUnicodePtr != 0)
-          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return result;
+        currentPosition = temp;
+        return -1;
       }
+      //        if (withoutUnicodePtr != 0)
+      //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      return result;
+      //     }
     } catch (IndexOutOfBoundsException e) {
       currentPosition = temp;
       return -1;
@@ -506,69 +466,69 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public final boolean getNextCharAsDigit() {
     //BOOLEAN
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
     //Both previous lines are true if the currentCharacter is a digit
     //On false, no side effect has occured.
-
-    //ALL getNextChar.... ARE OPTIMIZED COPIES 
-
+    //ALL getNextChar.... ARE OPTIMIZED COPIES
     int temp = currentPosition;
     try {
-      if (((currentCharacter = source[currentPosition++]) == '\\')
-        && (source[currentPosition] == 'u')) {
-        //-------------unicode traitement ------------
-        int c1, c2, c3, c4;
-        int unicodeSize = 6;
-        currentPosition++;
-        while (source[currentPosition] == 'u') {
-          currentPosition++;
-          unicodeSize++;
-        }
-
-        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
-          || c1 < 0)
-          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c2 < 0)
-          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c3 < 0)
-          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c4 < 0)) {
-          currentPosition = temp;
-          return false;
-        }
-
-        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-        if (!Character.isDigit(currentCharacter)) {
-          currentPosition = temp;
-          return false;
-        }
-
-        //need the unicode buffer
-        if (withoutUnicodePtr == 0) {
-          //buffer all the entries that have been left aside....
-          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
-          System.arraycopy(
-            source,
-            startPosition,
-            withoutUnicodeBuffer,
-            1,
-            withoutUnicodePtr);
-        }
-        //fill the buffer with the char
-        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return true;
-      } //-------------end unicode traitement--------------
-      else {
-        if (!Character.isDigit(currentCharacter)) {
-          currentPosition = temp;
-          return false;
-        }
-        if (withoutUnicodePtr != 0)
-          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return true;
+      currentCharacter = source[currentPosition++];
+      //      if (((currentCharacter = source[currentPosition++]) == '\\')
+      //        && (source[currentPosition] == 'u')) {
+      //        //-------------unicode traitement ------------
+      //        int c1, c2, c3, c4;
+      //        int unicodeSize = 6;
+      //        currentPosition++;
+      //        while (source[currentPosition] == 'u') {
+      //          currentPosition++;
+      //          unicodeSize++;
+      //        }
+      //
+      //        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
+      //          || c1 < 0)
+      //          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c2 < 0)
+      //          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c3 < 0)
+      //          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c4 < 0)) {
+      //          currentPosition = temp;
+      //          return false;
+      //        }
+      //
+      //        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+      //        if (!Character.isDigit(currentCharacter)) {
+      //          currentPosition = temp;
+      //          return false;
+      //        }
+      //
+      //        //need the unicode buffer
+      //        if (withoutUnicodePtr == 0) {
+      //          //buffer all the entries that have been left aside....
+      //          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
+      //          System.arraycopy(
+      //            source,
+      //            startPosition,
+      //            withoutUnicodeBuffer,
+      //            1,
+      //            withoutUnicodePtr);
+      //        }
+      //        //fill the buffer with the char
+      //        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      //        return true;
+      //      } //-------------end unicode traitement--------------
+      //      else {
+      if (!Character.isDigit(currentCharacter)) {
+        currentPosition = temp;
+        return false;
       }
+      //        if (withoutUnicodePtr != 0)
+      //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      return true;
+      //      }
     } catch (IndexOutOfBoundsException e) {
       currentPosition = temp;
       return false;
@@ -577,69 +537,70 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public final boolean getNextCharAsDigit(int radix) {
     //BOOLEAN
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
-    //Both previous lines are true if the currentCharacter is a digit base on radix
+    //Both previous lines are true if the currentCharacter is a digit base on
+    // radix
     //On false, no side effect has occured.
-
-    //ALL getNextChar.... ARE OPTIMIZED COPIES 
-
+    //ALL getNextChar.... ARE OPTIMIZED COPIES
     int temp = currentPosition;
     try {
-      if (((currentCharacter = source[currentPosition++]) == '\\')
-        && (source[currentPosition] == 'u')) {
-        //-------------unicode traitement ------------
-        int c1, c2, c3, c4;
-        int unicodeSize = 6;
-        currentPosition++;
-        while (source[currentPosition] == 'u') {
-          currentPosition++;
-          unicodeSize++;
-        }
-
-        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
-          || c1 < 0)
-          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c2 < 0)
-          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c3 < 0)
-          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c4 < 0)) {
-          currentPosition = temp;
-          return false;
-        }
-
-        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-        if (Character.digit(currentCharacter, radix) == -1) {
-          currentPosition = temp;
-          return false;
-        }
-
-        //need the unicode buffer
-        if (withoutUnicodePtr == 0) {
-          //buffer all the entries that have been left aside....
-          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
-          System.arraycopy(
-            source,
-            startPosition,
-            withoutUnicodeBuffer,
-            1,
-            withoutUnicodePtr);
-        }
-        //fill the buffer with the char
-        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return true;
-      } //-------------end unicode traitement--------------
-      else {
-        if (Character.digit(currentCharacter, radix) == -1) {
-          currentPosition = temp;
-          return false;
-        }
-        if (withoutUnicodePtr != 0)
-          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return true;
+      currentCharacter = source[currentPosition++];
+      //      if (((currentCharacter = source[currentPosition++]) == '\\')
+      //        && (source[currentPosition] == 'u')) {
+      //        //-------------unicode traitement ------------
+      //        int c1, c2, c3, c4;
+      //        int unicodeSize = 6;
+      //        currentPosition++;
+      //        while (source[currentPosition] == 'u') {
+      //          currentPosition++;
+      //          unicodeSize++;
+      //        }
+      //
+      //        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
+      //          || c1 < 0)
+      //          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c2 < 0)
+      //          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c3 < 0)
+      //          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c4 < 0)) {
+      //          currentPosition = temp;
+      //          return false;
+      //        }
+      //
+      //        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+      //        if (Character.digit(currentCharacter, radix) == -1) {
+      //          currentPosition = temp;
+      //          return false;
+      //        }
+      //
+      //        //need the unicode buffer
+      //        if (withoutUnicodePtr == 0) {
+      //          //buffer all the entries that have been left aside....
+      //          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
+      //          System.arraycopy(
+      //            source,
+      //            startPosition,
+      //            withoutUnicodeBuffer,
+      //            1,
+      //            withoutUnicodePtr);
+      //        }
+      //        //fill the buffer with the char
+      //        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      //        return true;
+      //      } //-------------end unicode traitement--------------
+      //      else {
+      if (Character.digit(currentCharacter, radix) == -1) {
+        currentPosition = temp;
+        return false;
       }
+      //        if (withoutUnicodePtr != 0)
+      //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      return true;
+      //      }
     } catch (IndexOutOfBoundsException e) {
       currentPosition = temp;
       return false;
@@ -648,120 +609,206 @@ public class Scanner implements IScanner, ITerminalSymbols {
   public boolean getNextCharAsJavaIdentifierPart() {
     //BOOLEAN
     //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
+    //when a unicode appears then we must use a buffer that holds char
+    // internal values
     //At the end of this method currentCharacter holds the new visited char
     //and currentPosition points right next after it
-    //Both previous lines are true if the currentCharacter is a JavaIdentifierPart
+    //Both previous lines are true if the currentCharacter is a
+    // JavaIdentifierPart
     //On false, no side effect has occured.
-
-    //ALL getNextChar.... ARE OPTIMIZED COPIES 
-
+    //ALL getNextChar.... ARE OPTIMIZED COPIES
     int temp = currentPosition;
     try {
-      if (((currentCharacter = source[currentPosition++]) == '\\')
-        && (source[currentPosition] == 'u')) {
-        //-------------unicode traitement ------------
-        int c1, c2, c3, c4;
-        int unicodeSize = 6;
-        currentPosition++;
-        while (source[currentPosition] == 'u') {
-          currentPosition++;
-          unicodeSize++;
-        }
-
-        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
-          || c1 < 0)
-          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c2 < 0)
-          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c3 < 0)
-          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
-            || c4 < 0)) {
-          currentPosition = temp;
-          return false;
-        }
-
-        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-        if (!isPHPIdentifierPart(currentCharacter)) {
-          currentPosition = temp;
-          return false;
-        }
-
-        //need the unicode buffer
-        if (withoutUnicodePtr == 0) {
-          //buffer all the entries that have been left aside....
-          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
-          System.arraycopy(
-            source,
-            startPosition,
-            withoutUnicodeBuffer,
-            1,
-            withoutUnicodePtr);
-        }
-        //fill the buffer with the char
-        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return true;
-      } //-------------end unicode traitement--------------
-      else {
-        if (!isPHPIdentifierPart(currentCharacter)) {
-          currentPosition = temp;
-          return false;
-        }
-
-        if (withoutUnicodePtr != 0)
-          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        return true;
+      currentCharacter = source[currentPosition++];
+      //      if (((currentCharacter = source[currentPosition++]) == '\\')
+      //        && (source[currentPosition] == 'u')) {
+      //        //-------------unicode traitement ------------
+      //        int c1, c2, c3, c4;
+      //        int unicodeSize = 6;
+      //        currentPosition++;
+      //        while (source[currentPosition] == 'u') {
+      //          currentPosition++;
+      //          unicodeSize++;
+      //        }
+      //
+      //        if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
+      //          || c1 < 0)
+      //          || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c2 < 0)
+      //          || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c3 < 0)
+      //          || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
+      //            || c4 < 0)) {
+      //          currentPosition = temp;
+      //          return false;
+      //        }
+      //
+      //        currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+      //        if (!isPHPIdentifierPart(currentCharacter)) {
+      //          currentPosition = temp;
+      //          return false;
+      //        }
+      //
+      //        //need the unicode buffer
+      //        if (withoutUnicodePtr == 0) {
+      //          //buffer all the entries that have been left aside....
+      //          withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
+      //          System.arraycopy(
+      //            source,
+      //            startPosition,
+      //            withoutUnicodeBuffer,
+      //            1,
+      //            withoutUnicodePtr);
+      //        }
+      //        //fill the buffer with the char
+      //        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      //        return true;
+      //      } //-------------end unicode traitement--------------
+      //      else {
+      if (!isPHPIdentifierPart(currentCharacter)) {
+        currentPosition = temp;
+        return false;
       }
+      //        if (withoutUnicodePtr != 0)
+      //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      return true;
+      //      }
     } catch (IndexOutOfBoundsException e) {
       currentPosition = temp;
       return false;
     }
   }
-
-  public int getNextToken() throws InvalidInputException {
+  public int getCastOrParen() {
+    int tempPosition = currentPosition;
+    char tempCharacter = currentCharacter;
+    int tempToken = TokenNameLPAREN;
+    boolean found = false;
+    StringBuffer buf = new StringBuffer();
     try {
-      while (!phpMode) {
-        startPosition = currentPosition;
+      do {
         currentCharacter = source[currentPosition++];
-        if (currentCharacter == '<') {
-          if (getNextChar('?')) {
-            currentCharacter = source[currentPosition++];
-            if ((currentCharacter == ' ')
-              || Character.isWhitespace(currentCharacter)) {
-              // <?
-              startPosition = currentPosition;
-              phpMode = true;
+      } while (currentCharacter == ' ' || currentCharacter == '\t');
+      while ((currentCharacter >= 'a' && currentCharacter <= 'z')
+          || (currentCharacter >= 'A' && currentCharacter <= 'Z')) {
+        buf.append(currentCharacter);
+        currentCharacter = source[currentPosition++];
+      }
+      if (buf.length() >= 3 && buf.length() <= 7) {
+        char[] data = buf.toString().toCharArray();
+        int index = 0;
+        switch (data.length) {
+          case 3 :
+            // int
+            if ((data[index] == 'i') && (data[++index] == 'n')
+                && (data[++index] == 't')) {
+              found = true;
+              tempToken = TokenNameintCAST;
+            }
+            break;
+          case 4 :
+            // bool real
+            if ((data[index] == 'b') && (data[++index] == 'o')
+                && (data[++index] == 'o') && (data[++index] == 'l')) {
+              found = true;
+              tempToken = TokenNameboolCAST;
             } else {
-              boolean phpStart =
-                (currentCharacter == 'P') || (currentCharacter == 'p');
-              if (phpStart) {
-                int test = getNextChar('H', 'h');
-                if (test >= 0) {
-                  test = getNextChar('P', 'p');
-                  if (test >= 0) {
-                    // <?PHP  <?php
-                    startPosition = currentPosition;
-                    phpMode = true;
-                  }
+              index = 0;
+              if ((data[index] == 'r') && (data[++index] == 'e')
+                  && (data[++index] == 'a') && (data[++index] == 'l')) {
+                found = true;
+                tempToken = TokenNamedoubleCAST;
+              }
+            }
+            break;
+          case 5 :
+            // array unset float
+            if ((data[index] == 'a') && (data[++index] == 'r')
+                && (data[++index] == 'r') && (data[++index] == 'a')
+                && (data[++index] == 'y')) {
+              found = true;
+              tempToken = TokenNamearrayCAST;
+            } else {
+              index = 0;
+              if ((data[index] == 'u') && (data[++index] == 'n')
+                  && (data[++index] == 's') && (data[++index] == 'e')
+                  && (data[++index] == 't')) {
+                found = true;
+                tempToken = TokenNameunsetCAST;
+              } else {
+                index = 0;
+                if ((data[index] == 'f') && (data[++index] == 'l')
+                    && (data[++index] == 'o') && (data[++index] == 'a')
+                    && (data[++index] == 't')) {
+                  found = true;
+                  tempToken = TokenNamedoubleCAST;
                 }
               }
             }
-          }
+            break;
+          case 6 :
+            // object string double
+            if ((data[index] == 'o') && (data[++index] == 'b')
+                && (data[++index] == 'j') && (data[++index] == 'e')
+                && (data[++index] == 'c') && (data[++index] == 't')) {
+              found = true;
+              tempToken = TokenNameobjectCAST;
+            } else {
+              index = 0;
+              if ((data[index] == 's') && (data[++index] == 't')
+                  && (data[++index] == 'r') && (data[++index] == 'i')
+                  && (data[++index] == 'n') && (data[++index] == 'g')) {
+                found = true;
+                tempToken = TokenNamestringCAST;
+              } else {
+                index = 0;
+                if ((data[index] == 'd') && (data[++index] == 'o')
+                    && (data[++index] == 'u') && (data[++index] == 'b')
+                    && (data[++index] == 'l') && (data[++index] == 'e')) {
+                  found = true;
+                  tempToken = TokenNamedoubleCAST;
+                }
+              }
+            }
+            break;
+          case 7 :
+            // boolean integer
+            if ((data[index] == 'b') && (data[++index] == 'o')
+                && (data[++index] == 'o') && (data[++index] == 'l')
+                && (data[++index] == 'e') && (data[++index] == 'a')
+                && (data[++index] == 'n')) {
+              found = true;
+              tempToken = TokenNameboolCAST;
+            } else {
+              index = 0;
+              if ((data[index] == 'i') && (data[++index] == 'n')
+                  && (data[++index] == 't') && (data[++index] == 'e')
+                  && (data[++index] == 'g') && (data[++index] == 'e')
+                  && (data[++index] == 'r')) {
+                found = true;
+                tempToken = TokenNameintCAST;
+              }
+            }
+            break;
         }
-
-        if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
-          if (recordLineSeparator) {
-            pushLineSeparator();
-          } else {
-            currentLine = null;
+        if (found) {
+          while (currentCharacter == ' ' || currentCharacter == '\t') {
+            currentCharacter = source[currentPosition++];
+          }
+          if (currentCharacter == ')') {
+            return tempToken;
           }
         }
       }
-    } //-----------------end switch while try--------------------
-    catch (IndexOutOfBoundsException e) {
-      return TokenNameEOF;
+    } catch (IndexOutOfBoundsException e) {
+    }
+    currentCharacter = tempCharacter;
+    currentPosition = tempPosition;
+    return TokenNameLPAREN;
+  }
+  public int getNextToken() throws InvalidInputException {
+    if (!phpMode) {
+      return getInlinedHTML(currentPosition);
     }
-
     if (phpMode) {
       this.wasAcr = false;
       if (diet) {
@@ -770,32 +817,153 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return currentPosition > source.length ? TokenNameEOF : TokenNameRBRACE;
       }
       try {
-        while (true) { //loop for jumping over comments
+        while (true) {
           withoutUnicodePtr = 0;
-          //start with a new token (even comment written with unicode )
-
+          //start with a new token
+          char encapsedChar = ' ';
+          if (!encapsedStringStack.isEmpty()) {
+            encapsedChar = ((Character) encapsedStringStack.peek()).charValue();
+          }
+          if (encapsedChar != '$' && encapsedChar != ' ') {
+            currentCharacter = source[currentPosition++];
+            if (currentCharacter == encapsedChar) {
+              switch (currentCharacter) {
+                case '`' :
+                  return TokenNameEncapsedString0;
+                case '\'' :
+                  return TokenNameEncapsedString1;
+                case '"' :
+                  return TokenNameEncapsedString2;
+              }
+            }
+            while (currentCharacter != encapsedChar) {
+              /** ** in PHP \r and \n are valid in string literals *** */
+              switch (currentCharacter) {
+                case '\\' :
+                  int escapeSize = currentPosition;
+                  boolean backSlashAsUnicodeInString = unicodeAsBackSlash;
+                  //scanEscapeCharacter make a side effect on this value and
+                  // we need the previous value few lines down this one
+                  scanDoubleQuotedEscapeCharacter();
+                  escapeSize = currentPosition - escapeSize;
+                  if (withoutUnicodePtr == 0) {
+                    //buffer all the entries that have been left aside....
+                    withoutUnicodePtr = currentPosition - escapeSize - 1
+                        - startPosition;
+                    System.arraycopy(source, startPosition,
+                        withoutUnicodeBuffer, 1, withoutUnicodePtr);
+                    withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+                  } else { //overwrite the / in the buffer
+                    withoutUnicodeBuffer[withoutUnicodePtr] = currentCharacter;
+                    if (backSlashAsUnicodeInString) { //there are TWO \ in
+                      withoutUnicodePtr--;
+                    }
+                  }
+                  break;
+                case '$' :
+                  if (isPHPIdentifierStart(source[currentPosition])
+                      || source[currentPosition] == '{') {
+                    currentPosition--;
+                    encapsedStringStack.push(new Character('$'));
+                    return TokenNameSTRING;
+                  }
+                  break;
+                case '{' :
+                  if (source[currentPosition] == '$') { // CURLY_OPEN
+                    currentPosition--;
+                    encapsedStringStack.push(new Character('$'));
+                    return TokenNameSTRING;
+                  }
+              }
+              // consume next character
+              unicodeAsBackSlash = false;
+              currentCharacter = source[currentPosition++];
+              if (withoutUnicodePtr != 0) {
+                withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+              }
+              //                  }
+            } // end while
+            currentPosition--;
+            return TokenNameSTRING;
+          }
           // ---------Consume white space and handles startPosition---------
           int whiteStart = currentPosition;
-          boolean isWhiteSpace;
-          do {
-            startPosition = currentPosition;
-            if (((currentCharacter = source[currentPosition++]) == '\\')
-              && (source[currentPosition] == 'u')) {
-              isWhiteSpace = jumpOverUnicodeWhiteSpace();
-            } else {
-              if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
-                checkNonExternalizeString();
-                if (recordLineSeparator) {
-                  pushLineSeparator();
-                } else {
-                  currentLine = null;
+          startPosition = currentPosition;
+          currentCharacter = source[currentPosition++];
+          if (encapsedChar == '$') {
+            switch (currentCharacter) {
+              case '\\' :
+                currentCharacter = source[currentPosition++];
+                return TokenNameSTRING;
+              case '{' :
+                if (encapsedChar == '$') {
+                  if (getNextChar('$'))
+                    return TokenNameCURLY_OPEN;
+                }
+                return TokenNameLBRACE;
+              case '}' :
+                return TokenNameRBRACE;
+              case '[' :
+                return TokenNameLBRACKET;
+              case ']' :
+                return TokenNameRBRACKET;
+              case '\'' :
+                return TokenNameEncapsedString1;
+              case '"' :
+                return TokenNameEncapsedString2;
+              case '`' :
+                return TokenNameEncapsedString0;
+              case '-' :
+                if (getNextChar('>'))
+                  return TokenNameMINUS_GREATER;
+                return TokenNameSTRING;
+              default :
+                if (currentCharacter == '$') {
+                  int oldPosition = currentPosition;
+                  try {
+                    currentCharacter = source[currentPosition++];
+                    if (currentCharacter == '{') {
+                      return TokenNameDOLLAR_LBRACE;
+                    }
+                    if (isPHPIdentifierStart(currentCharacter)) {
+                      return scanIdentifierOrKeyword(true);
+                    } else {
+                      currentPosition = oldPosition;
+                      return TokenNameSTRING;
+                    }
+                  } catch (IndexOutOfBoundsException e) {
+                    currentPosition = oldPosition;
+                    return TokenNameSTRING;
+                  }
                 }
+                if (isPHPIdentifierStart(currentCharacter))
+                  return scanIdentifierOrKeyword(false);
+                if (Character.isDigit(currentCharacter))
+                  return scanNumber(false);
+                return TokenNameERROR;
+            }
+          }
+//          boolean isWhiteSpace;
+          while ((currentCharacter == ' ')
+                  || Character.isWhitespace(currentCharacter)) {
+            startPosition = currentPosition;
+            currentCharacter = source[currentPosition++];
+            //            if (((currentCharacter = source[currentPosition++]) == '\\')
+            //              && (source[currentPosition] == 'u')) {
+            //              isWhiteSpace = jumpOverUnicodeWhiteSpace();
+            //            } else {
+            if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
+              checkNonExternalizeString();
+              if (recordLineSeparator) {
+                pushLineSeparator();
+              } else {
+                currentLine = null;
               }
-              isWhiteSpace =
-                (currentCharacter == ' ')
-                  || Character.isWhitespace(currentCharacter);
             }
-          } while (isWhiteSpace);
+//            isWhiteSpace = (currentCharacter == ' ')
+//                || Character.isWhitespace(currentCharacter);
+            //            }
+          } 
           if (tokenizeWhiteSpace && (whiteStart != currentPosition - 1)) {
             // reposition scanner in case we are interested by spaces as tokens
             currentPosition--;
@@ -805,800 +973,559 @@ public class Scanner implements IScanner, ITerminalSymbols {
           //little trick to get out in the middle of a source compuation
           if (currentPosition > eofPosition)
             return TokenNameEOF;
-
-          // ---------Identify the next token-------------
-
-          switch (currentCharacter) {
-            case '(' :
-              return TokenNameLPAREN;
-            case ')' :
-              return TokenNameRPAREN;
-            case '{' :
-              return TokenNameLBRACE;
-            case '}' :
-              return TokenNameRBRACE;
-            case '[' :
-              return TokenNameLBRACKET;
-            case ']' :
-              return TokenNameRBRACKET;
-            case ';' :
-              return TokenNameSEMICOLON;
-            case ',' :
-              return TokenNameCOMMA;
-
-            case '.' :
-              if (getNextCharAsDigit())
-                return scanNumber(true);
-              return TokenNameDOT;
-            case '+' :
-              {
-                int test;
-                if ((test = getNextChar('+', '=')) == 0)
-                  return TokenNamePLUS_PLUS;
-                if (test > 0)
-                  return TokenNamePLUS_EQUAL;
-                return TokenNamePLUS;
-              }
-            case '-' :
-              {
-                int test;
-                if ((test = getNextChar('-', '=')) == 0)
-                  return TokenNameMINUS_MINUS;
-                if (test > 0)
-                  return TokenNameMINUS_EQUAL;
-                if (getNextChar('>'))
-                  return TokenNameMINUS_GREATER;
-
-                return TokenNameMINUS;
-              }
-            case '~' :
-              if (getNextChar('='))
-                return TokenNameTWIDDLE_EQUAL;
-              return TokenNameTWIDDLE;
-            case '!' :
-              if (getNextChar('='))
-                return TokenNameNOT_EQUAL;
-              return TokenNameNOT;
-            case '*' :
-              if (getNextChar('='))
-                return TokenNameMULTIPLY_EQUAL;
-              return TokenNameMULTIPLY;
-            case '%' :
-              if (getNextChar('='))
-                return TokenNameREMAINDER_EQUAL;
-              return TokenNameREMAINDER;
-            case '<' :
+           
+            // ---------Identify the next token-------------
+            switch (currentCharacter) {
+              case '(' :
+                return getCastOrParen();
+              case ')' :
+                return TokenNameRPAREN;
+              case '{' :
+                return TokenNameLBRACE;
+              case '}' :
+                return TokenNameRBRACE;
+              case '[' :
+                return TokenNameLBRACKET;
+              case ']' :
+                return TokenNameRBRACKET;
+              case ';' :
+                return TokenNameSEMICOLON;
+              case ',' :
+                return TokenNameCOMMA;
+              case '.' :
+                if (getNextChar('='))
+                  return TokenNameDOT_EQUAL;
+                if (getNextCharAsDigit())
+                  return scanNumber(true);
+                return TokenNameDOT;
+              case '+' :
+                {
+                  int test;
+                  if ((test = getNextChar('+', '=')) == 0)
+                    return TokenNamePLUS_PLUS;
+                  if (test > 0)
+                    return TokenNamePLUS_EQUAL;
+                  return TokenNamePLUS;
+                }
+              case '-' :
               {
-                int test;
-                if ((test = getNextChar('=', '<')) == 0)
-                  return TokenNameLESS_EQUAL;
-                if (test > 0) {
-                  if (getNextChar('='))
-                    return TokenNameLEFT_SHIFT_EQUAL;
-                  if (getNextChar('<')) {
-                    int heredocStart = currentPosition;
-                    int heredocLength = 0;
+                  int test;
+                  if ((test = getNextChar('-', '=')) == 0)
+                    return TokenNameMINUS_MINUS;
+                  if (test > 0)
+                    return TokenNameMINUS_EQUAL;
+                  if (getNextChar('>'))
+                    return TokenNameMINUS_GREATER;
+                  return TokenNameMINUS;
+              } 
+              case '~' :
+                if (getNextChar('='))
+                  return TokenNameTWIDDLE_EQUAL;
+                return TokenNameTWIDDLE;
+              case '!' :
+                if (getNextChar('=')) {
+                  if (getNextChar('=')) {
+                    return TokenNameNOT_EQUAL_EQUAL;
+                  }
+                  return TokenNameNOT_EQUAL;
+                }
+                return TokenNameNOT;
+              case '*' :
+                if (getNextChar('='))
+                  return TokenNameMULTIPLY_EQUAL;
+                return TokenNameMULTIPLY;
+              case '%' :
+                if (getNextChar('='))
+                  return TokenNameREMAINDER_EQUAL;
+                return TokenNameREMAINDER;
+              case '<' :
+                {
+                  int oldPosition = currentPosition;
+                  try {
                     currentCharacter = source[currentPosition++];
-                    if (isPHPIdentifierStart(currentCharacter)) {
-                      currentCharacter = source[currentPosition++];
-                    } else {
-                      return TokenNameERROR;
-                    }
-                    while (isPHPIdentifierPart(currentCharacter)) {
-                      currentCharacter = source[currentPosition++];
-                    }
-
-                    heredocLength = currentPosition - heredocStart - 1;
-
-                    // heredoc end-tag determination
-                    boolean endTag = true;
-                    char ch;
-                    do {
-                      ch = source[currentPosition++];
-                      if (ch == '\r' || ch == '\n') {
-                        if (recordLineSeparator) {
-                          pushLineSeparator();
-                        } else {
-                          currentLine = null;
-                        }
-                        for (int i = 0; i < heredocLength; i++) {
-                          if (source[currentPosition + i]
-                            != source[heredocStart + i]) {
-                            endTag = false;
-                            break;
-                          }
+                  } catch (IndexOutOfBoundsException e) {
+                    currentPosition = oldPosition;
+                    return TokenNameLESS;
+                  }
+                  switch (currentCharacter) {
+                    case '=' :
+                      return TokenNameLESS_EQUAL;
+                    case '>' :
+                      return TokenNameNOT_EQUAL;
+                    case '<' :
+                      if (getNextChar('='))
+                        return TokenNameLEFT_SHIFT_EQUAL;
+                      if (getNextChar('<')) {
+                        currentCharacter = source[currentPosition++];
+                        while (Character.isWhitespace(currentCharacter)) {
+                          currentCharacter = source[currentPosition++];
                         }
-                        if (endTag) {
-                          currentPosition += heredocLength - 1;
+                        int heredocStart = currentPosition - 1;
+                        int heredocLength = 0;
+                        if (isPHPIdentifierStart(currentCharacter)) {
                           currentCharacter = source[currentPosition++];
-                          break; // do...while loop
                         } else {
-                          endTag = true;
+                          return TokenNameERROR;
                         }
+                        while (isPHPIdentifierPart(currentCharacter)) {
+                          currentCharacter = source[currentPosition++];
+                        }
+                        heredocLength = currentPosition - heredocStart - 1;
+                        // heredoc end-tag determination
+                        boolean endTag = true;
+                        char ch;
+                        do {
+                          ch = source[currentPosition++];
+                          if (ch == '\r' || ch == '\n') {
+                            if (recordLineSeparator) {
+                              pushLineSeparator();
+                            } else {
+                              currentLine = null;
+                            }
+                            for (int i = 0; i < heredocLength; i++) {
+                              if (source[currentPosition + i] != source[heredocStart
+                                  + i]) {
+                                endTag = false;
+                                break;
+                              }
+                            }
+                            if (endTag) {
+                              currentPosition += heredocLength - 1;
+                              currentCharacter = source[currentPosition++];
+                              break; // do...while loop
+                            } else {
+                              endTag = true;
+                            }
+                          }
+                        } while (true);
+                        return TokenNameHEREDOC;
                       }
-
-                    } while (true);
-
-                    return TokenNameHEREDOC;
+                      return TokenNameLEFT_SHIFT;
                   }
-                  return TokenNameLEFT_SHIFT;
+                  currentPosition = oldPosition;
+                  return TokenNameLESS;
                 }
-                return TokenNameLESS;
-              }
-            case '>' :
-              {
-                int test;
-                if ((test = getNextChar('=', '>')) == 0)
-                  return TokenNameGREATER_EQUAL;
-                if (test > 0) {
+              case '>' :
+                {
+                  int test;
                   if ((test = getNextChar('=', '>')) == 0)
-                    return TokenNameRIGHT_SHIFT_EQUAL;
-                  return TokenNameRIGHT_SHIFT;
-                }
-                return TokenNameGREATER;
-              }
-            case '=' :
-              if (getNextChar('='))
-                return TokenNameEQUAL_EQUAL;
-              if (getNextChar('>'))
-                return TokenNameEQUAL_GREATER;
-              return TokenNameEQUAL;
-            case '&' :
-              {
-                int test;
-                if ((test = getNextChar('&', '=')) == 0)
-                  return TokenNameAND_AND;
-                if (test > 0)
-                  return TokenNameAND_EQUAL;
-                return TokenNameAND;
-              }
-            case '|' :
-              {
-                int test;
-                if ((test = getNextChar('|', '=')) == 0)
-                  return TokenNameOR_OR;
-                if (test > 0)
-                  return TokenNameOR_EQUAL;
-                return TokenNameOR;
-              }
-            case '^' :
-              if (getNextChar('='))
-                return TokenNameXOR_EQUAL;
-              return TokenNameXOR;
-            case '?' :
-              if (getNextChar('>')) {
-                phpMode = false;
-                return TokenNameStopPHP;
-              }
-              return TokenNameQUESTION;
-            case ':' :
-              if (getNextChar(':'))
-                return TokenNameCOLON_COLON;
-              return TokenNameCOLON;
-            case '@' :
-              return TokenNameAT;
-              //                                       case '\'' :
-              //                                               {
-              //                                                       int test;
-              //                                                       if ((test = getNextChar('\n', '\r')) == 0) {
-              //                                                               throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
-              //                                                       }
-              //                                                       if (test > 0) {
-              //                                                               // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-              //                                                               for (int lookAhead = 0;
-              //                                                                       lookAhead < 3;
-              //                                                                       lookAhead++) {
-              //                                                                       if (currentPosition + lookAhead
-              //                                                                               == source.length)
-              //                                                                               break;
-              //                                                                       if (source[currentPosition + lookAhead]
-              //                                                                               == '\n')
-              //                                                                               break;
-              //                                                                       if (source[currentPosition + lookAhead]
-              //                                                                               == '\'') {
-              //                                                                               currentPosition += lookAhead + 1;
-              //                                                                               break;
-              //                                                                       }
-              //                                                               }
-              //                                                               throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
-              //                                                       }
-              //                                               }
-              //                                               if (getNextChar('\'')) {
-              //                                                       // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-              //                                                       for (int lookAhead = 0;
-              //                                                               lookAhead < 3;
-              //                                                               lookAhead++) {
-              //                                                               if (currentPosition + lookAhead
-              //                                                                       == source.length)
-              //                                                                       break;
-              //                                                               if (source[currentPosition + lookAhead]
-              //                                                                       == '\n')
-              //                                                                       break;
-              //                                                               if (source[currentPosition + lookAhead]
-              //                                                                       == '\'') {
-              //                                                                       currentPosition += lookAhead + 1;
-              //                                                                       break;
-              //                                                               }
-              //                                                       }
-              //                                                       throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
-              //                                               }
-              //                                               if (getNextChar('\\'))
-              //                                                       scanEscapeCharacter();
-              //                                               else { // consume next character
-              //                                                       unicodeAsBackSlash = false;
-              //                                                       if (((currentCharacter = source[currentPosition++])
-              //                                                               == '\\')
-              //                                                               && (source[currentPosition] == 'u')) {
-              //                                                               getNextUnicodeChar();
-              //                                                       } else {
-              //                                                               if (withoutUnicodePtr != 0) {
-              //                                                                       withoutUnicodeBuffer[++withoutUnicodePtr] =
-              //                                                                               currentCharacter;
-              //                                                               }
-              //                                                       }
-              //                                               }
-              //                                               //            if (getNextChar('\''))
-              //                                               //              return TokenNameCharacterLiteral;
-              //                                               // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-              //                                               for (int lookAhead = 0; lookAhead < 20; lookAhead++) {
-              //                                                       if (currentPosition + lookAhead == source.length)
-              //                                                               break;
-              //                                                       if (source[currentPosition + lookAhead] == '\n')
-              //                                                               break;
-              //                                                       if (source[currentPosition + lookAhead] == '\'') {
-              //                                                               currentPosition += lookAhead + 1;
-              //                                                               break;
-              //                                                       }
-              //                                               }
-              //                                               throw new InvalidInputException(INVALID_CHARACTER_CONSTANT);
-            case '\'' :
-              try {
-                // consume next character
-                unicodeAsBackSlash = false;
-                if (((currentCharacter = source[currentPosition++]) == '\\')
-                  && (source[currentPosition] == 'u')) {
-                  getNextUnicodeChar();
-                } else {
-                  if (withoutUnicodePtr != 0) {
-                    withoutUnicodeBuffer[++withoutUnicodePtr] =
-                      currentCharacter;
+                    return TokenNameGREATER_EQUAL;
+                  if (test > 0) {
+                    if ((test = getNextChar('=', '>')) == 0)
+                      return TokenNameRIGHT_SHIFT_EQUAL;
+                    return TokenNameRIGHT_SHIFT;
                   }
+                  return TokenNameGREATER;
                 }
-
-                while (currentCharacter != '\'') {
-
-                  /**** in PHP \r and \n are valid in string literals ****/
-                  //                  if ((currentCharacter == '\n')
-                  //                    || (currentCharacter == '\r')) {
-                  //                    // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-                  //                    for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
-                  //                      if (currentPosition + lookAhead == source.length)
-                  //                        break;
-                  //                      if (source[currentPosition + lookAhead] == '\n')
-                  //                        break;
-                  //                      if (source[currentPosition + lookAhead] == '\"') {
-                  //                        currentPosition += lookAhead + 1;
-                  //                        break;
-                  //                      }
-                  //                    }
-                  //                    throw new InvalidInputException(INVALID_CHAR_IN_STRING);
-                  //                  }
-                  if (currentCharacter == '\\') {
-                    int escapeSize = currentPosition;
-                    boolean backSlashAsUnicodeInString = unicodeAsBackSlash;
-                    //scanEscapeCharacter make a side effect on this value and we need the previous value few lines down this one
-                    scanSingleQuotedEscapeCharacter();
-                    escapeSize = currentPosition - escapeSize;
-                    if (withoutUnicodePtr == 0) {
-                      //buffer all the entries that have been left aside....
-                      withoutUnicodePtr =
-                        currentPosition - escapeSize - 1 - startPosition;
-                      System.arraycopy(
-                        source,
-                        startPosition,
-                        withoutUnicodeBuffer,
-                        1,
-                        withoutUnicodePtr);
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    } else { //overwrite the / in the buffer
-                      withoutUnicodeBuffer[withoutUnicodePtr] =
-                        currentCharacter;
-                      if (backSlashAsUnicodeInString) { //there are TWO \ in the stream where only one is correct
-                        withoutUnicodePtr--;
-                      }
-                    }
+              case '=' :
+                if (getNextChar('=')) {
+                  if (getNextChar('=')) {
+                    return TokenNameEQUAL_EQUAL_EQUAL;
                   }
-                  // consume next character
-                  unicodeAsBackSlash = false;
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    getNextUnicodeChar();
-                  } else {
-                    if (withoutUnicodePtr != 0) {
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    }
-                  }
-
+                  return TokenNameEQUAL_EQUAL;
                 }
-              } catch (IndexOutOfBoundsException e) {
-                throw new InvalidInputException(UNTERMINATED_STRING);
-              } catch (InvalidInputException e) {
-                if (e.getMessage().equals(INVALID_ESCAPE)) {
-                  // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-                  for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
-                    if (currentPosition + lookAhead == source.length)
-                      break;
-                    if (source[currentPosition + lookAhead] == '\n')
-                      break;
-                    if (source[currentPosition + lookAhead] == '\'') {
-                      currentPosition += lookAhead + 1;
-                      break;
-                    }
-                  }
-
+                if (getNextChar('>'))
+                  return TokenNameEQUAL_GREATER;
+                return TokenNameEQUAL;
+              case '&' :
+                {
+                  int test;
+                  if ((test = getNextChar('&', '=')) == 0)
+                    return TokenNameAND_AND;
+                  if (test > 0)
+                    return TokenNameAND_EQUAL;
+                  return TokenNameAND;
                 }
-                throw e; // rethrow
-              }
-              if (checkNonExternalizedStringLiterals) { // check for presence of       NLS tags //$NON-NLS-?$ where ? is an int.
-                if (currentLine == null) {
-                  currentLine = new NLSLine();
-                  lines.add(currentLine);
+              case '|' :
+                {
+                  int test;
+                  if ((test = getNextChar('|', '=')) == 0)
+                    return TokenNameOR_OR;
+                  if (test > 0)
+                    return TokenNameOR_EQUAL;
+                  return TokenNameOR;
                 }
-                currentLine.add(
-                  new StringLiteral(
-                    getCurrentTokenSourceString(),
-                    startPosition,
-                    currentPosition - 1));
-              }
-              return TokenNameStringConstant;
-            case '"' :
-              try {
-                // consume next character
-                unicodeAsBackSlash = false;
-                if (((currentCharacter = source[currentPosition++]) == '\\')
-                  && (source[currentPosition] == 'u')) {
-                  getNextUnicodeChar();
-                } else {
-                  if (withoutUnicodePtr != 0) {
-                    withoutUnicodeBuffer[++withoutUnicodePtr] =
-                      currentCharacter;
+              case '^' :
+                if (getNextChar('='))
+                  return TokenNameXOR_EQUAL;
+                return TokenNameXOR;
+              case '?' :
+                if (getNextChar('>')) {
+                  phpMode = false;
+                  if (currentPosition == source.length) {
+                    phpMode = true;
+                    return TokenNameINLINE_HTML;
                   }
+                  return getInlinedHTML(currentPosition - 2);
                 }
-
-                while (currentCharacter != '"') {
-
-                  /**** in PHP \r and \n are valid in string literals ****/
-                  //                  if ((currentCharacter == '\n')
-                  //                    || (currentCharacter == '\r')) {
-                  //                    // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-                  //                    for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
-                  //                      if (currentPosition + lookAhead == source.length)
-                  //                        break;
-                  //                      if (source[currentPosition + lookAhead] == '\n')
-                  //                        break;
-                  //                      if (source[currentPosition + lookAhead] == '\"') {
-                  //                        currentPosition += lookAhead + 1;
-                  //                        break;
-                  //                      }
-                  //                    }
-                  //                    throw new InvalidInputException(INVALID_CHAR_IN_STRING);
-                  //                  }
-                  if (currentCharacter == '\\') {
-                    int escapeSize = currentPosition;
-                    boolean backSlashAsUnicodeInString = unicodeAsBackSlash;
-                    //scanEscapeCharacter make a side effect on this value and we need the previous value few lines down this one
-                    scanDoubleQuotedEscapeCharacter();
-                    escapeSize = currentPosition - escapeSize;
-                    if (withoutUnicodePtr == 0) {
-                      //buffer all the entries that have been left aside....
-                      withoutUnicodePtr =
-                        currentPosition - escapeSize - 1 - startPosition;
-                      System.arraycopy(
-                        source,
-                        startPosition,
-                        withoutUnicodeBuffer,
-                        1,
-                        withoutUnicodePtr);
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    } else { //overwrite the / in the buffer
-                      withoutUnicodeBuffer[withoutUnicodePtr] =
-                        currentCharacter;
-                      if (backSlashAsUnicodeInString) { //there are TWO \ in the stream where only one is correct
-                        withoutUnicodePtr--;
-                      }
-                    }
-                  }
+                return TokenNameQUESTION;
+              case ':' :
+                if (getNextChar(':'))
+                  return TokenNamePAAMAYIM_NEKUDOTAYIM;
+                return TokenNameCOLON;
+              case '@' :
+                return TokenNameAT;
+              case '\'' :
+//                return TokenNameEncapsedString1;
+                try {
                   // consume next character
                   unicodeAsBackSlash = false;
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    getNextUnicodeChar();
-                  } else {
-                    if (withoutUnicodePtr != 0) {
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    }
-                  }
-
-                }
-              } catch (IndexOutOfBoundsException e) {
-                throw new InvalidInputException(UNTERMINATED_STRING);
-              } catch (InvalidInputException e) {
-                if (e.getMessage().equals(INVALID_ESCAPE)) {
-                  // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-                  for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
-                    if (currentPosition + lookAhead == source.length)
-                      break;
-                    if (source[currentPosition + lookAhead] == '\n')
-                      break;
-                    if (source[currentPosition + lookAhead] == '\"') {
-                      currentPosition += lookAhead + 1;
-                      break;
-                    }
-                  }
-
-                }
-                throw e; // rethrow
-              }
-              if (checkNonExternalizedStringLiterals) { // check for presence of       NLS tags //$NON-NLS-?$ where ? is an int.
-                if (currentLine == null) {
-                  currentLine = new NLSLine();
-                  lines.add(currentLine);
-                }
-                currentLine.add(
-                  new StringLiteral(
-                    getCurrentTokenSourceString(),
-                    startPosition,
-                    currentPosition - 1));
-              }
-              return TokenNameStringLiteral;
-            case '`' :
-              try {
-                // consume next character
-                unicodeAsBackSlash = false;
-                if (((currentCharacter = source[currentPosition++]) == '\\')
-                  && (source[currentPosition] == 'u')) {
-                  getNextUnicodeChar();
-                } else {
-                  if (withoutUnicodePtr != 0) {
-                    withoutUnicodeBuffer[++withoutUnicodePtr] =
-                      currentCharacter;
-                  }
-                }
-
-                while (currentCharacter != '`') {
-
-                  /**** in PHP \r and \n are valid in string literals ****/
-                  //                if ((currentCharacter == '\n')
-                  //                  || (currentCharacter == '\r')) {
-                  //                  // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-                  //                  for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
-                  //                    if (currentPosition + lookAhead == source.length)
-                  //                      break;
-                  //                    if (source[currentPosition + lookAhead] == '\n')
-                  //                      break;
-                  //                    if (source[currentPosition + lookAhead] == '\"') {
-                  //                      currentPosition += lookAhead + 1;
-                  //                      break;
-                  //                    }
+                  currentCharacter = source[currentPosition++];
+                  //                if (((currentCharacter = source[currentPosition++]) == '\\')
+                  //                  && (source[currentPosition] == 'u')) {
+                  //                  getNextUnicodeChar();
+                  //                } else {
+                  //                  if (withoutUnicodePtr != 0) {
+                  //                    withoutUnicodeBuffer[++withoutUnicodePtr] =
+                  //                      currentCharacter;
                   //                  }
-                  //                  throw new InvalidInputException(INVALID_CHAR_IN_STRING);
                   //                }
-                  if (currentCharacter == '\\') {
-                    int escapeSize = currentPosition;
-                    boolean backSlashAsUnicodeInString = unicodeAsBackSlash;
-                    //scanEscapeCharacter make a side effect on this value and we need the previous value few lines down this one
-                    scanDoubleQuotedEscapeCharacter();
-                    escapeSize = currentPosition - escapeSize;
-                    if (withoutUnicodePtr == 0) {
-                      //buffer all the entries that have been left aside....
-                      withoutUnicodePtr =
-                        currentPosition - escapeSize - 1 - startPosition;
-                      System.arraycopy(
-                        source,
-                        startPosition,
-                        withoutUnicodeBuffer,
-                        1,
-                        withoutUnicodePtr);
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    } else { //overwrite the / in the buffer
-                      withoutUnicodeBuffer[withoutUnicodePtr] =
-                        currentCharacter;
-                      if (backSlashAsUnicodeInString) { //there are TWO \ in the stream where only one is correct
-                        withoutUnicodePtr--;
+                  while (currentCharacter != '\'') {
+                    /** ** in PHP \r and \n are valid in string literals *** */
+                    //                  if ((currentCharacter == '\n')
+                    //                    || (currentCharacter == '\r')) {
+                    //                    // relocate if finding another quote fairly close: thus
+                    // unicode '/u000D' will be fully consumed
+                    //                    for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
+                    //                      if (currentPosition + lookAhead == source.length)
+                    //                        break;
+                    //                      if (source[currentPosition + lookAhead] == '\n')
+                    //                        break;
+                    //                      if (source[currentPosition + lookAhead] == '\"') {
+                    //                        currentPosition += lookAhead + 1;
+                    //                        break;
+                    //                      }
+                    //                    }
+                    //                    throw new InvalidInputException(INVALID_CHAR_IN_STRING);
+                    //                  }
+                    if (currentCharacter == '\\') {
+                      int escapeSize = currentPosition;
+                      boolean backSlashAsUnicodeInString = unicodeAsBackSlash;
+                      //scanEscapeCharacter make a side effect on this value and
+                      // we need the previous value few lines down this one
+                      scanSingleQuotedEscapeCharacter();
+                      escapeSize = currentPosition - escapeSize;
+                      if (withoutUnicodePtr == 0) {
+                        //buffer all the entries that have been left aside....
+                        withoutUnicodePtr = currentPosition - escapeSize - 1
+                            - startPosition;
+                        System.arraycopy(source, startPosition,
+                            withoutUnicodeBuffer, 1, withoutUnicodePtr);
+                        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+                      } else { //overwrite the / in the buffer
+                        withoutUnicodeBuffer[withoutUnicodePtr] = currentCharacter;
+                        if (backSlashAsUnicodeInString) { //there are TWO \ in
+                          // the stream where
+                          // only one is correct
+                          withoutUnicodePtr--;
+                        }
                       }
                     }
-                  }
-                  // consume next character
-                  unicodeAsBackSlash = false;
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    getNextUnicodeChar();
-                  } else {
+                    // consume next character
+                    unicodeAsBackSlash = false;
+                    currentCharacter = source[currentPosition++];
+                    //                  if (((currentCharacter = source[currentPosition++]) ==
+                    // '\\')
+                    //                    && (source[currentPosition] == 'u')) {
+                    //                    getNextUnicodeChar();
+                    //                  } else {
                     if (withoutUnicodePtr != 0) {
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
+                      withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
                     }
+                    //                  }
                   }
-
-                }
-              } catch (IndexOutOfBoundsException e) {
-                throw new InvalidInputException(UNTERMINATED_STRING);
-              } catch (InvalidInputException e) {
-                if (e.getMessage().equals(INVALID_ESCAPE)) {
-                  // relocate if finding another quote fairly close: thus unicode '/u000D' will be fully consumed
-                  for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
-                    if (currentPosition + lookAhead == source.length)
-                      break;
-                    if (source[currentPosition + lookAhead] == '\n')
-                      break;
-                    if (source[currentPosition + lookAhead] == '`') {
-                      currentPosition += lookAhead + 1;
-                      break;
+                } catch (IndexOutOfBoundsException e) {
+                  throw new InvalidInputException(UNTERMINATED_STRING);
+                } catch (InvalidInputException e) {
+                  if (e.getMessage().equals(INVALID_ESCAPE)) {
+                    // relocate if finding another quote fairly close: thus
+                    // unicode '/u000D' will be fully consumed
+                    for (int lookAhead = 0; lookAhead < 50; lookAhead++) {
+                      if (currentPosition + lookAhead == source.length)
+                        break;
+                      if (source[currentPosition + lookAhead] == '\n')
+                        break;
+                      if (source[currentPosition + lookAhead] == '\'') {
+                        currentPosition += lookAhead + 1;
+                        break;
+                      }
                     }
                   }
-
+                  throw e; // rethrow
                 }
-                throw e; // rethrow
-              }
-              if (checkNonExternalizedStringLiterals) { // check for presence of       NLS tags //$NON-NLS-?$ where ? is an int.
-                if (currentLine == null) {
-                  currentLine = new NLSLine();
-                  lines.add(currentLine);
+                if (checkNonExternalizedStringLiterals) { // check for presence
+                  // of NLS tags
+                  // //$NON-NLS-?$ where
+                  // ? is an int.
+                  if (currentLine == null) {
+                    currentLine = new NLSLine();
+                    lines.add(currentLine);
+                  }
+                  currentLine.add(new StringLiteral(
+                      getCurrentTokenSourceString(), startPosition,
+                      currentPosition - 1));
                 }
-                currentLine.add(
-                  new StringLiteral(
-                    getCurrentTokenSourceString(),
-                    startPosition,
-                    currentPosition - 1));
-              }
-              return TokenNameStringInterpolated;
-            case '#' :
-            case '/' :
-              {
-                int test;
-                if ((currentCharacter == '#')
-                  || (test = getNextChar('/', '*')) == 0) {
-                  //line comment 
-                  int endPositionForLineComment = 0;
-                  try { //get the next char 
-                    if (((currentCharacter = source[currentPosition++])
-                      == '\\')
-                      && (source[currentPosition] == 'u')) {
-                      //-------------unicode traitement ------------
-                      int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                      currentPosition++;
-                      while (source[currentPosition] == 'u') {
-                        currentPosition++;
+                return TokenNameStringConstant;
+              case '"' :
+                return TokenNameEncapsedString2;
+              case '`' :
+                return TokenNameEncapsedString0;
+              case '#' :
+              case '/' :
+                {
+                  char startChar = currentCharacter;
+                  if (getNextChar('=')) {
+                    return TokenNameDIVIDE_EQUAL;
+                  }
+                  int test;
+                  if ((startChar == '#') || (test = getNextChar('/', '*')) == 0) {
+                    //line comment
+                    int endPositionForLineComment = 0;
+                    try { //get the next char
+                      currentCharacter = source[currentPosition++];
+                      //                    if (((currentCharacter = source[currentPosition++])
+                      //                      == '\\')
+                      //                      && (source[currentPosition] == 'u')) {
+                      //                      //-------------unicode traitement ------------
+                      //                      int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                      //                      currentPosition++;
+                      //                      while (source[currentPosition] == 'u') {
+                      //                        currentPosition++;
+                      //                      }
+                      //                      if ((c1 =
+                      //                        Character.getNumericValue(source[currentPosition++]))
+                      //                        > 15
+                      //                        || c1 < 0
+                      //                        || (c2 =
+                      //                          Character.getNumericValue(source[currentPosition++]))
+                      //                          > 15
+                      //                        || c2 < 0
+                      //                        || (c3 =
+                      //                          Character.getNumericValue(source[currentPosition++]))
+                      //                          > 15
+                      //                        || c3 < 0
+                      //                        || (c4 =
+                      //                          Character.getNumericValue(source[currentPosition++]))
+                      //                          > 15
+                      //                        || c4 < 0) {
+                      //                        throw new
+                      // InvalidInputException(INVALID_UNICODE_ESCAPE);
+                      //                      } else {
+                      //                        currentCharacter =
+                      //                          (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                      //                      }
+                      //                    }
+                      //handle the \\u case manually into comment
+                      //                    if (currentCharacter == '\\') {
+                      //                      if (source[currentPosition] == '\\')
+                      //                        currentPosition++;
+                      //                    } //jump over the \\
+                      boolean isUnicode = false;
+                      while (currentCharacter != '\r'
+                          && currentCharacter != '\n') {
+                        if (currentCharacter == '?') {
+                          if (getNextChar('>')) {
+                            startPosition = currentPosition - 2;
+                            phpMode = false;
+                            return TokenNameINLINE_HTML;
+                          }
+                        }
+                        //get the next char
+                        isUnicode = false;
+                        currentCharacter = source[currentPosition++];
+                        //                      if (((currentCharacter = source[currentPosition++])
+                        //                        == '\\')
+                        //                        && (source[currentPosition] == 'u')) {
+                        //                        isUnicode = true;
+                        //                        //-------------unicode traitement ------------
+                        //                        int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                        //                        currentPosition++;
+                        //                        while (source[currentPosition] == 'u') {
+                        //                          currentPosition++;
+                        //                        }
+                        //                        if ((c1 =
+                        //                          Character.getNumericValue(source[currentPosition++]))
+                        //                          > 15
+                        //                          || c1 < 0
+                        //                          || (c2 =
+                        //                            Character.getNumericValue(
+                        //                              source[currentPosition++]))
+                        //                            > 15
+                        //                          || c2 < 0
+                        //                          || (c3 =
+                        //                            Character.getNumericValue(
+                        //                              source[currentPosition++]))
+                        //                            > 15
+                        //                          || c3 < 0
+                        //                          || (c4 =
+                        //                            Character.getNumericValue(
+                        //                              source[currentPosition++]))
+                        //                            > 15
+                        //                          || c4 < 0) {
+                        //                          throw new
+                        // InvalidInputException(INVALID_UNICODE_ESCAPE);
+                        //                        } else {
+                        //                          currentCharacter =
+                        //                            (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                        //                        }
+                        //                      }
+                        //handle the \\u case manually into comment
+                        //                      if (currentCharacter == '\\') {
+                        //                        if (source[currentPosition] == '\\')
+                        //                          currentPosition++;
+                        //                      } //jump over the \\
                       }
-                      if ((c1 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                        || c1 < 0
-                        || (c2 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c2 < 0
-                        || (c3 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c3 < 0
-                        || (c4 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c4 < 0) {
-                        throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
+                      if (isUnicode) {
+                        endPositionForLineComment = currentPosition - 6;
                       } else {
-                        currentCharacter =
-                          (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                        endPositionForLineComment = currentPosition - 1;
                       }
-                    }
-
-                    //handle the \\u case manually into comment
-                    if (currentCharacter == '\\') {
-                      if (source[currentPosition] == '\\')
-                        currentPosition++;
-                    } //jump over the \\
-                    boolean isUnicode = false;
-                    while (currentCharacter != '\r'
-                      && currentCharacter != '\n') {
-                      if (currentCharacter == '?') {
-                        if (getNextChar('>')) {
-                          startPosition = currentPosition - 2;
-                          phpMode = false;
-                          return TokenNameStopPHP;
+                      recordComment(false);
+                      if ((currentCharacter == '\r')
+                          || (currentCharacter == '\n')) {
+                        checkNonExternalizeString();
+                        if (recordLineSeparator) {
+                          if (isUnicode) {
+                            pushUnicodeLineSeparator();
+                          } else {
+                            pushLineSeparator();
+                          }
+                        } else {
+                          currentLine = null;
                         }
                       }
-
-                      //get the next char
-                      isUnicode = false;
-                      if (((currentCharacter = source[currentPosition++])
-                        == '\\')
-                        && (source[currentPosition] == 'u')) {
-                        isUnicode = true;
-                        //-------------unicode traitement ------------
-                        int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                        currentPosition++;
-                        while (source[currentPosition] == 'u') {
-                          currentPosition++;
-                        }
-                        if ((c1 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                          || c1 < 0
-                          || (c2 =
-                            Character.getNumericValue(
-                              source[currentPosition++]))
-                            > 15
-                          || c2 < 0
-                          || (c3 =
-                            Character.getNumericValue(
-                              source[currentPosition++]))
-                            > 15
-                          || c3 < 0
-                          || (c4 =
-                            Character.getNumericValue(
-                              source[currentPosition++]))
-                            > 15
-                          || c4 < 0) {
-                          throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
-                        } else {
-                          currentCharacter =
-                            (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                      if (tokenizeComments) {
+                        if (!isUnicode) {
+                          currentPosition = endPositionForLineComment;
+                          // reset one character behind
                         }
+                        return TokenNameCOMMENT_LINE;
+                      }
+                    } catch (IndexOutOfBoundsException e) { //an eof will them
+                      // be generated
+                      if (tokenizeComments) {
+                        currentPosition--;
+                        // reset one character behind
+                        return TokenNameCOMMENT_LINE;
                       }
-                      //handle the \\u case manually into comment
-                      if (currentCharacter == '\\') {
-                        if (source[currentPosition] == '\\')
-                          currentPosition++;
-                      } //jump over the \\
                     }
-                    if (isUnicode) {
-                      endPositionForLineComment = currentPosition - 6;
-                    } else {
-                      endPositionForLineComment = currentPosition - 1;
+                    break;
+                  }
+                  if (test > 0) {
+                    //traditional and annotation comment
+                    boolean isJavadoc = false, star = false;
+                    // consume next character
+                    unicodeAsBackSlash = false;
+                    currentCharacter = source[currentPosition++];
+                    //                  if (((currentCharacter = source[currentPosition++]) ==
+                    // '\\')
+                    //                    && (source[currentPosition] == 'u')) {
+                    //                    getNextUnicodeChar();
+                    //                  } else {
+                    //                    if (withoutUnicodePtr != 0) {
+                    //                      withoutUnicodeBuffer[++withoutUnicodePtr] =
+                    //                        currentCharacter;
+                    //                    }
+                    //                  }
+                    if (currentCharacter == '*') {
+                      isJavadoc = true;
+                      star = true;
                     }
-                    recordComment(false);
                     if ((currentCharacter == '\r')
-                      || (currentCharacter == '\n')) {
+                        || (currentCharacter == '\n')) {
                       checkNonExternalizeString();
                       if (recordLineSeparator) {
-                        if (isUnicode) {
-                          pushUnicodeLineSeparator();
-                        } else {
-                          pushLineSeparator();
-                        }
+                        pushLineSeparator();
                       } else {
                         currentLine = null;
                       }
                     }
-                    if (tokenizeComments) {
-                      if (!isUnicode) {
-                        currentPosition = endPositionForLineComment;
-                        // reset one character behind
+                    try { //get the next char
+                      currentCharacter = source[currentPosition++];
+                      //                    if (((currentCharacter = source[currentPosition++])
+                      //                      == '\\')
+                      //                      && (source[currentPosition] == 'u')) {
+                      //                      //-------------unicode traitement ------------
+                      //                      getNextUnicodeChar();
+                      //                    }
+                      //handle the \\u case manually into comment
+                      //                    if (currentCharacter == '\\') {
+                      //                      if (source[currentPosition] == '\\')
+                      //                        currentPosition++;
+                      //                      //jump over the \\
+                      //                    }
+                      // empty comment is not a javadoc /**/
+                      if (currentCharacter == '/') {
+                        isJavadoc = false;
                       }
-                      return TokenNameCOMMENT_LINE;
-                    }
-                  } catch (IndexOutOfBoundsException e) { //an eof will them be generated
-                    if (tokenizeComments) {
-                      currentPosition--;
-                      // reset one character behind
-                      return TokenNameCOMMENT_LINE;
-                    }
-                  }
-                  break;
-                }
-                if (test > 0) {
-                  //traditional and annotation comment
-                  boolean isJavadoc = false, star = false;
-                  // consume next character
-                  unicodeAsBackSlash = false;
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    getNextUnicodeChar();
-                  } else {
-                    if (withoutUnicodePtr != 0) {
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    }
-                  }
-
-                  if (currentCharacter == '*') {
-                    isJavadoc = true;
-                    star = true;
-                  }
-                  if ((currentCharacter == '\r')
-                    || (currentCharacter == '\n')) {
-                    checkNonExternalizeString();
-                    if (recordLineSeparator) {
-                      pushLineSeparator();
-                    } else {
-                      currentLine = null;
-                    }
-                  }
-                  try { //get the next char 
-                    if (((currentCharacter = source[currentPosition++])
-                      == '\\')
-                      && (source[currentPosition] == 'u')) {
-                      //-------------unicode traitement ------------
-                      getNextUnicodeChar();
-                    }
-                    //handle the \\u case manually into comment
-                    if (currentCharacter == '\\') {
-                      if (source[currentPosition] == '\\')
-                        currentPosition++;
-                      //jump over the \\
-                    }
-                    // empty comment is not a javadoc /**/
-                    if (currentCharacter == '/') {
-                      isJavadoc = false;
-                    }
-                    //loop until end of comment */
-                    while ((currentCharacter != '/') || (!star)) {
-                      if ((currentCharacter == '\r')
-                        || (currentCharacter == '\n')) {
-                        checkNonExternalizeString();
-                        if (recordLineSeparator) {
-                          pushLineSeparator();
-                        } else {
-                          currentLine = null;
+                      //loop until end of comment */
+                      while ((currentCharacter != '/') || (!star)) {
+                        if ((currentCharacter == '\r')
+                            || (currentCharacter == '\n')) {
+                          checkNonExternalizeString();
+                          if (recordLineSeparator) {
+                            pushLineSeparator();
+                          } else {
+                            currentLine = null;
+                          }
                         }
+                        star = currentCharacter == '*';
+                        //get next char
+                        currentCharacter = source[currentPosition++];
+                        //                      if (((currentCharacter = source[currentPosition++])
+                        //                        == '\\')
+                        //                        && (source[currentPosition] == 'u')) {
+                        //                        //-------------unicode traitement ------------
+                        //                        getNextUnicodeChar();
+                        //                      }
+                        //handle the \\u case manually into comment
+                        //                      if (currentCharacter == '\\') {
+                        //                        if (source[currentPosition] == '\\')
+                        //                          currentPosition++;
+                        //                      } //jump over the \\
                       }
-                      star = currentCharacter == '*';
-                      //get next char
-                      if (((currentCharacter = source[currentPosition++])
-                        == '\\')
-                        && (source[currentPosition] == 'u')) {
-                        //-------------unicode traitement ------------
-                        getNextUnicodeChar();
+                      recordComment(isJavadoc);
+                      if (tokenizeComments) {
+                        if (isJavadoc)
+                          return TokenNameCOMMENT_PHPDOC;
+                        return TokenNameCOMMENT_BLOCK;
                       }
-                      //handle the \\u case manually into comment
-                      if (currentCharacter == '\\') {
-                        if (source[currentPosition] == '\\')
-                          currentPosition++;
-                      } //jump over the \\
+                    } catch (IndexOutOfBoundsException e) {
+                      throw new InvalidInputException(UNTERMINATED_COMMENT);
                     }
-                    recordComment(isJavadoc);
-                    if (tokenizeComments) {
-                      if (isJavadoc)
-                        return TokenNameCOMMENT_PHPDOC;
-                      return TokenNameCOMMENT_BLOCK;
+                    break;
+                  }
+                  return TokenNameDIVIDE;
+                }
+              case '\u001a' :
+                if (atEnd())
+                  return TokenNameEOF;
+                //the atEnd may not be <currentPosition == source.length> if
+                // source is only some part of a real (external) stream
+                throw new InvalidInputException("Ctrl-Z"); //$NON-NLS-1$
+              default :
+                if (currentCharacter == '$') {
+                  int oldPosition = currentPosition;
+                  try {
+                    currentCharacter = source[currentPosition++];
+                    if (isPHPIdentifierStart(currentCharacter)) {
+                      return scanIdentifierOrKeyword(true);
+                    } else {
+                      currentPosition = oldPosition;
+                      return TokenNameDOLLAR;
                     }
                   } catch (IndexOutOfBoundsException e) {
-                    throw new InvalidInputException(UNTERMINATED_COMMENT);
+                    currentPosition = oldPosition;
+                    return TokenNameDOLLAR;
                   }
-                  break;
                 }
-                if (getNextChar('='))
-                  return TokenNameDIVIDE_EQUAL;
-                return TokenNameDIVIDE;
-              }
-            case '\u001a' :
-              if (atEnd())
-                return TokenNameEOF;
-              //the atEnd may not be <currentPosition == source.length> if source is only some part of a real (external) stream
-              throw new InvalidInputException("Ctrl-Z"); //$NON-NLS-1$
-
-            default :
-              if (currentCharacter == '$') {
-                while ( (currentCharacter = source[currentPosition++])=='$') {
-                }
-                if (currentCharacter == '{')
-                  return TokenNameDOLLAR_LBRACE;
                 if (isPHPIdentifierStart(currentCharacter))
-                  return scanIdentifierOrKeyword(true);
+                  return scanIdentifierOrKeyword(false);
+                if (Character.isDigit(currentCharacter))
+                  return scanNumber(false);
                 return TokenNameERROR;
-              }
-              if (isPHPIdentifierStart(currentCharacter))
-                return scanIdentifierOrKeyword(false);
-              if (Character.isDigit(currentCharacter))
-                return scanNumber(false);
-              return TokenNameERROR;
-          }
+            }
+         
         }
       } //-----------------end switch while try--------------------
       catch (IndexOutOfBoundsException e) {
@@ -1606,55 +1533,113 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
     return TokenNameEOF;
   }
-
-  public final void getNextUnicodeChar()
-    throws IndexOutOfBoundsException, InvalidInputException {
-    //VOID
-    //handle the case of unicode.
-    //when a unicode appears then we must use a buffer that holds char internal values
-    //At the end of this method currentCharacter holds the new visited char
-    //and currentPosition points right next after it
-
-    //ALL getNextChar.... ARE OPTIMIZED COPIES 
-
-    int c1 = 0, c2 = 0, c3 = 0, c4 = 0, unicodeSize = 6;
-    currentPosition++;
-    while (source[currentPosition] == 'u') {
-      currentPosition++;
-      unicodeSize++;
+  /**
+   * @return @throws
+   *         InvalidInputException
+   */
+  private int getInlinedHTML(int start) throws InvalidInputException {
+    //    int htmlPosition = start;
+    if (currentPosition > source.length) {
+      currentPosition = source.length;
+      return TokenNameEOF;
     }
-
-    if ((c1 = Character.getNumericValue(source[currentPosition++])) > 15
-      || c1 < 0
-      || (c2 = Character.getNumericValue(source[currentPosition++])) > 15
-      || c2 < 0
-      || (c3 = Character.getNumericValue(source[currentPosition++])) > 15
-      || c3 < 0
-      || (c4 = Character.getNumericValue(source[currentPosition++])) > 15
-      || c4 < 0) {
-      throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
-    } else {
-      currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-      //need the unicode buffer
-      if (withoutUnicodePtr == 0) {
-        //buffer all the entries that have been left aside....
-        withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
-        System.arraycopy(
-          source,
-          startPosition,
-          withoutUnicodeBuffer,
-          1,
-          withoutUnicodePtr);
-      }
-      //fill the buffer with the char
-      withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+    startPosition = start;
+    try {
+      while (!phpMode) {
+        currentCharacter = source[currentPosition++];
+        if (currentCharacter == '<') {
+          if (getNextChar('?')) {
+            currentCharacter = source[currentPosition++];
+            if ((currentCharacter == ' ')
+                || Character.isWhitespace(currentCharacter)) {
+              // <?
+              phpMode = true;
+              return TokenNameINLINE_HTML;
+            } else {
+              boolean phpStart = (currentCharacter == 'P')
+                  || (currentCharacter == 'p');
+              if (phpStart) {
+                int test = getNextChar('H', 'h');
+                if (test >= 0) {
+                  test = getNextChar('P', 'p');
+                  if (test >= 0) {
+                    // <?PHP <?php
+                    phpMode = true;
+                    return TokenNameINLINE_HTML;
+                  }
+                }
+              }
+            }
+          }
+        }
+        if ((currentCharacter == '\r') || (currentCharacter == '\n')) {
+          if (recordLineSeparator) {
+            pushLineSeparator();
+          } else {
+            currentLine = null;
+          }
+        }
+      } //-----------------while--------------------
+      phpMode = true;
+      return TokenNameINLINE_HTML;
+    } //-----------------try--------------------
+    catch (IndexOutOfBoundsException e) {
+      startPosition = start;
+      currentPosition--;
     }
-    unicodeAsBackSlash = currentCharacter == '\\';
+    phpMode = true;
+    return TokenNameINLINE_HTML;
   }
-  /* Tokenize a method body, assuming that curly brackets are properly balanced.
+  //  public final void getNextUnicodeChar()
+  //    throws IndexOutOfBoundsException, InvalidInputException {
+  //    //VOID
+  //    //handle the case of unicode.
+  //    //when a unicode appears then we must use a buffer that holds char
+  // internal values
+  //    //At the end of this method currentCharacter holds the new visited char
+  //    //and currentPosition points right next after it
+  //
+  //    //ALL getNextChar.... ARE OPTIMIZED COPIES
+  //
+  //    int c1 = 0, c2 = 0, c3 = 0, c4 = 0, unicodeSize = 6;
+  //    currentPosition++;
+  //    while (source[currentPosition] == 'u') {
+  //      currentPosition++;
+  //      unicodeSize++;
+  //    }
+  //
+  //    if ((c1 = Character.getNumericValue(source[currentPosition++])) > 15
+  //      || c1 < 0
+  //      || (c2 = Character.getNumericValue(source[currentPosition++])) > 15
+  //      || c2 < 0
+  //      || (c3 = Character.getNumericValue(source[currentPosition++])) > 15
+  //      || c3 < 0
+  //      || (c4 = Character.getNumericValue(source[currentPosition++])) > 15
+  //      || c4 < 0) {
+  //      throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
+  //    } else {
+  //      currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+  //      //need the unicode buffer
+  //      if (withoutUnicodePtr == 0) {
+  //        //buffer all the entries that have been left aside....
+  //        withoutUnicodePtr = currentPosition - unicodeSize - startPosition;
+  //        System.arraycopy(
+  //          source,
+  //          startPosition,
+  //          withoutUnicodeBuffer,
+  //          1,
+  //          withoutUnicodePtr);
+  //      }
+  //      //fill the buffer with the char
+  //      withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+  //    }
+  //    unicodeAsBackSlash = currentCharacter == '\\';
+  //  }
+  /*
+   * Tokenize a method body, assuming that curly brackets are properly
+   * balanced.
    */
   public final void jumpOverMethodBody() {
-
     this.wasAcr = false;
     int found = 1;
     try {
@@ -1663,17 +1648,17 @@ public class Scanner implements IScanner, ITerminalSymbols {
         boolean isWhiteSpace;
         do {
           startPosition = currentPosition;
-          if (((currentCharacter = source[currentPosition++]) == '\\')
-            && (source[currentPosition] == 'u')) {
-            isWhiteSpace = jumpOverUnicodeWhiteSpace();
-          } else {
-            if (recordLineSeparator
+          currentCharacter = source[currentPosition++];
+          //          if (((currentCharacter = source[currentPosition++]) == '\\')
+          //            && (source[currentPosition] == 'u')) {
+          //            isWhiteSpace = jumpOverUnicodeWhiteSpace();
+          //          } else {
+          if (recordLineSeparator
               && ((currentCharacter == '\r') || (currentCharacter == '\n')))
-              pushLineSeparator();
-            isWhiteSpace = Character.isWhitespace(currentCharacter);
-          }
+            pushLineSeparator();
+          isWhiteSpace = Character.isWhitespace(currentCharacter);
+          //          }
         } while (isWhiteSpace);
-
         // -------consume token until } is found---------
         switch (currentCharacter) {
           case '{' :
@@ -1694,38 +1679,38 @@ public class Scanner implements IScanner, ITerminalSymbols {
                 } catch (InvalidInputException ex) {
                 };
               } else {
-                try { // consume next character
-                  unicodeAsBackSlash = false;
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    getNextUnicodeChar();
-                  } else {
-                    if (withoutUnicodePtr != 0) {
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    }
-                  }
-                } catch (InvalidInputException ex) {
-                };
+                //                try { // consume next character
+                unicodeAsBackSlash = false;
+                currentCharacter = source[currentPosition++];
+                //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                //                    && (source[currentPosition] == 'u')) {
+                //                    getNextUnicodeChar();
+                //                  } else {
+                if (withoutUnicodePtr != 0) {
+                  withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+                }
+                //                  }
+                //                } catch (InvalidInputException ex) {
+                //                };
               }
               getNextChar('\'');
               break;
             }
           case '"' :
             try {
-              try { // consume next character
-                unicodeAsBackSlash = false;
-                if (((currentCharacter = source[currentPosition++]) == '\\')
-                  && (source[currentPosition] == 'u')) {
-                  getNextUnicodeChar();
-                } else {
-                  if (withoutUnicodePtr != 0) {
-                    withoutUnicodeBuffer[++withoutUnicodePtr] =
-                      currentCharacter;
-                  }
-                }
-              } catch (InvalidInputException ex) {
-              };
+              //              try { // consume next character
+              unicodeAsBackSlash = false;
+              currentCharacter = source[currentPosition++];
+              //                if (((currentCharacter = source[currentPosition++]) == '\\')
+              //                  && (source[currentPosition] == 'u')) {
+              //                  getNextUnicodeChar();
+              //                } else {
+              if (withoutUnicodePtr != 0) {
+                withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+              }
+              //                }
+              //              } catch (InvalidInputException ex) {
+              //              };
               while (currentCharacter != '"') {
                 if (currentCharacter == '\r') {
                   if (source[currentPosition] == '\n')
@@ -1743,19 +1728,19 @@ public class Scanner implements IScanner, ITerminalSymbols {
                   } catch (InvalidInputException ex) {
                   };
                 }
-                try { // consume next character
-                  unicodeAsBackSlash = false;
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    getNextUnicodeChar();
-                  } else {
-                    if (withoutUnicodePtr != 0) {
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    }
-                  }
-                } catch (InvalidInputException ex) {
-                };
+                //                try { // consume next character
+                unicodeAsBackSlash = false;
+                currentCharacter = source[currentPosition++];
+                //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                //                    && (source[currentPosition] == 'u')) {
+                //                    getNextUnicodeChar();
+                //                  } else {
+                if (withoutUnicodePtr != 0) {
+                  withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+                }
+                //                  }
+                //                } catch (InvalidInputException ex) {
+                //                };
               }
             } catch (IndexOutOfBoundsException e) {
               return;
@@ -1765,81 +1750,82 @@ public class Scanner implements IScanner, ITerminalSymbols {
             {
               int test;
               if ((test = getNextChar('/', '*')) == 0) {
-                //line comment 
+                //line comment
                 try {
-                  //get the next char 
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    //-------------unicode traitement ------------
-                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                    currentPosition++;
-                    while (source[currentPosition] == 'u') {
-                      currentPosition++;
-                    }
-                    if ((c1 =
-                      Character.getNumericValue(source[currentPosition++]))
-                      > 15
-                      || c1 < 0
-                      || (c2 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                      || c2 < 0
-                      || (c3 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                      || c3 < 0
-                      || (c4 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                      || c4 < 0) {
-                      //error don't care of the value
-                      currentCharacter = 'A';
-                    } //something different from \n and \r
-                    else {
-                      currentCharacter =
-                        (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-                    }
-                  }
-
-                  while (currentCharacter != '\r'
-                    && currentCharacter != '\n') {
-                    //get the next char 
-                    if (((currentCharacter = source[currentPosition++])
-                      == '\\')
-                      && (source[currentPosition] == 'u')) {
-                      //-------------unicode traitement ------------
-                      int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                      currentPosition++;
-                      while (source[currentPosition] == 'u') {
-                        currentPosition++;
-                      }
-                      if ((c1 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                        || c1 < 0
-                        || (c2 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c2 < 0
-                        || (c3 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c3 < 0
-                        || (c4 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c4 < 0) {
-                        //error don't care of the value
-                        currentCharacter = 'A';
-                      } //something different from \n and \r
-                      else {
-                        currentCharacter =
-                          (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-                      }
-                    }
+                  //get the next char
+                  currentCharacter = source[currentPosition++];
+                  //                  if (((currentCharacter = source[currentPosition++]) ==
+                  // '\\')
+                  //                    && (source[currentPosition] == 'u')) {
+                  //                    //-------------unicode traitement ------------
+                  //                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                  //                    currentPosition++;
+                  //                    while (source[currentPosition] == 'u') {
+                  //                      currentPosition++;
+                  //                    }
+                  //                    if ((c1 =
+                  //                      Character.getNumericValue(source[currentPosition++]))
+                  //                      > 15
+                  //                      || c1 < 0
+                  //                      || (c2 =
+                  //                        Character.getNumericValue(source[currentPosition++]))
+                  //                        > 15
+                  //                      || c2 < 0
+                  //                      || (c3 =
+                  //                        Character.getNumericValue(source[currentPosition++]))
+                  //                        > 15
+                  //                      || c3 < 0
+                  //                      || (c4 =
+                  //                        Character.getNumericValue(source[currentPosition++]))
+                  //                        > 15
+                  //                      || c4 < 0) {
+                  //                      //error don't care of the value
+                  //                      currentCharacter = 'A';
+                  //                    } //something different from \n and \r
+                  //                    else {
+                  //                      currentCharacter =
+                  //                        (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                  //                    }
+                  //                  }
+                  while (currentCharacter != '\r' && currentCharacter != '\n') {
+                    //get the next char
+                    currentCharacter = source[currentPosition++];
+                    //                    if (((currentCharacter = source[currentPosition++])
+                    //                      == '\\')
+                    //                      && (source[currentPosition] == 'u')) {
+                    //                      //-------------unicode traitement ------------
+                    //                      int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                    //                      currentPosition++;
+                    //                      while (source[currentPosition] == 'u') {
+                    //                        currentPosition++;
+                    //                      }
+                    //                      if ((c1 =
+                    //                        Character.getNumericValue(source[currentPosition++]))
+                    //                        > 15
+                    //                        || c1 < 0
+                    //                        || (c2 =
+                    //                          Character.getNumericValue(source[currentPosition++]))
+                    //                          > 15
+                    //                        || c2 < 0
+                    //                        || (c3 =
+                    //                          Character.getNumericValue(source[currentPosition++]))
+                    //                          > 15
+                    //                        || c3 < 0
+                    //                        || (c4 =
+                    //                          Character.getNumericValue(source[currentPosition++]))
+                    //                          > 15
+                    //                        || c4 < 0) {
+                    //                        //error don't care of the value
+                    //                        currentCharacter = 'A';
+                    //                      } //something different from \n and \r
+                    //                      else {
+                    //                        currentCharacter =
+                    //                          (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                    //                      }
+                    //                    }
                   }
                   if (recordLineSeparator
-                    && ((currentCharacter == '\r') || (currentCharacter == '\n')))
+                      && ((currentCharacter == '\r') || (currentCharacter == '\n')))
                     pushLineSeparator();
                 } catch (IndexOutOfBoundsException e) {
                 } //an eof will them be generated
@@ -1848,99 +1834,101 @@ public class Scanner implements IScanner, ITerminalSymbols {
               if (test > 0) {
                 //traditional and annotation comment
                 boolean star = false;
-                try { // consume next character
-                  unicodeAsBackSlash = false;
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    getNextUnicodeChar();
-                  } else {
-                    if (withoutUnicodePtr != 0) {
-                      withoutUnicodeBuffer[++withoutUnicodePtr] =
-                        currentCharacter;
-                    }
-                  };
-                } catch (InvalidInputException ex) {
-                };
+                //                try { // consume next character
+                unicodeAsBackSlash = false;
+                currentCharacter = source[currentPosition++];
+                //                  if (((currentCharacter = source[currentPosition++]) == '\\')
+                //                    && (source[currentPosition] == 'u')) {
+                //                    getNextUnicodeChar();
+                //                  } else {
+                if (withoutUnicodePtr != 0) {
+                  withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+                }
+                //                  };
+                //                } catch (InvalidInputException ex) {
+                //                };
                 if (currentCharacter == '*') {
                   star = true;
                 }
                 if (recordLineSeparator
-                  && ((currentCharacter == '\r') || (currentCharacter == '\n')))
+                    && ((currentCharacter == '\r') || (currentCharacter == '\n')))
                   pushLineSeparator();
-                try { //get the next char 
-                  if (((currentCharacter = source[currentPosition++]) == '\\')
-                    && (source[currentPosition] == 'u')) {
-                    //-------------unicode traitement ------------
-                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                    currentPosition++;
-                    while (source[currentPosition] == 'u') {
-                      currentPosition++;
-                    }
-                    if ((c1 =
-                      Character.getNumericValue(source[currentPosition++]))
-                      > 15
-                      || c1 < 0
-                      || (c2 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                      || c2 < 0
-                      || (c3 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                      || c3 < 0
-                      || (c4 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                      || c4 < 0) {
-                      //error don't care of the value
-                      currentCharacter = 'A';
-                    } //something different from * and /
-                    else {
-                      currentCharacter =
-                        (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-                    }
-                  }
-                  //loop until end of comment */ 
+                try { //get the next char
+                  currentCharacter = source[currentPosition++];
+                  //                  if (((currentCharacter = source[currentPosition++]) ==
+                  // '\\')
+                  //                    && (source[currentPosition] == 'u')) {
+                  //                    //-------------unicode traitement ------------
+                  //                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                  //                    currentPosition++;
+                  //                    while (source[currentPosition] == 'u') {
+                  //                      currentPosition++;
+                  //                    }
+                  //                    if ((c1 =
+                  //                      Character.getNumericValue(source[currentPosition++]))
+                  //                      > 15
+                  //                      || c1 < 0
+                  //                      || (c2 =
+                  //                        Character.getNumericValue(source[currentPosition++]))
+                  //                        > 15
+                  //                      || c2 < 0
+                  //                      || (c3 =
+                  //                        Character.getNumericValue(source[currentPosition++]))
+                  //                        > 15
+                  //                      || c3 < 0
+                  //                      || (c4 =
+                  //                        Character.getNumericValue(source[currentPosition++]))
+                  //                        > 15
+                  //                      || c4 < 0) {
+                  //                      //error don't care of the value
+                  //                      currentCharacter = 'A';
+                  //                    } //something different from * and /
+                  //                    else {
+                  //                      currentCharacter =
+                  //                        (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                  //                    }
+                  //                  }
+                  //loop until end of comment */
                   while ((currentCharacter != '/') || (!star)) {
                     if (recordLineSeparator
-                      && ((currentCharacter == '\r')
-                        || (currentCharacter == '\n')))
+                        && ((currentCharacter == '\r') || (currentCharacter == '\n')))
                       pushLineSeparator();
                     star = currentCharacter == '*';
                     //get next char
-                    if (((currentCharacter = source[currentPosition++])
-                      == '\\')
-                      && (source[currentPosition] == 'u')) {
-                      //-------------unicode traitement ------------
-                      int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-                      currentPosition++;
-                      while (source[currentPosition] == 'u') {
-                        currentPosition++;
-                      }
-                      if ((c1 =
-                        Character.getNumericValue(source[currentPosition++]))
-                        > 15
-                        || c1 < 0
-                        || (c2 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c2 < 0
-                        || (c3 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c3 < 0
-                        || (c4 =
-                          Character.getNumericValue(source[currentPosition++]))
-                          > 15
-                        || c4 < 0) {
-                        //error don't care of the value
-                        currentCharacter = 'A';
-                      } //something different from * and /
-                      else {
-                        currentCharacter =
-                          (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-                      }
-                    }
+                    currentCharacter = source[currentPosition++];
+                    //                    if (((currentCharacter = source[currentPosition++])
+                    //                      == '\\')
+                    //                      && (source[currentPosition] == 'u')) {
+                    //                      //-------------unicode traitement ------------
+                    //                      int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                    //                      currentPosition++;
+                    //                      while (source[currentPosition] == 'u') {
+                    //                        currentPosition++;
+                    //                      }
+                    //                      if ((c1 =
+                    //                        Character.getNumericValue(source[currentPosition++]))
+                    //                        > 15
+                    //                        || c1 < 0
+                    //                        || (c2 =
+                    //                          Character.getNumericValue(source[currentPosition++]))
+                    //                          > 15
+                    //                        || c2 < 0
+                    //                        || (c3 =
+                    //                          Character.getNumericValue(source[currentPosition++]))
+                    //                          > 15
+                    //                        || c3 < 0
+                    //                        || (c4 =
+                    //                          Character.getNumericValue(source[currentPosition++]))
+                    //                          > 15
+                    //                        || c4 < 0) {
+                    //                        //error don't care of the value
+                    //                        currentCharacter = 'A';
+                    //                      } //something different from * and /
+                    //                      else {
+                    //                        currentCharacter =
+                    //                          (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                    //                      }
+                    //                    }
                   }
                 } catch (IndexOutOfBoundsException e) {
                   return;
@@ -1949,10 +1937,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
               }
               break;
             }
-
           default :
             if (isPHPIdentifierStart(currentCharacter)
-              || currentCharacter == '$') {
+                || currentCharacter == '$') {
               try {
                 scanIdentifierOrKeyword((currentCharacter == '$'));
               } catch (InvalidInputException ex) {
@@ -1974,64 +1961,61 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
     return;
   }
-  public final boolean jumpOverUnicodeWhiteSpace()
-    throws InvalidInputException {
-    //BOOLEAN
-    //handle the case of unicode. Jump over the next whiteSpace
-    //making startPosition pointing on the next available char
-    //On false, the currentCharacter is filled up with a potential
-    //correct char
-
-    try {
-      this.wasAcr = false;
-      int c1, c2, c3, c4;
-      int unicodeSize = 6;
-      currentPosition++;
-      while (source[currentPosition] == 'u') {
-        currentPosition++;
-        unicodeSize++;
-      }
-
-      if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
-        || c1 < 0)
-        || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
-          || c2 < 0)
-        || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
-          || c3 < 0)
-        || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
-          || c4 < 0)) {
-        throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
-      }
-
-      currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-      if (recordLineSeparator
-        && ((currentCharacter == '\r') || (currentCharacter == '\n')))
-        pushLineSeparator();
-      if (Character.isWhitespace(currentCharacter))
-        return true;
-
-      //buffer the new char which is not a white space
-      withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-      //withoutUnicodePtr == 1 is true here
-      return false;
-    } catch (IndexOutOfBoundsException e) {
-      throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
-    }
-  }
+  //  public final boolean jumpOverUnicodeWhiteSpace()
+  //    throws InvalidInputException {
+  //    //BOOLEAN
+  //    //handle the case of unicode. Jump over the next whiteSpace
+  //    //making startPosition pointing on the next available char
+  //    //On false, the currentCharacter is filled up with a potential
+  //    //correct char
+  //
+  //    try {
+  //      this.wasAcr = false;
+  //      int c1, c2, c3, c4;
+  //      int unicodeSize = 6;
+  //      currentPosition++;
+  //      while (source[currentPosition] == 'u') {
+  //        currentPosition++;
+  //        unicodeSize++;
+  //      }
+  //
+  //      if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
+  //        || c1 < 0)
+  //        || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15
+  //          || c2 < 0)
+  //        || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15
+  //          || c3 < 0)
+  //        || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15
+  //          || c4 < 0)) {
+  //        throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
+  //      }
+  //
+  //      currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+  //      if (recordLineSeparator
+  //        && ((currentCharacter == '\r') || (currentCharacter == '\n')))
+  //        pushLineSeparator();
+  //      if (Character.isWhitespace(currentCharacter))
+  //        return true;
+  //
+  //      //buffer the new char which is not a white space
+  //      withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+  //      //withoutUnicodePtr == 1 is true here
+  //      return false;
+  //    } catch (IndexOutOfBoundsException e) {
+  //      throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
+  //    }
+  //  }
   public final int[] getLineEnds() {
-    //return a bounded copy of this.lineEnds 
-
+    //return a bounded copy of this.lineEnds
     int[] copy;
     System.arraycopy(lineEnds, 0, copy = new int[linePtr + 1], 0, linePtr + 1);
     return copy;
   }
-
   public char[] getSource() {
     return this.source;
   }
   final char[] optimizedCurrentTokenSource1() {
     //return always the same char[] build only once
-
     //optimization at no speed cost of 99.5 % of the singleCharIdentifier
     char charOne = source[startPosition];
     switch (charOne) {
@@ -2088,15 +2072,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
       case 'z' :
         return charArray_z;
       default :
-        return new char[] { charOne };
+        return new char[]{charOne};
     }
   }
   final char[] optimizedCurrentTokenSource2() {
     //try to return the same char[] build only once
-
     char c0, c1;
-    int hash =
-      (((c0 = source[startPosition]) << 6) + (c1 = source[startPosition + 1]))
+    int hash = (((c0 = source[startPosition]) << 6) + (c1 = source[startPosition + 1]))
         % TableSize;
     char[][] table = charArray_length[0][hash];
     int i = newEntry2;
@@ -2117,18 +2099,15 @@ public class Scanner implements IScanner, ITerminalSymbols {
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1 });
+    table[max] = (r = new char[]{c0, c1});
     newEntry2 = max;
     return r;
   }
   final char[] optimizedCurrentTokenSource3() {
     //try to return the same char[] build only once
-
     char c0, c1, c2;
-    int hash =
-      (((c0 = source[startPosition]) << 12)
-        + ((c1 = source[startPosition + 1]) << 6)
-        + (c2 = source[startPosition + 2]))
+    int hash = (((c0 = source[startPosition]) << 12)
+        + ((c1 = source[startPosition + 1]) << 6) + (c2 = source[startPosition + 2]))
         % TableSize;
     char[][] table = charArray_length[1][hash];
     int i = newEntry3;
@@ -2149,28 +2128,23 @@ public class Scanner implements IScanner, ITerminalSymbols {
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1, c2 });
+    table[max] = (r = new char[]{c0, c1, c2});
     newEntry3 = max;
     return r;
   }
   final char[] optimizedCurrentTokenSource4() {
     //try to return the same char[] build only once
-
     char c0, c1, c2, c3;
-    long hash =
-      ((((long) (c0 = source[startPosition])) << 18)
+    long hash = ((((long) (c0 = source[startPosition])) << 18)
         + ((c1 = source[startPosition + 1]) << 12)
-        + ((c2 = source[startPosition + 2]) << 6)
-        + (c3 = source[startPosition + 3]))
+        + ((c2 = source[startPosition + 2]) << 6) + (c3 = source[startPosition + 3]))
         % TableSize;
     char[][] table = charArray_length[2][(int) hash];
     int i = newEntry4;
     while (++i < InternalTableSize) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0])
-        && (c1 == charArray[1])
-        && (c2 == charArray[2])
-        && (c3 == charArray[3]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]))
         return charArray;
     }
     //---------other side---------
@@ -2178,41 +2152,32 @@ public class Scanner implements IScanner, ITerminalSymbols {
     int max = newEntry4;
     while (++i <= max) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0])
-        && (c1 == charArray[1])
-        && (c2 == charArray[2])
-        && (c3 == charArray[3]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]))
         return charArray;
     }
     //--------add the entry-------
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1, c2, c3 });
+    table[max] = (r = new char[]{c0, c1, c2, c3});
     newEntry4 = max;
     return r;
-
   }
   final char[] optimizedCurrentTokenSource5() {
     //try to return the same char[] build only once
-
     char c0, c1, c2, c3, c4;
-    long hash =
-      ((((long) (c0 = source[startPosition])) << 24)
+    long hash = ((((long) (c0 = source[startPosition])) << 24)
         + (((long) (c1 = source[startPosition + 1])) << 18)
         + ((c2 = source[startPosition + 2]) << 12)
-        + ((c3 = source[startPosition + 3]) << 6)
-        + (c4 = source[startPosition + 4]))
+        + ((c3 = source[startPosition + 3]) << 6) + (c4 = source[startPosition + 4]))
         % TableSize;
     char[][] table = charArray_length[3][(int) hash];
     int i = newEntry5;
     while (++i < InternalTableSize) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0])
-        && (c1 == charArray[1])
-        && (c2 == charArray[2])
-        && (c3 == charArray[3])
-        && (c4 == charArray[4]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]) && (c4 == charArray[4]))
         return charArray;
     }
     //---------other side---------
@@ -2220,44 +2185,34 @@ public class Scanner implements IScanner, ITerminalSymbols {
     int max = newEntry5;
     while (++i <= max) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0])
-        && (c1 == charArray[1])
-        && (c2 == charArray[2])
-        && (c3 == charArray[3])
-        && (c4 == charArray[4]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]) && (c4 == charArray[4]))
         return charArray;
     }
     //--------add the entry-------
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1, c2, c3, c4 });
+    table[max] = (r = new char[]{c0, c1, c2, c3, c4});
     newEntry5 = max;
     return r;
-
   }
   final char[] optimizedCurrentTokenSource6() {
     //try to return the same char[] build only once
-
     char c0, c1, c2, c3, c4, c5;
-    long hash =
-      ((((long) (c0 = source[startPosition])) << 32)
+    long hash = ((((long) (c0 = source[startPosition])) << 32)
         + (((long) (c1 = source[startPosition + 1])) << 24)
         + (((long) (c2 = source[startPosition + 2])) << 18)
         + ((c3 = source[startPosition + 3]) << 12)
-        + ((c4 = source[startPosition + 4]) << 6)
-        + (c5 = source[startPosition + 5]))
+        + ((c4 = source[startPosition + 4]) << 6) + (c5 = source[startPosition + 5]))
         % TableSize;
     char[][] table = charArray_length[4][(int) hash];
     int i = newEntry6;
     while (++i < InternalTableSize) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0])
-        && (c1 == charArray[1])
-        && (c2 == charArray[2])
-        && (c3 == charArray[3])
-        && (c4 == charArray[4])
-        && (c5 == charArray[5]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]) && (c4 == charArray[4])
+          && (c5 == charArray[5]))
         return charArray;
     }
     //---------other side---------
@@ -2265,32 +2220,27 @@ public class Scanner implements IScanner, ITerminalSymbols {
     int max = newEntry6;
     while (++i <= max) {
       char[] charArray = table[i];
-      if ((c0 == charArray[0])
-        && (c1 == charArray[1])
-        && (c2 == charArray[2])
-        && (c3 == charArray[3])
-        && (c4 == charArray[4])
-        && (c5 == charArray[5]))
+      if ((c0 == charArray[0]) && (c1 == charArray[1]) && (c2 == charArray[2])
+          && (c3 == charArray[3]) && (c4 == charArray[4])
+          && (c5 == charArray[5]))
         return charArray;
     }
     //--------add the entry-------
     if (++max >= InternalTableSize)
       max = 0;
     char[] r;
-    table[max] = (r = new char[] { c0, c1, c2, c3, c4, c5 });
+    table[max] = (r = new char[]{c0, c1, c2, c3, c4, c5});
     newEntry6 = max;
     return r;
   }
   public final void pushLineSeparator() throws InvalidInputException {
     //see comment on isLineDelimiter(char) for the use of '\n' and '\r'
     final int INCREMENT = 250;
-
     if (this.checkNonExternalizedStringLiterals) {
       // reinitialize the current line for non externalize strings purpose
       currentLine = null;
     }
     //currentCharacter is at position currentPosition-1
-
     // cr 000D
     if (currentCharacter == '\r') {
       int separatorPos = currentPosition - 1;
@@ -2310,7 +2260,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
       // look-ahead for merged cr+lf
       try {
         if (source[currentPosition] == '\n') {
-          //System.out.println("look-ahead LF-" + currentPosition);                    
+          //System.out.println("look-ahead LF-" + currentPosition);
           lineEnds[linePtr] = currentPosition;
           currentPosition++;
           wasAcr = false;
@@ -2325,13 +2275,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
       if (currentCharacter == '\n') {
         //must merge eventual cr followed by lf
         if (wasAcr && (lineEnds[linePtr] == (currentPosition - 2))) {
-          //System.out.println("merge LF-" + (currentPosition - 1));                                                   
+          //System.out.println("merge LF-" + (currentPosition - 1));
           lineEnds[linePtr] = currentPosition - 1;
         } else {
           int separatorPos = currentPosition - 1;
           if ((linePtr > 0) && (lineEnds[linePtr] >= separatorPos))
             return;
-          // System.out.println("LF-" + separatorPos);                                                 
+          // System.out.println("LF-" + separatorPos);
           try {
             lineEnds[++linePtr] = separatorPos;
           } catch (IndexOutOfBoundsException e) {
@@ -2349,17 +2299,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
   }
   public final void pushUnicodeLineSeparator() {
     // isUnicode means that the \r or \n has been read as a unicode character
-
     //see comment on isLineDelimiter(char) for the use of '\n' and '\r'
-
     final int INCREMENT = 250;
     //currentCharacter is at position currentPosition-1
-
     if (this.checkNonExternalizedStringLiterals) {
       // reinitialize the current line for non externalize strings purpose
       currentLine = null;
     }
-
     // cr 000D
     if (currentCharacter == '\r') {
       int separatorPos = currentPosition - 6;
@@ -2378,7 +2324,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
       }
       // look-ahead for merged cr+lf
       if (source[currentPosition] == '\n') {
-        //System.out.println("look-ahead LF-" + currentPosition);                      
+        //System.out.println("look-ahead LF-" + currentPosition);
         lineEnds[linePtr] = currentPosition;
         currentPosition++;
         wasAcr = false;
@@ -2390,13 +2336,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
       if (currentCharacter == '\n') {
         //must merge eventual cr followed by lf
         if (wasAcr && (lineEnds[linePtr] == (currentPosition - 7))) {
-          //System.out.println("merge LF-" + (currentPosition - 1));                                                   
+          //System.out.println("merge LF-" + (currentPosition - 1));
           lineEnds[linePtr] = currentPosition - 6;
         } else {
           int separatorPos = currentPosition - 6;
           if ((linePtr > 0) && (lineEnds[linePtr] >= separatorPos))
             return;
-          // System.out.println("LF-" + separatorPos);                                                 
+          // System.out.println("LF-" + separatorPos);
           try {
             lineEnds[++linePtr] = separatorPos;
           } catch (IndexOutOfBoundsException e) {
@@ -2413,11 +2359,11 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
   }
   public final void recordComment(boolean isJavadoc) {
-
     // a new annotation comment is recorded
     try {
-      commentStops[++commentPtr] =
-        isJavadoc ? currentPosition : -currentPosition;
+      commentStops[++commentPtr] = isJavadoc
+          ? currentPosition
+          : -currentPosition;
     } catch (IndexOutOfBoundsException e) {
       int oldStackLength = commentStops.length;
       int[] oldStack = commentStops;
@@ -2429,37 +2375,33 @@ public class Scanner implements IScanner, ITerminalSymbols {
       commentStarts = new int[oldStackLength + 30];
       System.arraycopy(old, 0, commentStarts, 0, oldStackLength);
     }
-
     //the buffer is of a correct size here
     commentStarts[commentPtr] = startPosition;
   }
   public void resetTo(int begin, int end) {
     //reset the scanner to a given position where it may rescan again
-
     diet = false;
     initialPosition = startPosition = currentPosition = begin;
     eofPosition = end < Integer.MAX_VALUE ? end + 1 : end;
     commentPtr = -1; // reset comment stack
   }
-
   public final void scanSingleQuotedEscapeCharacter()
-    throws InvalidInputException {
+      throws InvalidInputException {
     // the string with "\\u" is a legal string of two chars \ and u
     //thus we use a direct access to the source (for regular cases).
-
-    if (unicodeAsBackSlash) {
-      // consume next character
-      unicodeAsBackSlash = false;
-      if (((currentCharacter = source[currentPosition++]) == '\\')
-        && (source[currentPosition] == 'u')) {
-        getNextUnicodeChar();
-      } else {
-        if (withoutUnicodePtr != 0) {
-          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        }
-      }
-    } else
-      currentCharacter = source[currentPosition++];
+    //    if (unicodeAsBackSlash) {
+    //      // consume next character
+    //      unicodeAsBackSlash = false;
+    //      if (((currentCharacter = source[currentPosition++]) == '\\')
+    //        && (source[currentPosition] == 'u')) {
+    //        getNextUnicodeChar();
+    //      } else {
+    //        if (withoutUnicodePtr != 0) {
+    //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+    //        }
+    //      }
+    //    } else
+    currentCharacter = source[currentPosition++];
     switch (currentCharacter) {
       case '\'' :
         currentCharacter = '\'';
@@ -2472,25 +2414,23 @@ public class Scanner implements IScanner, ITerminalSymbols {
         currentPosition--;
     }
   }
-
   public final void scanDoubleQuotedEscapeCharacter()
-    throws InvalidInputException {
+      throws InvalidInputException {
     // the string with "\\u" is a legal string of two chars \ and u
     //thus we use a direct access to the source (for regular cases).
-
-    if (unicodeAsBackSlash) {
-      // consume next character
-      unicodeAsBackSlash = false;
-      if (((currentCharacter = source[currentPosition++]) == '\\')
-        && (source[currentPosition] == 'u')) {
-        getNextUnicodeChar();
-      } else {
-        if (withoutUnicodePtr != 0) {
-          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        }
-      }
-    } else
-      currentCharacter = source[currentPosition++];
+    //    if (unicodeAsBackSlash) {
+    //      // consume next character
+    //      unicodeAsBackSlash = false;
+    //      if (((currentCharacter = source[currentPosition++]) == '\\')
+    //        && (source[currentPosition] == 'u')) {
+    //        getNextUnicodeChar();
+    //      } else {
+    //        if (withoutUnicodePtr != 0) {
+    //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+    //        }
+    //      }
+    //    } else
+    currentCharacter = source[currentPosition++];
     switch (currentCharacter) {
       //      case 'b' :
       //        currentCharacter = '\b';
@@ -2501,9 +2441,9 @@ public class Scanner implements IScanner, ITerminalSymbols {
       case 'n' :
         currentCharacter = '\n';
         break;
-        //      case 'f' :
-        //        currentCharacter = '\f';
-        //        break;
+      //      case 'f' :
+      //        currentCharacter = '\f';
+      //        break;
       case 'r' :
         currentCharacter = '\r';
         break;
@@ -2524,32 +2464,34 @@ public class Scanner implements IScanner, ITerminalSymbols {
         // OctalDigit
         // OctalDigit OctalDigit
         // ZeroToThree OctalDigit OctalDigit
-
         int number = Character.getNumericValue(currentCharacter);
         if (number >= 0 && number <= 7) {
           boolean zeroToThreeNot = number > 3;
-          if (Character
-            .isDigit(currentCharacter = source[currentPosition++])) {
+          if (Character.isDigit(currentCharacter = source[currentPosition++])) {
             int digit = Character.getNumericValue(currentCharacter);
             if (digit >= 0 && digit <= 7) {
               number = (number * 8) + digit;
               if (Character
-                .isDigit(currentCharacter = source[currentPosition++])) {
-                if (zeroToThreeNot) { // has read \NotZeroToThree OctalDigit Digit --> ignore last character
+                  .isDigit(currentCharacter = source[currentPosition++])) {
+                if (zeroToThreeNot) { // has read \NotZeroToThree OctalDigit
+                  // Digit --> ignore last character
                   currentPosition--;
                 } else {
                   digit = Character.getNumericValue(currentCharacter);
                   if (digit >= 0 && digit <= 7) {
                     // has read \ZeroToThree OctalDigit OctalDigit
                     number = (number * 8) + digit;
-                  } else { // has read \ZeroToThree OctalDigit NonOctalDigit --> ignore last character
+                  } else { // has read \ZeroToThree OctalDigit NonOctalDigit
+                    // --> ignore last character
                     currentPosition--;
                   }
                 }
-              } else { // has read \OctalDigit NonDigit--> ignore last character
+              } else { // has read \OctalDigit NonDigit--> ignore last
+                // character
                 currentPosition--;
               }
-            } else { // has read \OctalDigit NonOctalDigit--> ignore last character                                            
+            } else { // has read \OctalDigit NonOctalDigit--> ignore last
+              // character
               currentPosition--;
             }
           } else { // has read \OctalDigit --> ignore last character
@@ -2559,252 +2501,308 @@ public class Scanner implements IScanner, ITerminalSymbols {
             throw new InvalidInputException(INVALID_ESCAPE);
           currentCharacter = (char) number;
         }
-        //else
-        //     throw new InvalidInputException(INVALID_ESCAPE);
+    //else
+    //     throw new InvalidInputException(INVALID_ESCAPE);
     }
   }
-
   //  public int scanIdentifierOrKeyword() throws InvalidInputException {
   //    return scanIdentifierOrKeyword( false );
   //  }
-
   public int scanIdentifierOrKeyword(boolean isVariable)
-    throws InvalidInputException {
+      throws InvalidInputException {
     //test keywords
-
     //first dispatch on the first char.
     //then the length. If there are several
     //keywors with the same length AND the same first char, then do another
     //disptach on the second char :-)...cool....but fast !
-
     useAssertAsAnIndentifier = false;
-    
     while (getNextCharAsJavaIdentifierPart()) {
     };
-
     if (isVariable) {
+      //      if (new String(getCurrentTokenSource()).equals("$this")) {
+      //        return TokenNamethis;
+      //      }
       return TokenNameVariable;
     }
     int index, length;
     char[] data;
     char firstLetter;
-    if (withoutUnicodePtr == 0)
-
-      //quick test on length == 1 but not on length > 12 while most identifier
-      //have a length which is <= 12...but there are lots of identifier with
-      //only one char....
-
-      {
-      if ((length = currentPosition - startPosition) == 1)
-        return TokenNameIdentifier;
-      //  data = source;
-      data = new char[length];
-      index = startPosition;
-      for (int i = 0; i < length; i++) {
-        data[i] = Character.toLowerCase(source[index + i]);
-      }
-      index = 0;
-    } else {
-      if ((length = withoutUnicodePtr) == 1)
-        return TokenNameIdentifier;
-      // data = withoutUnicodeBuffer;
-      data = new char[withoutUnicodeBuffer.length];
-      for (int i = 0; i < withoutUnicodeBuffer.length; i++) {
-        data[i] = Character.toLowerCase(withoutUnicodeBuffer[i]);
-      }
-      index = 1;
+    //    if (withoutUnicodePtr == 0)
+    //quick test on length == 1 but not on length > 12 while most identifier
+    //have a length which is <= 12...but there are lots of identifier with
+    //only one char....
+    //      {
+    if ((length = currentPosition - startPosition) == 1)
+      return TokenNameIdentifier;
+    //  data = source;
+    data = new char[length];
+    index = startPosition;
+    for (int i = 0; i < length; i++) {
+      data[i] = Character.toLowerCase(source[index + i]);
     }
-
+    index = 0;
+    //    } else {
+    //      if ((length = withoutUnicodePtr) == 1)
+    //        return TokenNameIdentifier;
+    //      // data = withoutUnicodeBuffer;
+    //      data = new char[withoutUnicodeBuffer.length];
+    //      for (int i = 0; i < withoutUnicodeBuffer.length; i++) {
+    //        data[i] = Character.toLowerCase(withoutUnicodeBuffer[i]);
+    //      }
+    //      index = 1;
+    //    }
     firstLetter = data[index];
     switch (firstLetter) {
-
-      case 'a' : // as and array
+      case '_' :
         switch (length) {
-          case 2 : //as
+          case 8 :
+            //__FILE__
+            if ((data[++index] == '_') && (data[++index] == 'f')
+                && (data[++index] == 'i') && (data[++index] == 'l')
+                && (data[++index] == 'e') && (data[++index] == '_')
+                && (data[++index] == '_'))
+              return TokenNameFILE;
+            index = 0; //__LINE__
+            if ((data[++index] == '_') && (data[++index] == 'l')
+                && (data[++index] == 'i') && (data[++index] == 'n')
+                && (data[++index] == 'e') && (data[++index] == '_')
+                && (data[++index] == '_'))
+              return TokenNameLINE;
+            break;
+          case 9 :
+            //__CLASS__
+            if ((data[++index] == '_') && (data[++index] == 'c')
+                && (data[++index] == 'l') && (data[++index] == 'a')
+                && (data[++index] == 's') && (data[++index] == 's')
+                && (data[++index] == '_') && (data[++index] == '_'))
+              return TokenNameCLASS_C;
+            break;
+          case 11 :
+            //__METHOD__
+            if ((data[++index] == '_') && (data[++index] == 'm')
+                && (data[++index] == 'e') && (data[++index] == 't')
+                && (data[++index] == 'h') && (data[++index] == 'o')
+                && (data[++index] == 'd') && (data[++index] == '_')
+                && (data[++index] == '_'))
+              return TokenNameMETHOD_C;
+            break;
+          case 12 :
+            //__FUNCTION__
+            if ((data[++index] == '_') && (data[++index] == 'f')
+                && (data[++index] == 'u') && (data[++index] == 'n')
+                && (data[++index] == 'c') && (data[++index] == 't')
+                && (data[++index] == 'i') && (data[++index] == 'o')
+                && (data[++index] == 'n') && (data[++index] == '_')
+                && (data[++index] == '_'))
+              return TokenNameFUNC_C;
+            break;
+        }
+        return TokenNameIdentifier;
+      case 'a' :
+        // as and array abstract
+        switch (length) {
+          case 2 :
+            //as
             if ((data[++index] == 's')) {
               return TokenNameas;
             } else {
               return TokenNameIdentifier;
             }
-          case 3 : //and
+          case 3 :
+            //and
             if ((data[++index] == 'n') && (data[++index] == 'd')) {
-              return TokenNameAND;
+              return TokenNameand;
             } else {
               return TokenNameIdentifier;
             }
-            //          case 5 :
-            //            if ((data[++index] == 'r') && (data[++index] == 'r') && (data[++index] == 'a') && (data[++index] == 'y'))
-            //              return TokenNamearray;
-            //            else
-            //              return TokenNameIdentifier;
+          case 5 :
+            // array
+            if ((data[++index] == 'r') && (data[++index] == 'r')
+                && (data[++index] == 'a') && (data[++index] == 'y'))
+              return TokenNamearray;
+            else
+              return TokenNameIdentifier;
+          case 8 :
+            if ((data[++index] == 'b') && (data[++index] == 's')
+                && (data[++index] == 't') && (data[++index] == 'r')
+                && (data[++index] == 'a') && (data[++index] == 'c')
+                && (data[++index] == 't'))
+              return TokenNameabstract;
+            else
+              return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'b' : //break
+      case 'b' :
+        //break
         switch (length) {
           case 5 :
-            if ((data[++index] == 'r')
-              && (data[++index] == 'e')
-              && (data[++index] == 'a')
-              && (data[++index] == 'k'))
+            if ((data[++index] == 'r') && (data[++index] == 'e')
+                && (data[++index] == 'a') && (data[++index] == 'k'))
               return TokenNamebreak;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-
-      case 'c' : //case class continue
+      case 'c' :
+        //case catch class clone const continue
         switch (length) {
           case 4 :
-            if ((data[++index] == 'a')
-              && (data[++index] == 's')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'a') && (data[++index] == 's')
+                && (data[++index] == 'e'))
               return TokenNamecase;
             else
               return TokenNameIdentifier;
           case 5 :
-            if ((data[++index] == 'l')
-              && (data[++index] == 'a')
-              && (data[++index] == 's')
-              && (data[++index] == 's'))
+            if ((data[++index] == 'a') && (data[++index] == 't')
+                && (data[++index] == 'c') && (data[++index] == 'h'))
+              return TokenNamecatch;
+            index = 0;
+            if ((data[++index] == 'l') && (data[++index] == 'a')
+                && (data[++index] == 's') && (data[++index] == 's'))
               return TokenNameclass;
+            index = 0;
+            if ((data[++index] == 'l') && (data[++index] == 'o')
+                && (data[++index] == 'n') && (data[++index] == 'e'))
+              return TokenNameclone;
+            index = 0;
+            if ((data[++index] == 'o') && (data[++index] == 'n')
+                && (data[++index] == 's') && (data[++index] == 't'))
+              return TokenNameconst;
             else
               return TokenNameIdentifier;
           case 8 :
-            if ((data[++index] == 'o')
-              && (data[++index] == 'n')
-              && (data[++index] == 't')
-              && (data[++index] == 'i')
-              && (data[++index] == 'n')
-              && (data[++index] == 'u')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'o') && (data[++index] == 'n')
+                && (data[++index] == 't') && (data[++index] == 'i')
+                && (data[++index] == 'n') && (data[++index] == 'u')
+                && (data[++index] == 'e'))
               return TokenNamecontinue;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-
-      case 'd' : //define default do 
+      case 'd' :
+        // declare default do die
+        // TODO delete define ==> no keyword !
         switch (length) {
           case 2 :
             if ((data[++index] == 'o'))
               return TokenNamedo;
             else
               return TokenNameIdentifier;
-          case 6 :
-            if ((data[++index] == 'e')
-              && (data[++index] == 'f')
-              && (data[++index] == 'i')
-              && (data[++index] == 'n')
-              && (data[++index] == 'e'))
-              return TokenNamedefine;
-            else
-              return TokenNameIdentifier;
+          //          case 6 :
+          //            if ((data[++index] == 'e')
+          //              && (data[++index] == 'f')
+          //              && (data[++index] == 'i')
+          //              && (data[++index] == 'n')
+          //              && (data[++index] == 'e'))
+          //              return TokenNamedefine;
+          //            else
+          //              return TokenNameIdentifier;
           case 7 :
-            if ((data[++index] == 'e')
-              && (data[++index] == 'f')
-              && (data[++index] == 'a')
-              && (data[++index] == 'u')
-              && (data[++index] == 'l')
-              && (data[++index] == 't'))
+            if ((data[++index] == 'e') && (data[++index] == 'c')
+                && (data[++index] == 'l') && (data[++index] == 'a')
+                && (data[++index] == 'r') && (data[++index] == 'e'))
+              return TokenNamedeclare;
+            index = 0;
+            if ((data[++index] == 'e') && (data[++index] == 'f')
+                && (data[++index] == 'a') && (data[++index] == 'u')
+                && (data[++index] == 'l') && (data[++index] == 't'))
               return TokenNamedefault;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'e' : //echo else elseif extends
+      case 'e' :
+        //echo else exit elseif extends eval
         switch (length) {
           case 4 :
-            if ((data[++index] == 'c')
-              && (data[++index] == 'h')
-              && (data[++index] == 'o'))
+            if ((data[++index] == 'c') && (data[++index] == 'h')
+                && (data[++index] == 'o'))
               return TokenNameecho;
-            else if (
-              (data[index] == 'l')
-                && (data[++index] == 's')
+            else if ((data[index] == 'l') && (data[++index] == 's')
                 && (data[++index] == 'e'))
               return TokenNameelse;
+            else if ((data[index] == 'x') && (data[++index] == 'i')
+                && (data[++index] == 't'))
+              return TokenNameexit;
+            else if ((data[index] == 'v') && (data[++index] == 'a')
+                && (data[++index] == 'l'))
+              return TokenNameeval;
             else
               return TokenNameIdentifier;
-          case 5 : // endif
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 'i')
-              && (data[++index] == 'f'))
+          case 5 :
+            // endif empty
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 'i') && (data[++index] == 'f'))
               return TokenNameendif;
+            if ((data[index] == 'm') && (data[++index] == 'p')
+                && (data[++index] == 't') && (data[++index] == 'y'))
+              return TokenNameempty;
             else
               return TokenNameIdentifier;
-          case 6 : // endfor
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 'f')
-              && (data[++index] == 'o')
-              && (data[++index] == 'r'))
+          case 6 :
+            // endfor
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 'f') && (data[++index] == 'o')
+                && (data[++index] == 'r'))
               return TokenNameendfor;
-            else if (
-              (data[index] == 'l')
-                && (data[++index] == 's')
-                && (data[++index] == 'e')
-                && (data[++index] == 'i')
+            else if ((data[index] == 'l') && (data[++index] == 's')
+                && (data[++index] == 'e') && (data[++index] == 'i')
                 && (data[++index] == 'f'))
               return TokenNameelseif;
             else
               return TokenNameIdentifier;
           case 7 :
-            if ((data[++index] == 'x')
-              && (data[++index] == 't')
-              && (data[++index] == 'e')
-              && (data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 's'))
+            if ((data[++index] == 'x') && (data[++index] == 't')
+                && (data[++index] == 'e') && (data[++index] == 'n')
+                && (data[++index] == 'd') && (data[++index] == 's'))
               return TokenNameextends;
             else
               return TokenNameIdentifier;
-          case 8 : // endwhile
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 'w')
-              && (data[++index] == 'h')
-              && (data[++index] == 'i')
-              && (data[++index] == 'l')
-              && (data[++index] == 'e'))
+          case 8 :
+            // endwhile
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 'w') && (data[++index] == 'h')
+                && (data[++index] == 'i') && (data[++index] == 'l')
+                && (data[++index] == 'e'))
               return TokenNameendwhile;
             else
               return TokenNameIdentifier;
-          case 9 : // endswitch
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 's')
-              && (data[++index] == 'w')
-              && (data[++index] == 'i')
-              && (data[++index] == 't')
-              && (data[++index] == 'c')
-              && (data[++index] == 'h'))
+          case 9 :
+            // endswitch
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 's') && (data[++index] == 'w')
+                && (data[++index] == 'i') && (data[++index] == 't')
+                && (data[++index] == 'c') && (data[++index] == 'h'))
               return TokenNameendswitch;
             else
               return TokenNameIdentifier;
-          case 10 : // endforeach
-            if ((data[++index] == 'n')
-              && (data[++index] == 'd')
-              && (data[++index] == 'f')
-              && (data[++index] == 'o')
-              && (data[++index] == 'r')
-              && (data[++index] == 'e')
-              && (data[++index] == 'a')
-              && (data[++index] == 'c')
-              && (data[++index] == 'h'))
+          case 10 :
+            // enddeclare
+            if ((data[++index] == 'n') && (data[++index] == 'd')
+                && (data[++index] == 'd') && (data[++index] == 'e')
+                && (data[++index] == 'c') && (data[++index] == 'l')
+                && (data[++index] == 'a') && (data[++index] == 'r')
+                && (data[++index] == 'e'))
+              return TokenNameendforeach;
+            index = 0;
+            if ((data[++index] == 'n') // endforeach
+                && (data[++index] == 'd') && (data[++index] == 'f')
+                && (data[++index] == 'o') && (data[++index] == 'r')
+                && (data[++index] == 'e') && (data[++index] == 'a')
+                && (data[++index] == 'c') && (data[++index] == 'h'))
               return TokenNameendforeach;
             else
               return TokenNameIdentifier;
-
           default :
             return TokenNameIdentifier;
         }
-
-      case 'f' : //for false function
+      case 'f' :
+        //for false final function
         switch (length) {
           case 3 :
             if ((data[++index] == 'o') && (data[++index] == 'r'))
@@ -2812,122 +2810,139 @@ public class Scanner implements IScanner, ITerminalSymbols {
             else
               return TokenNameIdentifier;
           case 5 :
-            if ((data[++index] == 'a')
-              && (data[++index] == 'l')
-              && (data[++index] == 's')
-              && (data[++index] == 'e'))
-              return TokenNamefalse;
+            //            if ((data[++index] == 'a') && (data[++index] == 'l')
+            //                && (data[++index] == 's') && (data[++index] == 'e'))
+            //              return TokenNamefalse;
+            if ((data[++index] == 'i') && (data[++index] == 'n')
+                && (data[++index] == 'a') && (data[++index] == 'l'))
+              return TokenNamefinal;
             else
               return TokenNameIdentifier;
-          case 7 : // function
-            if ((data[++index] == 'o')
-              && (data[++index] == 'r')
-              && (data[++index] == 'e')
-              && (data[++index] == 'a')
-              && (data[++index] == 'c')
-              && (data[++index] == 'h'))
+          case 7 :
+            // foreach
+            if ((data[++index] == 'o') && (data[++index] == 'r')
+                && (data[++index] == 'e') && (data[++index] == 'a')
+                && (data[++index] == 'c') && (data[++index] == 'h'))
               return TokenNameforeach;
             else
               return TokenNameIdentifier;
-          case 8 : // function
-            if ((data[++index] == 'u')
-              && (data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 't')
-              && (data[++index] == 'i')
-              && (data[++index] == 'o')
-              && (data[++index] == 'n'))
+          case 8 :
+            // function
+            if ((data[++index] == 'u') && (data[++index] == 'n')
+                && (data[++index] == 'c') && (data[++index] == 't')
+                && (data[++index] == 'i') && (data[++index] == 'o')
+                && (data[++index] == 'n'))
               return TokenNamefunction;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'g' : //global
+      case 'g' :
+        //global
         if (length == 6) {
-          if ((data[++index] == 'l')
-            && (data[++index] == 'o')
-            && (data[++index] == 'b')
-            && (data[++index] == 'a')
-            && (data[++index] == 'l')) {
+          if ((data[++index] == 'l') && (data[++index] == 'o')
+              && (data[++index] == 'b') && (data[++index] == 'a')
+              && (data[++index] == 'l')) {
             return TokenNameglobal;
           }
         }
         return TokenNameIdentifier;
-
-      case 'i' : //if int 
+      case 'i' :
+        //if int isset include include_once instanceof interface implements
         switch (length) {
           case 2 :
             if (data[++index] == 'f')
               return TokenNameif;
             else
               return TokenNameIdentifier;
-            //          case 3 :
-            //            if ((data[++index] == 'n') && (data[++index] == 't'))
-            //              return TokenNameint;
-            //            else
-            //              return TokenNameIdentifier;
+          //          case 3 :
+          //            if ((data[++index] == 'n') && (data[++index] == 't'))
+          //              return TokenNameint;
+          //            else
+          //              return TokenNameIdentifier;
+          case 5 :
+            if ((data[++index] == 's') && (data[++index] == 's')
+                && (data[++index] == 'e') && (data[++index] == 't'))
+              return TokenNameisset;
+            else
+              return TokenNameIdentifier;
           case 7 :
-            if ((data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 'l')
-              && (data[++index] == 'u')
-              && (data[++index] == 'd')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'n') && (data[++index] == 'c')
+                && (data[++index] == 'l') && (data[++index] == 'u')
+                && (data[++index] == 'd') && (data[++index] == 'e'))
               return TokenNameinclude;
             else
               return TokenNameIdentifier;
+          case 9 :
+            // interface
+            if ((data[++index] == 'n') && (data[++index] == 't')
+                && (data[++index] == 'e') && (data[++index] == 'r')
+                && (data[++index] == 'f') && (data[++index] == 'a')
+                && (data[++index] == 'c') && (data[++index] == 'e'))
+              return TokenNameinterface;
+            else
+              return TokenNameIdentifier;
+          case 10 :
+            // instanceof
+            if ((data[++index] == 'n') && (data[++index] == 's')
+                && (data[++index] == 't') && (data[++index] == 'a')
+                && (data[++index] == 'n') && (data[++index] == 'c')
+                && (data[++index] == 'e') && (data[++index] == 'o')
+                && (data[++index] == 'f'))
+              return TokenNameinstanceof;
+            if ((data[index] == 'm') && (data[++index] == 'p')
+                && (data[++index] == 'l') && (data[++index] == 'e')
+                && (data[++index] == 'm') && (data[++index] == 'e')
+                && (data[++index] == 'n') && (data[++index] == 't')
+                && (data[++index] == 's'))
+              return TokenNameimplements;
+            else
+              return TokenNameIdentifier;
           case 12 :
-            if ((data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 'l')
-              && (data[++index] == 'u')
-              && (data[++index] == 'd')
-              && (data[++index] == 'e')
-              && (data[++index] == '_')
-              && (data[++index] == 'o')
-              && (data[++index] == 'n')
-              && (data[++index] == 'c')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'n') && (data[++index] == 'c')
+                && (data[++index] == 'l') && (data[++index] == 'u')
+                && (data[++index] == 'd') && (data[++index] == 'e')
+                && (data[++index] == '_') && (data[++index] == 'o')
+                && (data[++index] == 'n') && (data[++index] == 'c')
+                && (data[++index] == 'e'))
               return TokenNameinclude_once;
             else
               return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-
-      case 'l' : //list
+      case 'l' :
+        //list
         if (length == 4) {
-          if ((data[++index] == 'i')
-            && (data[++index] == 's')
-            && (data[++index] == 't')) {
+          if ((data[++index] == 'i') && (data[++index] == 's')
+              && (data[++index] == 't')) {
             return TokenNamelist;
           }
         }
         return TokenNameIdentifier;
-
-      case 'n' : // new null
+      case 'n' :
+        // new null
         switch (length) {
           case 3 :
             if ((data[++index] == 'e') && (data[++index] == 'w'))
               return TokenNamenew;
             else
               return TokenNameIdentifier;
-          case 4 :
-            if ((data[++index] == 'u')
-              && (data[++index] == 'l')
-              && (data[++index] == 'l'))
-              return TokenNamenull;
-            else
-              return TokenNameIdentifier;
-
+          //          case 4 :
+          //            if ((data[++index] == 'u') && (data[++index] == 'l')
+          //                && (data[++index] == 'l'))
+          //              return TokenNamenull;
+          //            else
+          //              return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-      case 'o' : // or old_function
+      case 'o' :
+        // or old_function
         if (length == 2) {
           if (data[++index] == 'r') {
-            return TokenNameOR;
+            return TokenNameor;
           }
         }
         //        if (length == 12) {
@@ -2946,68 +2961,76 @@ public class Scanner implements IScanner, ITerminalSymbols {
         //          }
         //        }
         return TokenNameIdentifier;
-
-      case 'p' : // print
-        if (length == 5) {
-          if ((data[++index] == 'r')
-            && (data[++index] == 'i')
-            && (data[++index] == 'n')
-            && (data[++index] == 't')) {
-            return TokenNameprint;
-          }
+      case 'p' :
+        // print public private protected
+        switch (length) {
+          case 5 :
+            if ((data[++index] == 'r') && (data[++index] == 'i')
+                && (data[++index] == 'n') && (data[++index] == 't')) {
+              return TokenNameprint;
+            } else
+              return TokenNameIdentifier;
+          case 6 :
+            if ((data[++index] == 'u') && (data[++index] == 'b')
+                && (data[++index] == 'l') && (data[++index] == 'i')
+                && (data[++index] == 'c')) {
+              return TokenNamepublic;
+            } else
+              return TokenNameIdentifier;
+          case 7 :
+            if ((data[++index] == 'r') && (data[++index] == 'i')
+                && (data[++index] == 'v') && (data[++index] == 'a')
+                && (data[++index] == 't') && (data[++index] == 'e')) {
+              return TokenNameprivate;
+            } else
+              return TokenNameIdentifier;
+          case 9 :
+            if ((data[++index] == 'r') && (data[++index] == 'o')
+                && (data[++index] == 't') && (data[++index] == 'e')
+                && (data[++index] == 'c') && (data[++index] == 't')
+                && (data[++index] == 'e') && (data[++index] == 'd')) {
+              return TokenNameprotected;
+            } else
+              return TokenNameIdentifier;
         }
         return TokenNameIdentifier;
-      case 'r' : //return require require_once
+      case 'r' :
+        //return require require_once
         if (length == 6) {
-          if ((data[++index] == 'e')
-            && (data[++index] == 't')
-            && (data[++index] == 'u')
-            && (data[++index] == 'r')
-            && (data[++index] == 'n')) {
+          if ((data[++index] == 'e') && (data[++index] == 't')
+              && (data[++index] == 'u') && (data[++index] == 'r')
+              && (data[++index] == 'n')) {
             return TokenNamereturn;
           }
         } else if (length == 7) {
-          if ((data[++index] == 'e')
-            && (data[++index] == 'q')
-            && (data[++index] == 'u')
-            && (data[++index] == 'i')
-            && (data[++index] == 'r')
-            && (data[++index] == 'e')) {
+          if ((data[++index] == 'e') && (data[++index] == 'q')
+              && (data[++index] == 'u') && (data[++index] == 'i')
+              && (data[++index] == 'r') && (data[++index] == 'e')) {
             return TokenNamerequire;
           }
         } else if (length == 12) {
-          if ((data[++index] == 'e')
-            && (data[++index] == 'q')
-            && (data[++index] == 'u')
-            && (data[++index] == 'i')
-            && (data[++index] == 'r')
-            && (data[++index] == 'e')
-            && (data[++index] == '_')
-            && (data[++index] == 'o')
-            && (data[++index] == 'n')
-            && (data[++index] == 'c')
-            && (data[++index] == 'e')) {
+          if ((data[++index] == 'e') && (data[++index] == 'q')
+              && (data[++index] == 'u') && (data[++index] == 'i')
+              && (data[++index] == 'r') && (data[++index] == 'e')
+              && (data[++index] == '_') && (data[++index] == 'o')
+              && (data[++index] == 'n') && (data[++index] == 'c')
+              && (data[++index] == 'e')) {
             return TokenNamerequire_once;
           }
         } else
           return TokenNameIdentifier;
-
-      case 's' : //static switch 
+      case 's' :
+        //static switch
         switch (length) {
           case 6 :
             if (data[++index] == 't')
-              if ((data[++index] == 'a')
-                && (data[++index] == 't')
-                && (data[++index] == 'i')
-                && (data[++index] == 'c')) {
+              if ((data[++index] == 'a') && (data[++index] == 't')
+                  && (data[++index] == 'i') && (data[++index] == 'c')) {
                 return TokenNamestatic;
               } else
                 return TokenNameIdentifier;
-            else if (
-              (data[index] == 'w')
-                && (data[++index] == 'i')
-                && (data[++index] == 't')
-                && (data[++index] == 'c')
+            else if ((data[index] == 'w') && (data[++index] == 'i')
+                && (data[++index] == 't') && (data[++index] == 'c')
                 && (data[++index] == 'h'))
               return TokenNameswitch;
             else
@@ -3015,62 +3038,83 @@ public class Scanner implements IScanner, ITerminalSymbols {
           default :
             return TokenNameIdentifier;
         }
-
-      case 't' : // true
+      case 't' :
+        // try true throw
         switch (length) {
-
-          case 4 :
-            if ((data[++index] == 'r')
-              && (data[++index] == 'u')
-              && (data[++index] == 'e'))
-              return TokenNametrue;
+          case 3 :
+            if ((data[++index] == 'r') && (data[++index] == 'y'))
+              return TokenNametry;
+            else
+              return TokenNameIdentifier;
+          //          case 4 :
+          //            if ((data[++index] == 'r') && (data[++index] == 'u')
+          //                && (data[++index] == 'e'))
+          //              return TokenNametrue;
+          //            else
+          //              return TokenNameIdentifier;
+          case 5 :
+            if ((data[++index] == 'h') && (data[++index] == 'r')
+                && (data[++index] == 'o') && (data[++index] == 'w'))
+              return TokenNamethrow;
             else
               return TokenNameIdentifier;
-            //            if ((data[++index] == 'h') && (data[++index] == 'i') && (data[++index] == 's'))
-            //              return TokenNamethis;
-
           default :
             return TokenNameIdentifier;
         }
-
-      case 'v' : //var 
+      case 'u' :
+        //use unset
+        switch (length) {
+          case 3 :
+            if ((data[++index] == 's') && (data[++index] == 'e'))
+              return TokenNameuse;
+            else
+              return TokenNameIdentifier;
+          case 5 :
+            if ((data[++index] == 'n') && (data[++index] == 's')
+                && (data[++index] == 'e') && (data[++index] == 't'))
+              return TokenNameunset;
+            else
+              return TokenNameIdentifier;
+          default :
+            return TokenNameIdentifier;
+        }
+      case 'v' :
+        //var
         switch (length) {
           case 3 :
             if ((data[++index] == 'a') && (data[++index] == 'r'))
               return TokenNamevar;
             else
               return TokenNameIdentifier;
-
           default :
             return TokenNameIdentifier;
         }
-
-      case 'w' : //while 
+      case 'w' :
+        //while
         switch (length) {
           case 5 :
-            if ((data[++index] == 'h')
-              && (data[++index] == 'i')
-              && (data[++index] == 'l')
-              && (data[++index] == 'e'))
+            if ((data[++index] == 'h') && (data[++index] == 'i')
+                && (data[++index] == 'l') && (data[++index] == 'e'))
               return TokenNamewhile;
             else
               return TokenNameIdentifier;
-            //case 6:if ( (data[++index] =='i') && (data[++index]=='d') && (data[++index]=='e') && (data[++index]=='f')&& (data[++index]=='p'))
-            //return TokenNamewidefp ;
-            //else
-            //return TokenNameIdentifier;
+          //case 6:if ( (data[++index] =='i') && (data[++index]=='d') &&
+          // (data[++index]=='e') && (data[++index]=='f')&&
+          // (data[++index]=='p'))
+          //return TokenNamewidefp ;
+          //else
+          //return TokenNameIdentifier;
           default :
             return TokenNameIdentifier;
         }
-
-      case 'x' : //xor
+      case 'x' :
+        //xor
         switch (length) {
           case 3 :
             if ((data[++index] == 'o') && (data[++index] == 'r'))
-              return TokenNameXOR;
+              return TokenNamexor;
             else
               return TokenNameIdentifier;
-
           default :
             return TokenNameIdentifier;
         }
@@ -3079,25 +3123,24 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
   }
   public int scanNumber(boolean dotPrefix) throws InvalidInputException {
-
     //when entering this method the currentCharacter is the firt
     //digit of the number , i.e. it may be preceeded by a . when
     //dotPrefix is true
-
     boolean floating = dotPrefix;
     if ((!dotPrefix) && (currentCharacter == '0')) {
       if (getNextChar('x', 'X') >= 0) { //----------hexa-----------------
         //force the first char of the hexa number do exist...
         // consume next character
         unicodeAsBackSlash = false;
-        if (((currentCharacter = source[currentPosition++]) == '\\')
-          && (source[currentPosition] == 'u')) {
-          getNextUnicodeChar();
-        } else {
-          if (withoutUnicodePtr != 0) {
-            withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-          }
-        }
+        currentCharacter = source[currentPosition++];
+        //        if (((currentCharacter = source[currentPosition++]) == '\\')
+        //          && (source[currentPosition] == 'u')) {
+        //          getNextUnicodeChar();
+        //        } else {
+        //          if (withoutUnicodePtr != 0) {
+        //            withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+        //          }
+        //        }
         if (Character.digit(currentCharacter, 16) == -1)
           throw new InvalidInputException(INVALID_HEXA);
         //---end forcing--
@@ -3108,14 +3151,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
         //        else
         return TokenNameIntegerLiteral;
       }
-
       //there is x or X in the number
-      //potential octal ! ... some one may write 000099.0 ! thus 00100 < 00078.0 is true !!!!! crazy language
+      //potential octal ! ... some one may write 000099.0 ! thus 00100 <
+      // 00078.0 is true !!!!! crazy language
       if (getNextCharAsDigit()) {
         //-------------potential octal-----------------
         while (getNextCharAsDigit()) {
         };
-
         //        if (getNextChar('l', 'L') >= 0) {
         //          return TokenNameLongLiteral;
         //        }
@@ -3123,7 +3165,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
         //        if (getNextChar('f', 'F') >= 0) {
         //          return TokenNameFloatingPointLiteral;
         //        }
-
         if (getNextChar('d', 'D') >= 0) {
           return TokenNameDoubleLiteral;
         } else { //make the distinction between octal and float ....
@@ -3133,27 +3174,28 @@ public class Scanner implements IScanner, ITerminalSymbols {
             if (getNextChar('e', 'E') >= 0) {
               // consume next character
               unicodeAsBackSlash = false;
-              if (((currentCharacter = source[currentPosition++]) == '\\')
-                && (source[currentPosition] == 'u')) {
-                getNextUnicodeChar();
-              } else {
-                if (withoutUnicodePtr != 0) {
-                  withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-                }
-              }
-
+              currentCharacter = source[currentPosition++];
+              //              if (((currentCharacter = source[currentPosition++]) == '\\')
+              //                && (source[currentPosition] == 'u')) {
+              //                getNextUnicodeChar();
+              //              } else {
+              //                if (withoutUnicodePtr != 0) {
+              //                  withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+              //                }
+              //              }
               if ((currentCharacter == '-') || (currentCharacter == '+')) {
                 // consume next character
                 unicodeAsBackSlash = false;
-                if (((currentCharacter = source[currentPosition++]) == '\\')
-                  && (source[currentPosition] == 'u')) {
-                  getNextUnicodeChar();
-                } else {
-                  if (withoutUnicodePtr != 0) {
-                    withoutUnicodeBuffer[++withoutUnicodePtr] =
-                      currentCharacter;
-                  }
-                }
+                currentCharacter = source[currentPosition++];
+                //                if (((currentCharacter = source[currentPosition++]) == '\\')
+                //                  && (source[currentPosition] == 'u')) {
+                //                  getNextUnicodeChar();
+                //                } else {
+                //                  if (withoutUnicodePtr != 0) {
+                //                    withoutUnicodeBuffer[++withoutUnicodePtr] =
+                //                      currentCharacter;
+                //                  }
+                //                }
               }
               if (!Character.isDigit(currentCharacter))
                 throw new InvalidInputException(INVALID_FLOAT);
@@ -3172,67 +3214,60 @@ public class Scanner implements IScanner, ITerminalSymbols {
         /* carry on */
       }
     }
-
     while (getNextCharAsDigit()) {
     };
-
     //    if ((!dotPrefix) && (getNextChar('l', 'L') >= 0))
     //      return TokenNameLongLiteral;
-
     if ((!dotPrefix) && (getNextChar('.'))) { //decimal part that can be empty
       while (getNextCharAsDigit()) {
       };
       floating = true;
     }
-
     //if floating is true both exponant and suffix may be optional
-
     if (getNextChar('e', 'E') >= 0) {
       floating = true;
       // consume next character
       unicodeAsBackSlash = false;
-      if (((currentCharacter = source[currentPosition++]) == '\\')
-        && (source[currentPosition] == 'u')) {
-        getNextUnicodeChar();
-      } else {
-        if (withoutUnicodePtr != 0) {
-          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-        }
-      }
-
-      if ((currentCharacter == '-')
-        || (currentCharacter == '+')) { // consume next character
+      currentCharacter = source[currentPosition++];
+      //      if (((currentCharacter = source[currentPosition++]) == '\\')
+      //        && (source[currentPosition] == 'u')) {
+      //        getNextUnicodeChar();
+      //      } else {
+      //        if (withoutUnicodePtr != 0) {
+      //          withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+      //        }
+      //      }
+      if ((currentCharacter == '-') || (currentCharacter == '+')) { // consume
+        // next
+        // character
         unicodeAsBackSlash = false;
-        if (((currentCharacter = source[currentPosition++]) == '\\')
-          && (source[currentPosition] == 'u')) {
-          getNextUnicodeChar();
-        } else {
-          if (withoutUnicodePtr != 0) {
-            withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
-          }
-        }
+        currentCharacter = source[currentPosition++];
+        //        if (((currentCharacter = source[currentPosition++]) == '\\')
+        //          && (source[currentPosition] == 'u')) {
+        //          getNextUnicodeChar();
+        //        } else {
+        //          if (withoutUnicodePtr != 0) {
+        //            withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+        //          }
+        //        }
       }
       if (!Character.isDigit(currentCharacter))
         throw new InvalidInputException(INVALID_FLOAT);
       while (getNextCharAsDigit()) {
       };
     }
-
     if (getNextChar('d', 'D') >= 0)
       return TokenNameDoubleLiteral;
     //    if (getNextChar('f', 'F') >= 0)
     //      return TokenNameFloatingPointLiteral;
-
     //the long flag has been tested before
-
     return floating ? TokenNameDoubleLiteral : TokenNameIntegerLiteral;
   }
   /**
    * Search the line number corresponding to a specific position
-   *
+   *  
    */
   public final int getLineNumber(int position) {
-
     if (lineEnds == null)
       return 1;
     int length = linePtr + 1;
@@ -3255,14 +3290,11 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
     return m + 2;
   }
-
   public void setPHPMode(boolean mode) {
     phpMode = mode;
   }
-
   public final void setSource(char[] source) {
     //the source-buffer is set to sourceString
-
     if (source == null) {
       this.source = new char[0];
     } else {
@@ -3272,18 +3304,15 @@ public class Scanner implements IScanner, ITerminalSymbols {
     initialPosition = currentPosition = 0;
     containsAssertKeyword = false;
     withoutUnicodeBuffer = new char[this.source.length];
-
+    encapsedStringStack = new Stack();
   }
-
   public String toString() {
     if (startPosition == source.length)
       return "EOF\n\n" + new String(source); //$NON-NLS-1$
     if (currentPosition > source.length)
       return "behind the EOF :-( ....\n\n" + new String(source); //$NON-NLS-1$
-
     char front[] = new char[startPosition];
     System.arraycopy(source, 0, front, 0, startPosition);
-
     int middleLength = (currentPosition - 1) - startPosition + 1;
     char middle[];
     if (middleLength > -1) {
@@ -3292,29 +3321,32 @@ public class Scanner implements IScanner, ITerminalSymbols {
     } else {
       middle = new char[0];
     }
-
     char end[] = new char[source.length - (currentPosition - 1)];
-    System.arraycopy(
-      source,
-      (currentPosition - 1) + 1,
-      end,
-      0,
-      source.length - (currentPosition - 1) - 1);
-
-    return new String(front) + "\n===============================\nStarts here -->" //$NON-NLS-1$
-    + new String(middle) + "<-- Ends here\n===============================\n" //$NON-NLS-1$
-    + new String(end);
+    System.arraycopy(source, (currentPosition - 1) + 1, end, 0, source.length
+        - (currentPosition - 1) - 1);
+    return new String(front)
+        + "\n===============================\nStarts here -->" //$NON-NLS-1$
+        + new String(middle)
+        + "<-- Ends here\n===============================\n" //$NON-NLS-1$
+        + new String(end);
   }
   public final String toStringAction(int act) {
     switch (act) {
       case TokenNameERROR :
-        return "ScannerError(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
-      case TokenNameStopPHP :
-        return "StopPHP(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        return "ScannerError"; // + new String(getCurrentTokenSource()) + ")";
+      // //$NON-NLS-1$
+      case TokenNameINLINE_HTML :
+        return "Inline-HTML(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameIdentifier :
         return "Identifier(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameVariable :
         return "Variable(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+      case TokenNameabstract :
+        return "abstract"; //$NON-NLS-1$
+      case TokenNameand :
+        return "AND"; //$NON-NLS-1$
+      case TokenNamearray :
+        return "array"; //$NON-NLS-1$
       case TokenNameas :
         return "as"; //$NON-NLS-1$
       case TokenNamebreak :
@@ -3323,12 +3355,20 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "case"; //$NON-NLS-1$
       case TokenNameclass :
         return "class"; //$NON-NLS-1$
+      case TokenNamecatch :
+        return "catch"; //$NON-NLS-1$
+      case TokenNameclone :
+        //$NON-NLS-1$
+        return "clone";
+      case TokenNameconst :
+        //$NON-NLS-1$
+        return "const";
       case TokenNamecontinue :
         return "continue"; //$NON-NLS-1$
       case TokenNamedefault :
         return "default"; //$NON-NLS-1$
-      case TokenNamedefine :
-        return "define"; //$NON-NLS-1$
+      //      case TokenNamedefine :
+      //        return "define"; //$NON-NLS-1$
       case TokenNamedo :
         return "do"; //$NON-NLS-1$
       case TokenNameecho :
@@ -3349,8 +3389,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "endwhile"; //$NON-NLS-1$
       case TokenNameextends :
         return "extends"; //$NON-NLS-1$
-      case TokenNamefalse :
-        return "false"; //$NON-NLS-1$
+      //      case TokenNamefalse :
+      //        return "false"; //$NON-NLS-1$
+      case TokenNamefinal :
+        return "final"; //$NON-NLS-1$
       case TokenNamefor :
         return "for"; //$NON-NLS-1$
       case TokenNameforeach :
@@ -3361,18 +3403,34 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "global"; //$NON-NLS-1$
       case TokenNameif :
         return "if"; //$NON-NLS-1$
+      case TokenNameimplements :
+        return "implements"; //$NON-NLS-1$
       case TokenNameinclude :
         return "include"; //$NON-NLS-1$
       case TokenNameinclude_once :
         return "include_once"; //$NON-NLS-1$
+      case TokenNameinstanceof :
+        return "instanceof"; //$NON-NLS-1$
+      case TokenNameinterface :
+        return "interface"; //$NON-NLS-1$
+      case TokenNameisset :
+        return "isset"; //$NON-NLS-1$
       case TokenNamelist :
         return "list"; //$NON-NLS-1$
       case TokenNamenew :
         return "new"; //$NON-NLS-1$
-      case TokenNamenull :
-        return "null"; //$NON-NLS-1$
+      //      case TokenNamenull :
+      //        return "null"; //$NON-NLS-1$
+      case TokenNameor :
+        return "OR"; //$NON-NLS-1$
       case TokenNameprint :
         return "print"; //$NON-NLS-1$
+      case TokenNameprivate :
+        return "private"; //$NON-NLS-1$
+      case TokenNameprotected :
+        return "protected"; //$NON-NLS-1$
+      case TokenNamepublic :
+        return "public"; //$NON-NLS-1$
       case TokenNamerequire :
         return "require"; //$NON-NLS-1$
       case TokenNamerequire_once :
@@ -3383,31 +3441,47 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "static"; //$NON-NLS-1$
       case TokenNameswitch :
         return "switch"; //$NON-NLS-1$
-      case TokenNametrue :
-        return "true"; //$NON-NLS-1$
+      //      case TokenNametrue :
+      //        return "true"; //$NON-NLS-1$
+      case TokenNameunset :
+        return "unset"; //$NON-NLS-1$
       case TokenNamevar :
         return "var"; //$NON-NLS-1$
       case TokenNamewhile :
         return "while"; //$NON-NLS-1$
+      case TokenNamexor :
+        return "XOR"; //$NON-NLS-1$
+      //      case TokenNamethis :
+      //        return "$this"; //$NON-NLS-1$
       case TokenNameIntegerLiteral :
         return "Integer(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameDoubleLiteral :
         return "Double(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameStringLiteral :
-        return "String(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        return "StringLiteral(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameStringConstant :
         return "StringConstant(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameStringInterpolated :
-        return "StringInterpolated(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        return "StringInterpolated(" + new String(getCurrentTokenSource())
+            + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+      case TokenNameEncapsedString0 :
+        return "`"; //$NON-NLS-1$  
+      case TokenNameEncapsedString1 :
+        return "\'"; //$NON-NLS-1$  
+      case TokenNameEncapsedString2 :
+        return "\""; //$NON-NLS-1$  
+      case TokenNameSTRING :
+        return "STRING(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
       case TokenNameHEREDOC :
         return "HEREDOC(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
-
       case TokenNamePLUS_PLUS :
         return "++"; //$NON-NLS-1$
       case TokenNameMINUS_MINUS :
         return "--"; //$NON-NLS-1$
       case TokenNameEQUAL_EQUAL :
         return "=="; //$NON-NLS-1$
+      case TokenNameEQUAL_EQUAL_EQUAL :
+        return "==="; //$NON-NLS-1$
       case TokenNameEQUAL_GREATER :
         return "=>"; //$NON-NLS-1$
       case TokenNameLESS_EQUAL :
@@ -3416,6 +3490,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return ">="; //$NON-NLS-1$
       case TokenNameNOT_EQUAL :
         return "!="; //$NON-NLS-1$
+      case TokenNameNOT_EQUAL_EQUAL :
+        return "!=="; //$NON-NLS-1$
       case TokenNameLEFT_SHIFT :
         return "<<"; //$NON-NLS-1$
       case TokenNameRIGHT_SHIFT :
@@ -3436,6 +3512,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "^="; //$NON-NLS-1$
       case TokenNameREMAINDER_EQUAL :
         return "%="; //$NON-NLS-1$
+      case TokenNameDOT_EQUAL :
+        return ".="; //$NON-NLS-1$
       case TokenNameLEFT_SHIFT_EQUAL :
         return "<<="; //$NON-NLS-1$
       case TokenNameRIGHT_SHIFT_EQUAL :
@@ -3498,45 +3576,67 @@ public class Scanner implements IScanner, ITerminalSymbols {
         return "="; //$NON-NLS-1$
       case TokenNameAT :
         return "@";
+      case TokenNameDOLLAR :
+        return "$";
       case TokenNameDOLLAR_LBRACE :
         return "${";
       case TokenNameEOF :
         return "EOF"; //$NON-NLS-1$
+      case TokenNameWHITESPACE :
+        return "WHITESPACE(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
+      case TokenNameCOMMENT_LINE :
+        return "COMMENT_LINE(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
+      case TokenNameCOMMENT_BLOCK :
+        return "COMMENT_BLOCK(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
+      case TokenNameCOMMENT_PHPDOC :
+        return "COMMENT_PHPDOC(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$
+      //      case TokenNameHTML :
+      //        return "HTML(" + new String(getCurrentTokenSource()) + ")";
+      // //$NON-NLS-1$
+      case TokenNameFILE :
+        return "__FILE__"; //$NON-NLS-1$
+      case TokenNameLINE :
+        return "__LINE__"; //$NON-NLS-1$
+      case TokenNameCLASS_C :
+        return "__CLASS__"; //$NON-NLS-1$
+      case TokenNameMETHOD_C :
+        return "__METHOD__"; //$NON-NLS-1$
+      case TokenNameFUNC_C :
+        return "__FUNCTION__"; //$NON-NLS-1
+      case TokenNameboolCAST :
+        return "( bool )"; //$NON-NLS-1$
+      case TokenNameintCAST :
+        return "( int )"; //$NON-NLS-1$
+      case TokenNamedoubleCAST :
+        return "( double )"; //$NON-NLS-1$
+      case TokenNameobjectCAST :
+        return "( object )"; //$NON-NLS-1$
+      case TokenNamestringCAST :
+        return "( string )"; //$NON-NLS-1$
       default :
-        return "not-a-token(" + (new Integer(act)) + ") " + new String(getCurrentTokenSource()); //$NON-NLS-1$
+        return "not-a-token(" + (new Integer(act)) + ") "
+            + new String(getCurrentTokenSource()); //$NON-NLS-1$
     }
   }
-
-  public Scanner(
-    boolean tokenizeComments,
-    boolean tokenizeWhiteSpace,
-    boolean checkNonExternalizedStringLiterals) {
-    this(
-      tokenizeComments,
-      tokenizeWhiteSpace,
-      checkNonExternalizedStringLiterals,
-      false);
+  public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace,
+      boolean checkNonExternalizedStringLiterals) {
+    this(tokenizeComments, tokenizeWhiteSpace,
+        checkNonExternalizedStringLiterals, false);
   }
-
-  public Scanner(
-    boolean tokenizeComments,
-    boolean tokenizeWhiteSpace,
-    boolean checkNonExternalizedStringLiterals,
-    boolean assertMode) {
+  public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace,
+      boolean checkNonExternalizedStringLiterals, boolean assertMode) {
     this.eofPosition = Integer.MAX_VALUE;
     this.tokenizeComments = tokenizeComments;
     this.tokenizeWhiteSpace = tokenizeWhiteSpace;
-    this.checkNonExternalizedStringLiterals =
-      checkNonExternalizedStringLiterals;
+    this.checkNonExternalizedStringLiterals = checkNonExternalizedStringLiterals;
     this.assertMode = assertMode;
+    this.encapsedStringStack = null;
   }
-
   private void checkNonExternalizeString() throws InvalidInputException {
     if (currentLine == null)
       return;
     parseTags(currentLine);
   }
-
   private void parseTags(NLSLine line) throws InvalidInputException {
     String s = new String(getCurrentTokenSource());
     int pos = s.indexOf(TAG_PREFIX);
@@ -3557,7 +3657,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
       }
       pos = s.indexOf(TAG_PREFIX, start);
     }
-
     this.nonNLSStrings = new StringLiteral[lineLength];
     int nonNLSCounter = 0;
     for (Iterator iterator = line.iterator(); iterator.hasNext();) {
@@ -3573,13 +3672,192 @@ public class Scanner implements IScanner, ITerminalSymbols {
     }
     this.wasNonExternalizedStringLiteral = true;
     if (nonNLSCounter != lineLength) {
-      System.arraycopy(
-        this.nonNLSStrings,
-        0,
-        (this.nonNLSStrings = new StringLiteral[nonNLSCounter]),
-        0,
-        nonNLSCounter);
+      System.arraycopy(this.nonNLSStrings, 0,
+          (this.nonNLSStrings = new StringLiteral[nonNLSCounter]), 0,
+          nonNLSCounter);
     }
     currentLine = null;
   }
+  public final void scanEscapeCharacter() throws InvalidInputException {
+    // the string with "\\u" is a legal string of two chars \ and u
+    //thus we use a direct access to the source (for regular cases).
+    if (unicodeAsBackSlash) {
+      // consume next character
+      unicodeAsBackSlash = false;
+      //                       if (((currentCharacter = source[currentPosition++]) == '\\') &&
+      // (source[currentPosition] == 'u')) {
+      //                               getNextUnicodeChar();
+      //                       } else {
+      if (withoutUnicodePtr != 0) {
+        withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+        //                             }
+      }
+    } else
+      currentCharacter = source[currentPosition++];
+    switch (currentCharacter) {
+      case 'b' :
+        currentCharacter = '\b';
+        break;
+      case 't' :
+        currentCharacter = '\t';
+        break;
+      case 'n' :
+        currentCharacter = '\n';
+        break;
+      case 'f' :
+        currentCharacter = '\f';
+        break;
+      case 'r' :
+        currentCharacter = '\r';
+        break;
+      case '\"' :
+        currentCharacter = '\"';
+        break;
+      case '\'' :
+        currentCharacter = '\'';
+        break;
+      case '\\' :
+        currentCharacter = '\\';
+        break;
+      default :
+        // -----------octal escape--------------
+        // OctalDigit
+        // OctalDigit OctalDigit
+        // ZeroToThree OctalDigit OctalDigit
+        int number = Character.getNumericValue(currentCharacter);
+        if (number >= 0 && number <= 7) {
+          boolean zeroToThreeNot = number > 3;
+          if (Character.isDigit(currentCharacter = source[currentPosition++])) {
+            int digit = Character.getNumericValue(currentCharacter);
+            if (digit >= 0 && digit <= 7) {
+              number = (number * 8) + digit;
+              if (Character
+                  .isDigit(currentCharacter = source[currentPosition++])) {
+                if (zeroToThreeNot) { // has read \NotZeroToThree OctalDigit
+                  // Digit --> ignore last character
+                  currentPosition--;
+                } else {
+                  digit = Character.getNumericValue(currentCharacter);
+                  if (digit >= 0 && digit <= 7) { // has read \ZeroToThree
+                    // OctalDigit OctalDigit
+                    number = (number * 8) + digit;
+                  } else { // has read \ZeroToThree OctalDigit NonOctalDigit
+                    // --> ignore last character
+                    currentPosition--;
+                  }
+                }
+              } else { // has read \OctalDigit NonDigit--> ignore last
+                // character
+                currentPosition--;
+              }
+            } else { // has read \OctalDigit NonOctalDigit--> ignore last
+              // character
+              currentPosition--;
+            }
+          } else { // has read \OctalDigit --> ignore last character
+            currentPosition--;
+          }
+          if (number > 255)
+            throw new InvalidInputException(INVALID_ESCAPE);
+          currentCharacter = (char) number;
+        } else
+          throw new InvalidInputException(INVALID_ESCAPE);
+    }
+  }
+  // chech presence of task: tags
+  public void checkTaskTag(int commentStart, int commentEnd) {
+    // only look for newer task: tags
+    if (this.foundTaskCount > 0
+        && this.foundTaskPositions[this.foundTaskCount - 1][0] >= commentStart) {
+      return;
+    }
+    int foundTaskIndex = this.foundTaskCount;
+    nextChar : for (int i = commentStart; i < commentEnd
+        && i < this.eofPosition; i++) {
+      char[] tag = null;
+      char[] priority = null;
+      // check for tag occurrence
+      nextTag : for (int itag = 0; itag < this.taskTags.length; itag++) {
+        tag = this.taskTags[itag];
+        priority = this.taskPriorities != null
+            && itag < this.taskPriorities.length
+            ? this.taskPriorities[itag]
+            : null;
+        int tagLength = tag.length;
+        for (int t = 0; t < tagLength; t++) {
+          if (this.source[i + t] != tag[t])
+            continue nextTag;
+        }
+        if (this.foundTaskTags == null) {
+          this.foundTaskTags = new char[5][];
+          this.foundTaskMessages = new char[5][];
+          this.foundTaskPriorities = new char[5][];
+          this.foundTaskPositions = new int[5][];
+        } else if (this.foundTaskCount == this.foundTaskTags.length) {
+          System.arraycopy(this.foundTaskTags, 0,
+              this.foundTaskTags = new char[this.foundTaskCount * 2][], 0,
+              this.foundTaskCount);
+          System.arraycopy(this.foundTaskMessages, 0,
+              this.foundTaskMessages = new char[this.foundTaskCount * 2][], 0,
+              this.foundTaskCount);
+          System.arraycopy(this.foundTaskPriorities, 0,
+              this.foundTaskPriorities = new char[this.foundTaskCount * 2][],
+              0, this.foundTaskCount);
+          System.arraycopy(this.foundTaskPositions, 0,
+              this.foundTaskPositions = new int[this.foundTaskCount * 2][], 0,
+              this.foundTaskCount);
+        }
+        this.foundTaskTags[this.foundTaskCount] = tag;
+        this.foundTaskPriorities[this.foundTaskCount] = priority;
+        this.foundTaskPositions[this.foundTaskCount] = new int[]{i,
+            i + tagLength - 1};
+        this.foundTaskMessages[this.foundTaskCount] = CharOperation.NO_CHAR;
+        this.foundTaskCount++;
+        i += tagLength - 1; // will be incremented when looping
+      }
+    }
+    for (int i = foundTaskIndex; i < this.foundTaskCount; i++) {
+      // retrieve message start and end positions
+      int msgStart = this.foundTaskPositions[i][0]
+          + this.foundTaskTags[i].length;
+      int max_value = i + 1 < this.foundTaskCount
+          ? this.foundTaskPositions[i + 1][0] - 1
+          : commentEnd - 1;
+      // at most beginning of next task
+      if (max_value < msgStart)
+        max_value = msgStart; // would only occur if tag is before EOF.
+      int end = -1;
+      char c;
+      for (int j = msgStart; j < max_value; j++) {
+        if ((c = this.source[j]) == '\n' || c == '\r') {
+          end = j - 1;
+          break;
+        }
+      }
+      if (end == -1) {
+        for (int j = max_value; j > msgStart; j--) {
+          if ((c = this.source[j]) == '*') {
+            end = j - 1;
+            break;
+          }
+        }
+        if (end == -1)
+          end = max_value;
+      }
+      if (msgStart == end)
+        continue; // empty
+      // trim the message
+      while (CharOperation.isWhitespace(source[end]) && msgStart <= end)
+        end--;
+      while (CharOperation.isWhitespace(source[msgStart]) && msgStart <= end)
+        msgStart++;
+      // update the end position of the task
+      this.foundTaskPositions[i][1] = end;
+      // get the message source
+      final int messageLength = end - msgStart + 1;
+      char[] message = new char[messageLength];
+      System.arraycopy(source, msgStart, message, 0, messageLength);
+      this.foundTaskMessages[i] = message;
+    }
+  }
 }