Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: compiler/java/com/google/dart/compiler/parser/DartParser.java

Issue 8972003: Promote class to a reserved word (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: compiler/java/com/google/dart/compiler/parser/DartParser.java
diff --git a/compiler/java/com/google/dart/compiler/parser/DartParser.java b/compiler/java/com/google/dart/compiler/parser/DartParser.java
index 85e54bf233d968aeb3ba567714bd926568e0b44c..c5ef614420759d7f88ecfab8e0383d7533c3518a 100644
--- a/compiler/java/com/google/dart/compiler/parser/DartParser.java
+++ b/compiler/java/com/google/dart/compiler/parser/DartParser.java
@@ -123,7 +123,6 @@ public class DartParser extends CompletionHooksParserBase {
// Pseudo-keywords that should also be valid identifiers.
private static final String ABSTRACT_KEYWORD = "abstract";
private static final String ASSERT_KEYWORD = "assert";
- private static final String CLASS_KEYWORD = "class";
private static final String EXTENDS_KEYWORD = "extends";
private static final String FACTORY_KEYWORD = "factory";
private static final String GETTER_KEYWORD = "get";
@@ -140,7 +139,6 @@ public class DartParser extends CompletionHooksParserBase {
public static final String[] PSEUDO_KEYWORDS = {
ABSTRACT_KEYWORD,
ASSERT_KEYWORD,
- CLASS_KEYWORD,
EXTENDS_KEYWORD,
FACTORY_KEYWORD,
GETTER_KEYWORD,
@@ -260,7 +258,7 @@ public class DartParser extends CompletionHooksParserBase {
isParsingAbstract = true;
}
// Parse top level element.
- if (optionalPseudoKeyword(CLASS_KEYWORD)) {
+ if (optional(Token.CLASS)) {
node = done(parseClass());
} else if (optionalPseudoKeyword(INTERFACE_KEYWORD)) {
isParsingInterface = true;
@@ -295,7 +293,7 @@ public class DartParser extends CompletionHooksParserBase {
* level.
*/
private boolean peekTopLevelKeyword(int n) {
- return peekPseudoKeyword(n, CLASS_KEYWORD)
+ return peek(n) == Token.CLASS
|| peekPseudoKeyword(n, INTERFACE_KEYWORD)
|| peekPseudoKeyword(n, TYPEDEF_KEYWORD);
}

Powered by Google App Engine
This is Rietveld 408576698