Unify processing of Keywords and predefined symbols in the same loop and add accessors for keyword …

runtime/vm/symbols.h

 // 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_SYMBOLS_H_
 #define VM_SYMBOLS_H_
 
 #include "vm/object.h"
 #include "vm/snapshot_ids.h"
 
@@ skipping 378 matching lines @@
 class Symbols : public AllStatic {
  public:
   enum { kMaxOneCharCodeSymbol = 0xFF };
 
   // List of strings that are pre created in the vm isolate.
   enum SymbolId {
     kIllegal = 0,
 
 #define DEFINE_SYMBOL_INDEX(symbol, literal)                                   \
     k##symbol##Id,
-PREDEFINED_SYMBOLS_LIST(DEFINE_SYMBOL_INDEX)
+    PREDEFINED_SYMBOLS_LIST(DEFINE_SYMBOL_INDEX)
 #undef DEFINE_SYMBOL_INDEX
 
     kKwTableStart,  // First keyword at kKwTableStart + 1.
 
-#define DEFINE_KEYWORD_SYMBOL_INDEX(token, chars, ignore1, ignore2)            \
-    token##Id,
+#define DEFINE_KEYWORD_SYMBOL_INDEX(t, s, p, a)                            \
+    t##Id,
     DART_KEYWORD_LIST(DEFINE_KEYWORD_SYMBOL_INDEX)
 #undef DEFINE_KEYWORD_SYMBOL_INDEX
 
     kNullCharId,  // One char code symbol starts here and takes up 256 entries.
     kMaxPredefinedId = kNullCharId + kMaxOneCharCodeSymbol + 1,
   };
 
   // Number of one character symbols being predefined in the predefined_ array.
   static const int kNumberOfOneCharCodeSymbols =
       (kMaxPredefinedId - kNullCharId);
@@ skipping 91 matching lines @@
   }
 
   static const String& Empty() { return *(symbol_handles_[kKwTableStart]); }
   static const String& False() { return *(symbol_handles_[kFALSEId]); }
   static const String& Library() { return *(symbol_handles_[kLIBRARYId]); }
   static const String& Super() { return *(symbol_handles_[kSUPERId]); }
   static const String& This() { return *(symbol_handles_[kTHISId]); }
   static const String& True() { return *(symbol_handles_[kTRUEId]); }
   static const String& Void() { return *(symbol_handles_[kVOIDId]); }
 
-  // Access methods for symbol handles stored in the vm isolate.
+  // Access methods for symbol handles stored in the vm isolate for predefined
+  // symbols.
 #define DEFINE_SYMBOL_HANDLE_ACCESSOR(symbol, literal)                         \
   static const String& symbol() { return *(symbol_handles_[k##symbol##Id]); }
-PREDEFINED_SYMBOLS_LIST(DEFINE_SYMBOL_HANDLE_ACCESSOR)
+  PREDEFINED_SYMBOLS_LIST(DEFINE_SYMBOL_HANDLE_ACCESSOR)
+#undef DEFINE_SYMBOL_HANDLE_ACCESSOR
+
+  // Access methods for symbol handles stored in the vm isolate for keywords.
+#define DEFINE_SYMBOL_HANDLE_ACCESSOR(t, s, p, a)                              \
+  static const String& t() { return *(symbol_handles_[t##Id]); }
+  DART_KEYWORD_LIST(DEFINE_SYMBOL_HANDLE_ACCESSOR)
 #undef DEFINE_SYMBOL_HANDLE_ACCESSOR
 
   // Get symbol for scanner keyword.
   static const String& Keyword(Token::Kind keyword);
 
   // Initialize frequently used symbols in the vm isolate.
   static void InitOnce(Isolate* isolate);
 
   // Initialize and setup a symbol table for the isolate.
   static void SetupSymbolTable(Isolate* isolate);
@@ skipping 71 matching lines @@
   friend class SnapshotReader;
   friend class SnapshotWriter;
   friend class ApiMessageReader;
 
   DISALLOW_COPY_AND_ASSIGN(Symbols);
 };
 
 }  // namespace dart
 
 #endif  // VM_SYMBOLS_H_