Changeset 11527 in webkit for trunk/JavaScriptCore/kjs/interpreter.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/interpreter.h (modified) (13 diffs)

trunk/JavaScriptCore/kjs/interpreter.h

@@ -32 +32 @@
   class ContextImp;
   class InterpreterImp;
-  class RuntimeMethodImp;
+  class RuntimeMethod;
   class ScopeChain;
 
@@ -78 +78 @@
      * @return The execution context's variable object
      */
-    ObjectImp *variableObject() const;
+    JSObject *variableObject() const;
 
     /**
@@ -95 +95 @@
      * @return The execution context's "this" value
      */
-    ObjectImp *thisValue() const;
+    JSObject *thisValue() const;
 
     /**
@@ -152 +152 @@
      * @param global The object to use as the global object for this interpreter
      */
-    Interpreter(ObjectImp *global);
+    Interpreter(JSObject *global);
     /**
      * Creates a new interpreter. A global object will be created and
@@ -164 +164 @@
      * execution performed by this interpreter
      */
-    ObjectImp *globalObject() const;
+    JSObject *globalObject() const;
 
     void initGlobalObject();
@@ -204 +204 @@
      * @return A completion object representing the result of the execution.
      */
-    Completion evaluate(const UString &sourceURL, int startingLineNumber, const UString &code, ValueImp *thisV = NULL);
+    Completion evaluate(const UString &sourceURL, int startingLineNumber, const UString &code, JSValue *thisV = NULL);
 
         // Overload of evaluate to keep JavaScriptGlue both source and binary compatible.
-        Completion evaluate(const UString &code, ValueImp *thisV = NULL, const UString &sourceFilename = UString());
+        Completion evaluate(const UString &code, JSValue *thisV = NULL, const UString &sourceFilename = UString());
 
     /**
@@ -225 +225 @@
      * @return The builtin "Object" object
      */
-    ObjectImp *builtinObject() const;
+    JSObject *builtinObject() const;
 
     /**
      * Returns the builtin "Function" object.
      */
-    ObjectImp *builtinFunction() const;
+    JSObject *builtinFunction() const;
 
     /**
      * Returns the builtin "Array" object.
      */
-    ObjectImp *builtinArray() const;
+    JSObject *builtinArray() const;
 
     /**
      * Returns the builtin "Boolean" object.
      */
-    ObjectImp *builtinBoolean() const;
+    JSObject *builtinBoolean() const;
 
     /**
      * Returns the builtin "String" object.
      */
-    ObjectImp *builtinString() const;
+    JSObject *builtinString() const;
 
     /**
      * Returns the builtin "Number" object.
      */
-    ObjectImp *builtinNumber() const;
+    JSObject *builtinNumber() const;
 
     /**
      * Returns the builtin "Date" object.
      */
-    ObjectImp *builtinDate() const;
+    JSObject *builtinDate() const;
 
     /**
      * Returns the builtin "RegExp" object.
      */
-    ObjectImp *builtinRegExp() const;
+    JSObject *builtinRegExp() const;
 
     /**
      * Returns the builtin "Error" object.
      */
-    ObjectImp *builtinError() const;
+    JSObject *builtinError() const;
 
     /**
      * Returns the builtin "Object.prototype" object.
      */
-    ObjectImp *builtinObjectPrototype() const;
+    JSObject *builtinObjectPrototype() const;
 
     /**
      * Returns the builtin "Function.prototype" object.
      */
-    ObjectImp *builtinFunctionPrototype() const;
+    JSObject *builtinFunctionPrototype() const;
 
     /**
      * Returns the builtin "Array.prototype" object.
      */
-    ObjectImp *builtinArrayPrototype() const;
+    JSObject *builtinArrayPrototype() const;
 
     /**
      * Returns the builtin "Boolean.prototype" object.
      */
-    ObjectImp *builtinBooleanPrototype() const;
+    JSObject *builtinBooleanPrototype() const;
 
     /**
      * Returns the builtin "String.prototype" object.
      */
