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 d7c2618..f870539 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 @@ -2665,17 +2665,13 @@ public class Scanner implements IScanner, ITerminalSymbols { } case 'd' : //define declare default do die + // TODO delete define ==> no keyword ! switch (length) { case 2 : if ((data[++index] == 'o')) return TokenNamedo; else return TokenNameIdentifier; - case 3 : - if ((data[++index] == 'i') && (data[++index] == 'e')) - return TokenNamedie; - else - return TokenNameIdentifier; case 6 : if ((data[++index] == 'e') && (data[++index] == 'f') @@ -3394,6 +3390,10 @@ public class Scanner implements IScanner, ITerminalSymbols { 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 TokenNamearray : + return "array"; //$NON-NLS-1$ case TokenNameas : return "as"; //$NON-NLS-1$ case TokenNamebreak : @@ -3430,6 +3430,8 @@ public class Scanner implements IScanner, ITerminalSymbols { return "extends"; //$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 : @@ -3440,10 +3442,14 @@ 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 TokenNameinterface : + return "interface"; //$NON-NLS-1$ case TokenNamelist : return "list"; //$NON-NLS-1$ case TokenNamenew : @@ -3452,6 +3458,12 @@ public class Scanner implements IScanner, ITerminalSymbols { return "null"; //$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 : @@ -3464,6 +3476,8 @@ public class Scanner implements IScanner, ITerminalSymbols { return "switch"; //$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 :