1) Moved net.sourceforge.phpeclipse.ui\src\net\sourceforge\phpdt back to net.sourcefo...

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / problem / ProblemReporter.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
index 9758077..444d07e 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
@@ -9,6 +9,7 @@ package net.sourceforge.phpdt.internal.compiler.problem;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.IProblem;
+import net.sourceforge.phpdt.core.compiler.ITerminalSymbols.TokenName;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
 import net.sourceforge.phpdt.internal.compiler.IErrorHandlingPolicy;
@@ -3492,15 +3493,15 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
                try {
                        Scanner scanner = new Scanner();
                        scanner.setSource(tokenSource);
-                       int token = scanner.getNextToken();
+                       TokenName token = scanner.getNextToken();
                        char[] currentKeyword;
                        try {
                                currentKeyword = scanner.getCurrentIdentifierSource();
                        } catch (ArrayIndexOutOfBoundsException e) {
                                return false;
                        }
-                       int nextToken = scanner.getNextToken();
-                       if (nextToken == Scanner.TokenNameEOF
+                       TokenName nextToken = scanner.getNextToken();
+                       if (nextToken == Scanner.TokenName.EOF
                                        && scanner.startPosition == scanner.source.length) { // to
                                // handle
                                // case
@@ -3511,7 +3512,7 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
                                // ArrayIndexOutOfBoundsException
                                // while reading the last token
                                switch (token) {
-                               case Scanner.TokenNameERROR:
+                               case ERROR:
                                        if (CharOperation.equals("goto".toCharArray(),
                                                        currentKeyword)
                                                        || CharOperation.equals(
@@ -3520,56 +3521,56 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
                                        } else {
                                                return false;
                                        }
-                               case Scanner.TokenNameabstract:
-                                       // case Scanner.TokenNameassert:
-                                       // case Scanner.TokenNamebyte:
-                               case Scanner.TokenNamebreak:
-                                       // case Scanner.TokenNameboolean:
-                               case Scanner.TokenNamecase:
-                                       // case Scanner.TokenNamechar:
-                               case Scanner.TokenNamecatch:
-                               case Scanner.TokenNameclass:
-                               case Scanner.TokenNamecontinue:
-                               case Scanner.TokenNamedo:
-                                       // case Scanner.TokenNamedouble:
-                               case Scanner.TokenNamedefault:
-                               case Scanner.TokenNameelse:
-                               case Scanner.TokenNameextends:
-                               case Scanner.TokenNamefor:
-                                       // case Scanner.TokenNamefinal:
-                                       // case Scanner.TokenNamefloat:
-                                       // case Scanner.TokenNamefalse :
-                               case Scanner.TokenNamefinally:
-                               case Scanner.TokenNameif:
-                                       // case Scanner.TokenNameint:
-                                       // case Scanner.TokenNameimport:
-                               case Scanner.TokenNameinterface:
-                               case Scanner.TokenNameimplements:
-                               case Scanner.TokenNameinstanceof:
-                                       // case Scanner.TokenNamelong:
-                               case Scanner.TokenNamenew:
-                                       // case Scanner.TokenNamenull :
-                                       // case Scanner.TokenNamenative:
-                               case Scanner.TokenNamepublic:
-                                       // case Scanner.TokenNamepackage:
-                               case Scanner.TokenNameprivate:
-                               case Scanner.TokenNameprotected:
-                               case Scanner.TokenNamereturn:
-                                       // case Scanner.TokenNameshort:
-                               case Scanner.TokenNamesuper:
-                               case Scanner.TokenNamestatic:
-                               case Scanner.TokenNameswitch:
-                                       // case Scanner.TokenNamestrictfp:
-                                       // case Scanner.TokenNamesynchronized:
-                               case Scanner.TokenNametry:
-                                       // case Scanner.TokenNamethis :
-                                       // case Scanner.TokenNametrue :
-                               case Scanner.TokenNamethrow:
-                                       // case Scanner.TokenNamethrows:
-                                       // case Scanner.TokenNametransient:
-                                       // case Scanner.TokenNamevoid:
-                                       // case Scanner.TokenNamevolatile:
-                               case Scanner.TokenNamewhile:
+                               case ABSTRACT:
+                                       // case ASSERT:
+                                       // case BYTE:
+                               case BREAK:
+                                       // case BOOLEAN:
+                               case CASE:
+                                       // case CHAR:
+                               case CATCH:
+                               case CLASS:
+                               case CONTINUE:
+                               case DO:
+                                       // case DOUBLE:
+                               case DEFAULT:
+                               case ELSE:
+                               case EXTENDS:
+                               case FOR:
+                                       // case FINAL:
+                                       // case FLOAT:
+                                       // case FALSE :
+                               case FINALLY:
+                               case IF:
+                                       // case INT:
+                                       // case IMPORT:
+                               case INTERFACE:
+                               case IMPLEMENTS:
+                               case INSTANCEOF:
+                                       // case LONG:
+                               case NEW:
+                                       // case NULL :
+                                       // case NATIVE:
+                               case PUBLIC:
+                                       // case PACKAGE:
+                               case PRIVATE:
+                               case PROTECTED:
+                               case RETURN:
+                                       // case SHORT:
+                               case SUPER:
+                               case STATIC:
+                               case SWITCH:
+                                       // case STRICTFP:
+                                       // case SYNCHRONIZED:
+                               case TRY:
+                                       // case THIS :
+                                       // case TRUE :
+                               case THROW:
+                                       // case THROWS:
+                                       // case TRANSIENT:
+                                       // case VOID:
+                                       // case VOLATILE:
+                               case WHILE:
                                        return true;
                                default:
                                        return false;