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

Unified Diff: runtime/vm/parser.cc

Issue 23542041: Make "as" a built-in identifier aka pseudo keyword (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 months 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
« no previous file with comments | « runtime/vm/intrinsifier.h ('k') | runtime/vm/token.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc (revision 27446)
+++ runtime/vm/parser.cc (working copy)
@@ -4808,7 +4808,7 @@
}
ConsumeToken();
String& prefix = String::Handle();
- if (is_import && IsLiteral("as")) {
+ if (is_import && (CurrentToken() == Token::kAS)) {
ConsumeToken();
prefix = ExpectIdentifier("prefix identifier expected")->raw();
}
@@ -7340,9 +7340,6 @@
(left_operand->AsPrimaryNode()->IsSuper())) {
ErrorMsg(left_operand->token_pos(), "illegal use of 'super'");
}
- if (IsLiteral("as")) { // Not a reserved word.
- token_kind_ = Token::kAS;
- }
int current_preced = Token::Precedence(CurrentToken());
while (current_preced >= min_preced) {
while (Token::Precedence(CurrentToken()) == current_preced) {
@@ -10363,18 +10360,18 @@
const int min_prec = Token::Precedence(Token::kOR);
const int max_prec = Token::Precedence(Token::kMUL);
while (((min_prec <= Token::Precedence(CurrentToken())) &&
- (Token::Precedence(CurrentToken()) <= max_prec)) ||
- IsLiteral("as")) {
- Token::Kind last_token = IsLiteral("as") ? Token::kAS : CurrentToken();
- ConsumeToken();
- if (last_token == Token::kIS) {
+ (Token::Precedence(CurrentToken()) <= max_prec))) {
+ if (CurrentToken() == Token::kIS) {
+ ConsumeToken();
if (CurrentToken() == Token::kNOT) {
ConsumeToken();
}
SkipType(false);
- } else if (last_token == Token::kAS) {
+ } else if (CurrentToken() == Token::kAS) {
+ ConsumeToken();
SkipType(false);
} else {
+ ConsumeToken();
SkipUnaryExpr();
}
}
« no previous file with comments | « runtime/vm/intrinsifier.h ('k') | runtime/vm/token.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698