Add Dart keyword symbols to the VM isolate

runtime/vm/scanner.cc

 // 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.
 
 #include "vm/scanner.h"
 
 #include "platform/assert.h"
+#include "vm/dart.h"
 #include "vm/flags.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/symbols.h"
 #include "vm/thread.h"
 #include "vm/token.h"
 #include "vm/unicode.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_tokens, false, "Print scanned tokens.");
 
-void Scanner::InitKeywordTable() {
-  ObjectStore* object_store = Isolate::Current()->object_store();
-  keyword_symbol_table_ = object_store->keyword_symbols();
-  if (keyword_symbol_table_.IsNull()) {
-    object_store->InitKeywordTable();
-    keyword_symbol_table_ = object_store->keyword_symbols();
-    ASSERT(!keyword_symbol_table_.IsNull());
-    String& symbol = String::Handle();
-    for (int i = 0; i < Token::numKeywords; i++) {
-      Token::Kind token = static_cast<Token::Kind>(Token::kFirstKeyword + i);
-      symbol = Symbols::New(Token::Str(token));
-      keyword_symbol_table_.SetAt(i, symbol);
-    }
-  }
-  for (int i = 0; i < Token::numKeywords; i++) {
-    Token::Kind token = static_cast<Token::Kind>(Token::kFirstKeyword + i);
-    keywords_[i].kind = token;
-    keywords_[i].keyword_chars = Token::Str(token);
-    keywords_[i].keyword_len = strlen(Token::Str(token));
-    keywords_[i].keyword_symbol = NULL;
-  }
-}
+
+Scanner::KeywordTable Scanner::keywords_[Token::numKeywords];
 
 
 void Scanner::Reset() {
   // Non-changing newline properties.
   newline_token_.kind = Token::kNEWLINE;
   newline_token_.literal = NULL;
   // We don't preserve the column information.
   newline_token_.position.column = 0;
 
   // Non-changing empty string token properties.
@@ skipping 17 matching lines @@
   c0_pos_.line = 1;
   c0_pos_.column = 0;
   ReadChar();
 }
 
 
 Scanner::Scanner(const String& src, const String& private_key)
     : source_(src),
       source_length_(src.Length()),
       saved_context_(NULL),
-      private_key_(String::ZoneHandle(private_key.raw())),
-      keyword_symbol_table_(Array::ZoneHandle()) {
+      private_key_(String::ZoneHandle(private_key.raw())) {
   Reset();
-  InitKeywordTable();
 }
 
 Scanner::~Scanner() {
   while (saved_context_ != NULL) {
     ScanContext* ctx = saved_context_;
     saved_context_ = ctx->next;
     delete ctx;
   }
 }
 
@@ skipping 221 matching lines @@
   while (i < Token::numKeywords &&
          keywords_[i].keyword_chars[0] <= ident_char0) {
     if (keywords_[i].keyword_len == ident_length) {
       const char* keyword = keywords_[i].keyword_chars;
       int char_pos = 0;
       while ((char_pos < ident_length) &&
              (keyword[char_pos] == source_.CharAt(ident_pos + char_pos))) {
         char_pos++;
       }
       if (char_pos == ident_length) {
-        if (keywords_[i].keyword_symbol == NULL) {
-          String& symbol = String::ZoneHandle();
-          symbol ^= keyword_symbol_table_.At(i);
-          ASSERT(!symbol.IsNull());
-          keywords_[i].keyword_symbol = &symbol;
-        }
         current_token_.literal = keywords_[i].keyword_symbol;
         current_token_.kind = keywords_[i].kind;
         return;
       }
     }
     i++;
   }
 
   // We did not read a keyword.
   current_token_.kind = Token::kIDENT;
@@ skipping 627 matching lines @@
   }
   char private_key[32];
   OS::SNPrint(private_key, sizeof(private_key),
               "%c%#" Px "", kPrivateKeySeparator, key_value);
   const String& result = String::Handle(String::New(private_key, Heap::kOld));
   return result.raw();
 }
 
 
 void Scanner::InitOnce() {
+  ASSERT(Isolate::Current() == Dart::vm_isolate());
+  for (int i = 0; i < Token::numKeywords; i++) {
+    Token::Kind token = static_cast<Token::Kind>(Token::kFirstKeyword + i);
+    keywords_[i].kind = token;
+    keywords_[i].keyword_chars = Token::Str(token);
+    keywords_[i].keyword_len = strlen(Token::Str(token));
+    keywords_[i].keyword_symbol = &Symbols::Keyword(token);
+  }
 }
 
 }  // namespace dart