Eliminate some duplicate symbols in the predefined symbols list (the keyword list already has these…

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"
 
 namespace dart {
 
 // Forward declarations.
 class Isolate;
 class ObjectPointerVisitor;
 
 // One-character symbols are added implicitly.
 #define PREDEFINED_SYMBOLS_LIST(V)                                             \
-  V(Empty, "")                                                                 \
   V(EqualOperator, "==")                                                       \
   V(GreaterEqualOperator, ">=")                                                \
   V(LessEqualOperator, "<=")                                                   \
   V(LeftShiftOperator, "<<")                                                   \
   V(RightShiftOperator, ">>")                                                  \
   V(TruncDivOperator, "~/")                                                    \
   V(UnaryMinus, "unary-")                                                      \
   V(Identical, "identical")                                                    \
   V(Length, "length")                                                          \
   V(_setLength, "_setLength")                                                  \
   V(IndexToken, "[]")                                                          \
   V(AssignIndexToken, "[]=")                                                   \
   V(TopLevel, "::")                                                            \
   V(DefaultLabel, ":L")                                                        \
-  V(This, "this")                                                              \
   V(Other, "other")                                                            \
-  V(Super, "super")                                                            \
   V(Call, "call")                                                              \
   V(Current, "current")                                                        \
   V(MoveNext, "moveNext")                                                      \
   V(IsYieldEach, "isYieldEach")                                                \
   V(Value, "value")                                                            \
   V(_EnumHelper, "_EnumHelper")                                                \
   V(_SyncIterable, "_SyncIterable")                                            \
   V(_SyncIterableConstructor, "_SyncIterable.")                                \
   V(_SyncIterator, "_SyncIterator")                                            \
   V(IteratorParameter, ":iterator")                                            \
@@ skipping 38 matching lines @@
   V(CurrentContextVar, ":current_context_var")                                 \
   V(SavedTryContextVar, ":saved_try_context_var")                              \
   V(ExceptionParameter, ":exception")                                          \
   V(StackTraceParameter, ":stack_trace")                                       \
   V(ExceptionVar, ":exception_var")                                            \
   V(StackTraceVar, ":stack_trace_var")                                         \
   V(SavedExceptionVar, ":saved_exception_var")                                 \
   V(SavedStackTraceVar, ":saved_stack_trace_var")                              \
   V(ListLiteralElement, "list literal element")                                \
   V(ForInIter, ":for-in-iter")                                                 \
-  V(Library, "library")                                                        \
   V(LoadLibrary, "loadLibrary")                                                \
   V(_LibraryPrefix, "_LibraryPrefix")                                          \
   V(On, "on")                                                                  \
   V(Of, "of")                                                                  \
   V(Deferred, "deferred")                                                      \
   V(Show, "show")                                                              \
   V(Hide, "hide")                                                              \
   V(Async, "async")                                                            \
   V(Sync, "sync")                                                              \
   V(YieldKw, "yield")                                                          \
@@ skipping 16 matching lines @@
   V(CompleterComplete, "complete")                                             \
   V(CompleterCompleteError, "completeError")                                   \
   V(CompleterConstructor, "Completer.")                                        \
   V(CompleterFuture, "future")                                                 \
   V(StreamIterator, "StreamIterator")                                          \
   V(StreamIteratorConstructor, "StreamIterator.")                              \
   V(Native, "native")                                                          \
   V(Class, "Class")                                                            \
   V(Null, "Null")                                                              \
   V(Dynamic, "dynamic")                                                        \
-  V(Void, "void")                                                              \
   V(UnresolvedClass, "UnresolvedClass")                                        \
   V(Type, "_Type")                                                             \
   V(TypeRef, "_TypeRef")                                                       \
   V(TypeParameter, "_TypeParameter")                                           \
   V(BoundedType, "_BoundedType")                                               \
   V(MixinAppType, "_MixinAppType")                                             \
   V(TypeArguments, "TypeArguments")                                            \
   V(Patch, "patch")                                                            \
   V(PatchClass, "PatchClass")                                                  \
   V(Function, "Function")                                                      \
@@ skipping 26 matching lines @@
   V(LanguageError, "LanguageError")                                            \
   V(UnhandledException, "UnhandledException")                                  \
   V(UnwindError, "UnwindError")                                                \
   V(IntegerImplementation, "_IntegerImplementation")                           \
   V(Number, "num")                                                             \
   V(_Smi, "_Smi")                                                              \
   V(_Mint, "_Mint")                                                            \
   V(_Bigint, "_Bigint")                                                        \
   V(_Double, "_Double")                                                        \
   V(Bool, "bool")                                                              \
-  V(True, "true")                                                              \
-  V(False, "false")                                                            \
   V(_List, "_List")                                                            \
   V(_ListFactory, "_List.")                                                    \
   V(_GrowableList, "_GrowableList")                                            \
   V(_GrowableListFactory, "_GrowableList.")                                    \
   V(_GrowableListWithData, "_GrowableList.withData")                           \
   V(_ImmutableList, "_ImmutableList")                                          \
   V(_LinkedHashMap, "_InternalLinkedHashMap")                                  \
   V(_String, "String")                                                         \
   V(OneByteString, "_OneByteString")                                           \
   V(TwoByteString, "_TwoByteString")                                           \
@@ skipping 314 matching lines @@
   static const String& Percent() {
     return *(symbol_handles_[kNullCharId + '%']);
   }
   static const String& Caret() {
     return *(symbol_handles_[kNullCharId + '^']);
   }
   static const String& Tilde() {
     return *(symbol_handles_[kNullCharId + '~']);
   }
 
+  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.
 #define DEFINE_SYMBOL_HANDLE_ACCESSOR(symbol, literal)                         \
   static const String& symbol() { return *(symbol_handles_[k##symbol##Id]); }
 PREDEFINED_SYMBOLS_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.
@@ skipping 75 matching lines @@
   friend class SnapshotReader;
   friend class SnapshotWriter;
   friend class ApiMessageReader;
 
   DISALLOW_COPY_AND_ASSIGN(Symbols);
 };
 
 }  // namespace dart
 
 #endif  // VM_SYMBOLS_H_