Proper handling of built-in identifiers

runtime/vm/token.h

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_TOKEN_H_
 #define VM_TOKEN_H_
 
 #include "vm/assert.h"
 
 namespace dart {
 
@@ skipping 115 matching lines @@
   TOK(kLIBRARY, "#library", 0, kNoAttribute)                                   \
   TOK(kIMPORT, "#import", 0, kNoAttribute)                                     \
   TOK(kSOURCE, "#source", 0, kNoAttribute)                                     \
 
 // List of keywords. The list must be alphabetically ordered. The
 // keyword recognition code depends on the ordering.
 // If you add a keyword at the beginning or end of this list, make sure
 // to update kFirstKeyword and kLastKeyword below.
 #define DART_KEYWORD_LIST(KW)                                                  \
   KW(kABSTRACT, "abstract", 0, kPseudoKeyword) /* == kFirstKeyword */          \
-  KW(kASSERT, "assert", 0, kKeyword)                                           \
+  KW(kASSERT, "assert", 0, kPseudoKeyword)                                     \
   KW(kBREAK, "break", 0, kKeyword)                                             \
   KW(kCASE, "case", 0, kKeyword)                                               \
   KW(kCATCH, "catch", 0, kKeyword)                                             \
   KW(kCLASS, "class", 0, kKeyword)                                             \
   KW(kCONST, "const", 0, kKeyword)                                             \
   KW(kCONTINUE, "continue", 0, kKeyword)                                       \
   KW(kDEFAULT, "default", 0, kKeyword)                                         \
   KW(kDO, "do", 0, kKeyword)                                                   \
   KW(kELSE, "else", 0, kKeyword)                                               \
   KW(kEXTENDS, "extends", 0, kKeyword)                                         \
@@ skipping 14 matching lines @@
   KW(kOPERATOR, "operator", 0, kPseudoKeyword)                                 \
   KW(kRETURN, "return", 0, kKeyword)                                           \
   KW(kSET, "set", 0, kPseudoKeyword)                                           \
   KW(kSTATIC, "static", 0, kPseudoKeyword)                                     \
   KW(kSUPER, "super", 0, kKeyword)                                             \
   KW(kSWITCH, "switch", 0, kKeyword)                                           \
   KW(kTHIS, "this", 0, kKeyword)                                               \
   KW(kTHROW, "throw", 0, kKeyword)                                             \
   KW(kTRUE, "true", 0, kKeyword)                                               \
   KW(kTRY, "try", 0, kKeyword)                                                 \
-  KW(kTYPEDEF, "typedef", 0, kKeyword)                                         \
+  KW(kTYPEDEF, "typedef", 0, kPseudoKeyword)                                   \
   KW(kVAR, "var", 0, kKeyword)                                                 \
   KW(kVOID, "void", 0, kKeyword)                                               \
   KW(kWHILE, "while", 0, kKeyword) /* == kLastKeyword */
 
 
 class Token {
  public:
 #define T(t, s, p, a) t,
   enum Kind {
     DART_TOKEN_LIST(T)
@@ skipping 25 matching lines @@
   }
 
   static bool IsInstanceofOperator(Kind tok) {
     return (tok == kIS) || (tok == kISNOT);
   }
 
   static bool IsPseudoKeyword(Kind tok) {
     return (Attributes(tok) & kPseudoKeyword) != 0;
   }
 
+  static bool IsIdentifier(Kind tok) {
+    return (tok == kIDENT) || IsPseudoKeyword(tok);
+  }
+
   static const char* Name(Kind tok) {
     ASSERT(tok < kNumTokens);
     return name_[tok];
   }
 
   static const char* Str(Kind tok) {
     ASSERT(tok < kNumTokens);
     return tok_str_[tok];
   }
 
@@ skipping 22 matching lines @@
   static const char* name_[kNumTokens];
   static const char* tok_str_[kNumTokens];
   static const uint8_t precedence_[kNumTokens];
   static const Attribute attributes_[kNumTokens];
 };
 
 
 }  // namespace dart
 
 #endif  // VM_TOKEN_H_