Changeset 11527 in webkit for trunk/JavaScriptCore/kjs/context.h

Timestamp:

Dec 10, 2005, 6:06:17 PM (19 years ago)

Author:

darin

Message:

JavaScriptCore:

Rubber stamped by Maciej.

• did long-promised KJS renaming:

ValueImp -> JSValue
ObjectImp -> JSObject
AllocatedValueImp -> JSCell

A renaming to get a class out of the way

KJS::Bindings::JSObject -> JavaJSObject

and some other "imp-reduction" renaming

*InstanceImp -> *Instance
*ProtoFuncImp -> *ProtoFunc
*PrototypeImp -> *Prototype
ArgumentsImp -> Arguments
RuntimeArrayImp -> RuntimeArray
RuntimeMethodImp -> RuntimeMethod

• most files and functions

WebCore:

Rubber stamped by Maciej.

• updated for KJS class renaming

• many files and functions

File:

• trunk/JavaScriptCore/kjs/context.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/context.h

@@ -36 +36 @@
   class ContextImp {
   public:
-    ContextImp(ObjectImp *glob, InterpreterImp *, ObjectImp *thisV, CodeType type = GlobalCode,
+    ContextImp(JSObject *glob, InterpreterImp *, JSObject *thisV, CodeType type = GlobalCode,
                ContextImp *callingContext = 0, FunctionImp *functiion = 0, const List *args = 0);
     ~ContextImp();
@@ -42 +42 @@
     const ScopeChain &scopeChain() const { return scope; }
     CodeType codeType() { return m_codeType; }
-    ObjectImp *variableObject() const { return variable; }
-    void setVariableObject(ObjectImp *v) { variable = v; }
-    ObjectImp *thisValue() const { return thisVal; }
+    JSObject *variableObject() const { return variable; }
+    void setVariableObject(JSObject *v) { variable = v; }
+    JSObject *thisValue() const { return thisVal; }
     ContextImp *callingContext() { return _callingContext; }
-    ObjectImp *activationObject() { return activation; }
+    JSObject *activationObject() { return activation; }
     FunctionImp *function() const { return _function; }
     const List *arguments() const { return _arguments; }
 
-    void pushScope(ObjectImp *s) { scope.push(s); }
+    void pushScope(JSObject *s) { scope.push(s); }
     void popScope() { scope.pop(); }
     LabelStack *seenLabels() { return &ls; }
@@ -64 +64 @@
     // there is no need to protect various pointers from conservative
     // GC since they will be caught by the conservative sweep anyway!
-    ObjectImp *activation;
+    JSObject *activation;
     
     ScopeChain scope;
-    ObjectImp *variable;
-    ObjectImp *thisVal;
+    JSObject *variable;
+    JSObject *thisVal;
 
     LabelStack ls;