Changeset 154434 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

Timestamp:

Aug 21, 2013, 6:04:37 PM (12 years ago)

Author:

[email protected]

Message:

Clarify var/const/function declaration
​https://bugs.webkit.org/show_bug.cgi?id=120144

Reviewed by Sam Weinig.

Add methods to JSGlobalObject to declare vars, consts, and functions.

• runtime/Executable.cpp:

(JSC::ProgramExecutable::initializeGlobalProperties):

• runtime/Executable.h:
  • Moved declaration code to JSGlobalObject
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::addGlobalVar):

• internal implementation of addVar, addConst, addFunction

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::addVar):
(JSC::JSGlobalObject::addConst):
(JSC::JSGlobalObject::addFunction):

• Added methods to declare vars, consts, and functions

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -240 +240 @@
     }
 
+    enum ConstantMode { IsConstant, IsVariable };
+    enum FunctionMode { IsFunctionToSpecialize, NotFunctionOrNotSpecializable };
+    int addGlobalVar(const Identifier&, ConstantMode, FunctionMode);
+
 public:
     JS_EXPORT_PRIVATE ~JSGlobalObject();
@@ -261 +265 @@
     // lookups prior to initializing the properties
     bool symbolTableHasProperty(PropertyName);
+
+    void addVar(ExecState* exec, const Identifier& propertyName)
+    {
+        if (!hasProperty(exec, propertyName))
+            addGlobalVar(propertyName, IsVariable, NotFunctionOrNotSpecializable);
+    }
+    void addConst(ExecState* exec, const Identifier& propertyName)
+    {
+        if (!hasProperty(exec, propertyName))
+            addGlobalVar(propertyName, IsConstant, NotFunctionOrNotSpecializable);
+    }
+    void addFunction(ExecState* exec, const Identifier& propertyName, JSValue value)
+    {
+        bool propertyDidExist = removeDirect(exec->vm(), propertyName); // Newly declared functions overwrite existing properties.
+        int index = addGlobalVar(propertyName, IsVariable, !propertyDidExist ? IsFunctionToSpecialize : NotFunctionOrNotSpecializable);
+        registerAt(index).set(exec->vm(), this, value);
+    }
 
     // The following accessors return pristine values, even if a script