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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index f230cf3..4e52fb8 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -349,13 +349,13 @@ public class Scanner implements IScanner, ITerminalSymbols {
 		// <= 0xFF);
 	}
 
-	public static boolean isSQLIdentifierPart(char ch) {
-		if (ch < MAX_OBVIOUS) {
-			return ObviousIdentCharNatures[ch] == C_LETTER
-					|| ObviousIdentCharNatures[ch] == C_DIGIT;
-		}
-		return false;
-	}
+//	public static boolean isSQLIdentifierPart(char ch) {
+//		if (ch < MAX_OBVIOUS) {
+//			return ObviousIdentCharNatures[ch] == C_LETTER
+//					|| ObviousIdentCharNatures[ch] == C_DIGIT;
+//		}
+//		return false;
+//	}
 
 	public final boolean atEnd() {
 		// This code is not relevant if source is
@@ -476,22 +476,22 @@ public class Scanner implements IScanner, ITerminalSymbols {
 		return true;
 	}
 
-	public final char[] getRawTokenSourceEnd() {
-		int length = this.eofPosition - this.currentPosition - 1;
-		char[] sourceEnd = new char[length];
-		System.arraycopy(this.source, this.currentPosition, sourceEnd, 0,
-				length);
-		return sourceEnd;
-	}
+//	public final char[] getRawTokenSourceEnd() {
+//		int length = this.eofPosition - this.currentPosition - 1;
+//		char[] sourceEnd = new char[length];
+//		System.arraycopy(this.source, this.currentPosition, sourceEnd, 0,
+//				length);
+//		return sourceEnd;
+//	}
 
 	public int getCurrentTokenStartPosition() {
 		return this.startPosition;
 	}
 
-	public final String getCurrentStringLiteral() {
-		char[] result = getCurrentStringLiteralSource();
-		return new String(result);
-	}
+//	public final String getCurrentStringLiteral() {
+//		char[] result = getCurrentStringLiteralSource();
+//		return new String(result);
+//	}
 
 	public final char[] getCurrentStringLiteralSource() {
 		// Return the token REAL source (aka unicodes are precomputed)
@@ -508,16 +508,16 @@ public class Scanner implements IScanner, ITerminalSymbols {
 		return result;
 	}
 
-	public final char[] getCurrentStringLiteralSource(int startPos) {
-		// Return the token REAL source (aka unicodes are precomputed)
-		char[] result;
-		int length;
-		System.arraycopy(source, startPos + 1,
-				result = new char[length = currentPosition - startPos - 2], 0,
-				length);
-		// }
-		return result;
-	}
+//	public final char[] getCurrentStringLiteralSource(int startPos) {
+//		// Return the token REAL source (aka unicodes are precomputed)
+//		char[] result;
+//		int length;
+//		System.arraycopy(source, startPos + 1,
+//				result = new char[length = currentPosition - startPos - 2], 0,
+//				length);
+//		// }
+//		return result;
+//	}
 
 	/*
 	 * Search the source position corresponding to the end of a given line
@@ -1438,8 +1438,6 @@ public class Scanner implements IScanner, ITerminalSymbols {
 
 					while ((currentCharacter == ' ')
 							|| Character.isWhitespace(currentCharacter)) {
-						startPosition = currentPosition;
-						currentCharacter = source[currentPosition++];
 						if ((currentCharacter == '\r')
 								|| (currentCharacter == '\n')) {
 							checkNonExternalizeString();
@@ -1449,6 +1447,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
 								currentLine = null;
 							}
 						}
+						startPosition = currentPosition;
+						currentCharacter = source[currentPosition++];
 					}
 					if (tokenizeWhiteSpace
 							&& (whiteStart != currentPosition - 1)) {
@@ -2128,7 +2128,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
 			}
 		} catch (IndexOutOfBoundsException e) {
 			phpMode = true;
-			currentPosition = currentPositionInLine;
+			currentPosition = currentPositionInLine - 1;
 			return TokenNameINLINE_HTML;
 		}
 	}
@@ -3698,6 +3698,8 @@ public class Scanner implements IScanner, ITerminalSymbols {
 			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'))