JavaScriptCore-7600.1.4.16.1.tar.gz

[apple/javascriptcore.git] / runtime / CommonIdentifiers.cpp

diff --git a/runtime/CommonIdentifiers.cpp b/runtime/CommonIdentifiers.cpp
index fe0a830b3f02c405a23dbc0622d2cb84b5f66005..56df3450287ff999a38fcf4cb7150e861a5643e8 100644 (file)
--- a/runtime/CommonIdentifiers.cpp
+++ b/runtime/CommonIdentifiers.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2003, 2007 Apple Inc. All rights reserved.
+ *  Copyright (C) 2003, 2007, 2009, 2012 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -21,18 +21,42 @@
 #include "config.h"
 #include "CommonIdentifiers.h"
 
-namespace JSC {
+#include "BuiltinNames.h"
+#include "JSCBuiltins.h"
+#include "PrivateName.h"
 
-const char* const nullCString = 0;
+namespace JSC {
 
-#define INITIALIZE_PROPERTY_NAME(name) , name(globalData, #name)
+#define INITIALIZE_PROPERTY_NAME(name) , name(vm, #name)
+#define INITIALIZE_KEYWORD(name) , name##Keyword(vm, #name)
+#define INITIALIZE_PRIVATE_NAME(name) , name##PrivateName(m_builtinNames->name##PrivateName())
 
-CommonIdentifiers::CommonIdentifiers(JSGlobalData* globalData)
-    : nullIdentifier(globalData, nullCString)
-    , underscoreProto(globalData, "__proto__")
-    , thisIdentifier(globalData, "this")
+CommonIdentifiers::CommonIdentifiers(VM* vm)
+    : nullIdentifier()
+    , emptyIdentifier(Identifier::EmptyIdentifier)
+    , underscoreProto(vm, "__proto__")
+    , thisIdentifier(vm, "this")
+    , useStrictIdentifier(vm, "use strict")
+    , m_builtinNames(new BuiltinNames(vm, this))
+    JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(INITIALIZE_KEYWORD)
     JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PROPERTY_NAME)
+    JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PRIVATE_NAME)
+{
+}
+
+CommonIdentifiers::~CommonIdentifiers()
 {
 }
 
+const Identifier* CommonIdentifiers::getPrivateName(const Identifier& ident) const
+{
+    return m_builtinNames->getPrivateName(ident);
+}
+    
+Identifier CommonIdentifiers::getPublicName(const Identifier& ident) const
+{
+    return m_builtinNames->getPublicName(ident);
+}
+
+
 } // namespace JSC