Changes to shrink the token stream representation from two words to one word.

vm/object_store.cc

 // Copyright (c) 2011, 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/object_store.h"
 
 #include "vm/exceptions.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
@@ skipping 36 matching lines @@
     core_library_(Library::null()),
     core_impl_library_(Library::null()),
     native_wrappers_library_(Library::null()),
     root_library_(Library::null()),
     registered_libraries_(Library::null()),
     pending_classes_(Array::null()),
     sticky_error_(Error::null()),
     empty_context_(Context::null()),
     stack_overflow_(Instance::null()),
     out_of_memory_(Instance::null()),
+    literal_tokens_canonical_list_(Array::null()),
+    keyword_symbols_(Array::null()),
     preallocate_objects_called_(false) {
 }
 
 
 ObjectStore::~ObjectStore() {
 }
 
 
 void ObjectStore::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   ASSERT(visitor != NULL);
@@ skipping 30 matching lines @@
     return false;
   }
   exception ^= result.raw();
   set_out_of_memory(exception);
 
   preallocate_objects_called_ = true;
   return true;
 }
 
 
+RawObject* ObjectStore::GetKeywordSymbol(int index) {
+  Array& keywords = Array::Handle(keyword_symbols());
+  if (keywords.IsNull()) {

[hausner, 2012/02/25 00:41:57]

Could you move the creation of this table to the isolate initialization code?
That way you save a null check on this somewhat critical path.

It would also be nice if the keyword array were accessible to the scanner so it
can cache a handle to the array locally, saving a handle creation at each table
access.

[siva, 2012/02/28 19:57:31]

Done.

+    // Set up the keywords symbol array so that we can access it while scanning.
+    keywords = Array::New(Token::numKeywords, Heap::kOld);
+    ASSERT(!keywords.IsError() && !keywords.IsNull());
+    set_keyword_symbols(keywords);
+  }
+  return keywords.At(index);
+}
+
+
+void ObjectStore::SetKeywordSymbol(int index, const String& symbol) {
+  Array& keywords = Array::Handle(keyword_symbols());
+  ASSERT(!keywords.IsNull());
+  keywords.SetAt(index, symbol);
+}
+
+
 RawClass* ObjectStore::GetClass(int index) {
   switch (index) {
     case kObjectClass: return object_class_;
     case kSmiClass: return smi_class_;
     case kMintClass: return mint_class_;
     case kBigintClass: return bigint_class_;
     case kDoubleClass: return double_class_;
     case kOneByteStringClass: return one_byte_string_class_;
     case kTwoByteStringClass: return two_byte_string_class_;
     case kFourByteStringClass: return four_byte_string_class_;
@@ skipping 102 matching lines @@
     return kStringInterface;
   } else if (raw_type == list_interface()) {
     return kListInterface;
   } else if (raw_type == byte_array_interface()) {
     return kByteArrayInterface;
   }
   return kInvalidIndex;
 }
 
 }  // namespace dart