-    ObjectImp *builtinStringPrototype() const;
+    JSObject *builtinStringPrototype() const;
 
     /**
      * Returns the builtin "Number.prototype" object.
      */
-    ObjectImp *builtinNumberPrototype() const;
+    JSObject *builtinNumberPrototype() const;
 
     /**
      * Returns the builtin "Date.prototype" object.
      */
-    ObjectImp *builtinDatePrototype() const;
+    JSObject *builtinDatePrototype() const;
 
     /**
      * Returns the builtin "RegExp.prototype" object.
      */
-    ObjectImp *builtinRegExpPrototype() const;
+    JSObject *builtinRegExpPrototype() const;
 
     /**
      * Returns the builtin "Error.prototype" object.
      */
-    ObjectImp *builtinErrorPrototype() const;
+    JSObject *builtinErrorPrototype() const;
 
     /**
      * The initial value of "Error" global property
      */
-    ObjectImp *builtinEvalError() const;
-    ObjectImp *builtinRangeError() const;
-    ObjectImp *builtinReferenceError() const;
-    ObjectImp *builtinSyntaxError() const;
-    ObjectImp *builtinTypeError() const;
-    ObjectImp *builtinURIError() const;
-
-    ObjectImp *builtinEvalErrorPrototype() const;
-    ObjectImp *builtinRangeErrorPrototype() const;
-    ObjectImp *builtinReferenceErrorPrototype() const;
-    ObjectImp *builtinSyntaxErrorPrototype() const;
-    ObjectImp *builtinTypeErrorPrototype() const;
-    ObjectImp *builtinURIErrorPrototype() const;
+    JSObject *builtinEvalError() const;
+    JSObject *builtinRangeError() const;
+    JSObject *builtinReferenceError() const;
+    JSObject *builtinSyntaxError() const;
+    JSObject *builtinTypeError() const;
+    JSObject *builtinURIError() const;
+
+    JSObject *builtinEvalErrorPrototype() const;
+    JSObject *builtinRangeErrorPrototype() const;
+    JSObject *builtinReferenceErrorPrototype() const;
+    JSObject *builtinSyntaxErrorPrototype() const;
+    JSObject *builtinTypeErrorPrototype() const;
+    JSObject *builtinURIErrorPrototype() const;
 
     enum CompatMode { NativeMode, IECompat, NetscapeCompat };
@@ -376 +376 @@
      * security checks.
      */
-    virtual bool isGlobalObject(ValueImp *v) { return false; }
+    virtual bool isGlobalObject(JSValue *v) { return false; }
     
     /** 
@@ -385 +385 @@
      * override of this method is currently in WebCore.
      */
-    virtual Interpreter *interpreterForGlobalObject (const ValueImp *imp) { return 0; }
+    virtual Interpreter *interpreterForGlobalObject (const JSValue *imp) { return 0; }
     
     /**
@@ -395 +395 @@
     virtual bool isSafeScript (const Interpreter *target) { return true; }
     
-    virtual void *createLanguageInstanceForValue (ExecState *exec, int language, ObjectImp *value, const Bindings::RootObject *origin, const Bindings::RootObject *current);
+    virtual void *createLanguageInstanceForValue (ExecState *exec, int language, JSObject *value, const Bindings::RootObject *origin, const Bindings::RootObject *current);
 #endif
 
@@ -436 +436 @@
     friend class FunctionImp;
 #if APPLE_CHANGES
-    friend class RuntimeMethodImp;
+    friend class RuntimeMethod;
 #endif
 
@@ -466 +466 @@
     Context context() const { return _context; }
 
-    void setException(ValueImp *e) { _exception = e; }
+    void setException(JSValue *e) { _exception = e; }
     void clearException() { _exception = NULL; }
-    ValueImp *exception() const { return _exception; }
+    JSValue *exception() const { return _exception; }
     bool hadException() const { return _exception; }
 
@@ -476 +476 @@
     Interpreter *_interpreter;
     ContextImp *_context;
-    ValueImp *_exception;
+    JSValue *_exception;
   };