azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS parser: removed RESERVED token type

Browse Source
This commit is contained in:
Alexey Tsvetkov
2014-12-09 12:34:52 +03:00
parent 0fac9b3673
commit b2cd437230
2 changed files with 1 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.parser/src/com/google/gwt/dev/js/rhino/Parser.java
-4
View File
@@ -1149,10 +1149,6 @@ public class Parser {
case TokenStream.PRIMARY: case TokenStream.PRIMARY:
return nf.createLeaf(ts.PRIMARY, ts.getOp()); return nf.createLeaf(ts.PRIMARY, ts.getOp());
case TokenStream.RESERVED:
reportError(ts, "msg.reserved.id");
break;
case TokenStream.ERROR: case TokenStream.ERROR:
/* the scanner or one of its subroutines reported the error. */ /* the scanner or one of its subroutines reported the error. */
break; break;
js/js.parser/src/com/google/gwt/dev/js/rhino/TokenStream.java
+1 -48
View File
@@ -50,7 +50,6 @@ import java.io.*;
public class TokenStream { public class TokenStream {
static final boolean RESERVED_KEYWORD_AS_IDENTIFIER = false;
/* /*
* JSTokenStream flags, mirroring those in jsscan.h. These are used * JSTokenStream flags, mirroring those in jsscan.h. These are used
@@ -212,7 +211,6 @@ public class TokenStream {
WITH = 124, // with keyword WITH = 124, // with keyword
CATCH = 125, // catch keyword CATCH = 125, // catch keyword
FINALLY = 126, // finally keyword FINALLY = 126, // finally keyword
RESERVED = 127, // reserved keywords
/** Added by Mike - these are JSOPs in the jsref, but I /** Added by Mike - these are JSOPs in the jsref, but I
* don't have them yet in the java implementation... * don't have them yet in the java implementation...
@@ -395,7 +393,6 @@ public class TokenStream {
case WITH: return "with"; case WITH: return "with";
case CATCH: return "catch"; case CATCH: return "catch";
case FINALLY: return "finally"; case FINALLY: return "finally";
case RESERVED: return "reserved";
case NOP: return "nop"; case NOP: return "nop";
case NOT: return "not"; case NOT: return "not";
case PRE: return "pre"; case PRE: return "pre";
@@ -482,43 +479,12 @@ public class TokenStream {
Id_void = UNARYOP | (VOID << 8), Id_void = UNARYOP | (VOID << 8),
Id_while = WHILE, Id_while = WHILE,
Id_with = WITH, Id_with = WITH,
// the following are #ifdef RESERVE_JAVA_KEYWORDS in jsscan.c
Id_abstract = RESERVED,
Id_boolean = RESERVED,
Id_byte = RESERVED,
Id_catch = CATCH, Id_catch = CATCH,
Id_char = RESERVED,
Id_class = RESERVED,
Id_const = RESERVED,
Id_debugger = DEBUGGER,
Id_double = RESERVED,
Id_enum = RESERVED,
Id_extends = RESERVED,
Id_final = RESERVED,
Id_finally = FINALLY, Id_finally = FINALLY,
Id_float = RESERVED,
Id_goto = RESERVED,
Id_implements = RESERVED,
Id_import = IMPORT, Id_import = IMPORT,
Id_instanceof = RELOP | (INSTANCEOF << 8), Id_instanceof = RELOP | (INSTANCEOF << 8),
Id_int = RESERVED,
Id_interface = RESERVED,
Id_long = RESERVED,
Id_native = RESERVED,
Id_package = RESERVED,
Id_private = RESERVED,
Id_protected = RESERVED,
Id_public = RESERVED,
Id_short = RESERVED,
Id_static = RESERVED,
Id_super = RESERVED,
Id_synchronized = RESERVED,
Id_throw = THROW, Id_throw = THROW,
Id_throws = RESERVED,
Id_transient = RESERVED,
Id_try = TRY, Id_try = TRY,
Id_volatile = RESERVED;
int id; int id;
String s = name; String s = name;
@@ -838,20 +804,7 @@ public class TokenStream {
// Return the corresponding token if it's a keyword // Return the corresponding token if it's a keyword
int result = stringToKeyword(str); int result = stringToKeyword(str);
if (result != EOF) { if (result != EOF) {
if (result != RESERVED) { return result;
return result;
}
else if (!RESERVED_KEYWORD_AS_IDENTIFIER)
{
return result;
}
else {
// If implementation permits to use future reserved
// keywords in violation with the EcmaScript standard,
// treat it as name but issue warning
Object[] errArgs = { str };
reportSyntaxWarning("msg.reserved.keyword", errArgs);
}
} }
} }
this.string = str; this.string = str;