Changeset 9795 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jul 15, 2005, 9:58:57 AM (20 years ago)

Author:

ggaren

Message:

-rolled in KDE fixes for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3601
Error instance type info

Reviewed by mjs.

• kjs/error_object.cpp:
• Created ErrorInstanceImp class for Error() objects.
• Changed parent object for Native Errors to "Function" (matches ECMA spec). (ErrorInstanceImp::ErrorInstanceImp): (ErrorProtoFuncImp::call): (ErrorObjectImp::construct): (NativeErrorImp::construct):

• kjs/error_object.h: (KJS::ErrorInstanceImp::classInfo):
• kjs/object.h: made comment more informative about ClassInfo

• tests/mozilla/expected.html:

Location:

trunk/JavaScriptCore/kjs

Files:

• error_object.cpp (modified) (5 diffs)
• error_object.h (modified) (2 diffs)
• object.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/error_object.cpp

@@ -30 +30 @@
 
 using namespace KJS;
+
+// ------------------------------ ErrorInstanceImp ----------------------------
+
+const ClassInfo ErrorInstanceImp::info = {"Error", 0, 0, 0};
+
+ErrorInstanceImp::ErrorInstanceImp(ObjectImp *proto)
+: ObjectImp(proto)
+{
+}
 
 // ------------------------------ ErrorPrototypeImp ----------------------------
@@ -65 +74 @@
 {
   // toString()
-  UString s;
+  UString s = "Error";
 
   Value v = thisObj.get(exec, namePropertyName);
   if (v.type() != UndefinedType) {
-    s += v.toString(exec);
+    s = v.toString(exec);
   }
 
   v = thisObj.get(exec, messagePropertyName);
   if (v.type() != UndefinedType) {
-    s += " : " + v.toString(exec); // Mozilla compatible format
+    s += ": " + v.toString(exec); // Mozilla compatible format
   }
 
@@ -101 +110 @@
 {
   Object proto = Object::dynamicCast(exec->lexicalInterpreter()->builtinErrorPrototype());
-  ObjectImp *imp = new ObjectImp(proto);
+  ObjectImp *imp = new ErrorInstanceImp(proto.imp());
   Object obj(imp);
 
@@ -137 +146 @@
 // ------------------------------ NativeErrorImp -------------------------------
 
-const ClassInfo NativeErrorImp::info = {"Error", &InternalFunctionImp::info, 0, 0};
+const ClassInfo NativeErrorImp::info = {"Function", &InternalFunctionImp::info, 0, 0};
 
 NativeErrorImp::NativeErrorImp(ExecState *exec, FunctionPrototypeImp *funcProto,
@@ -157 +166 @@
 Object NativeErrorImp::construct(ExecState *exec, const List &args)
 {
-  ObjectImp *imp = new ObjectImp(proto);
+  ObjectImp *imp = new ErrorInstanceImp(proto);
   Object obj(imp);
   if (args[0].type() != UndefinedType)

trunk/JavaScriptCore/kjs/error_object.h

@@ -28 +28 @@
 namespace KJS {
 
+  class ErrorInstanceImp : public ObjectImp {
+  public:
+    ErrorInstanceImp(ObjectImp *proto);
+    
+    virtual const ClassInfo *classInfo() const { return &info; }
+    static const ClassInfo info;
+  };
+  
   class ErrorPrototypeImp : public ObjectImp {
   public:
@@ -53 +61 @@
     virtual Value call(ExecState *exec, Object &thisObj, const List &args);
   };
-
-
-
-
 
   class NativeErrorPrototypeImp : public ObjectImp {

trunk/JavaScriptCore/kjs/object.h

@@ -437 +437 @@
      *
      * \code
-     *   const ClassInfo BarImp::info = {0, 0, 0}; // no parent class
-     *   const ClassInfo FooImp::info = {&BarImp::info, 0, 0};
+     *   const ClassInfo BarImp::info = {"Bar", 0, 0, 0}; // no parent class
+     *   const ClassInfo FooImp::info = {"Foo", &BarImp::info, 0, 0};
      * \endcode
      *