Changeset 3009 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 11, 2002, 7:59:24 PM (22 years ago)

Author:

mjs

Message:

Reviewed by Don.

• Add kjsprint global function in Development build for ease of debugging.
• Print uncaught JavaScript exceptions to the console in Development.
• Improve wording of exception error messages.

• kjs/function.cpp: (GlobalFuncImp::call):
• kjs/function.h:
• kjs/internal.cpp: (InterpreterImp::initGlobalObject):
• kjs/interpreter.cpp: (Interpreter::evaluate):
• kjs/nodes.cpp: (NewExprNode::evaluate): (FunctionCallNode::evaluate): (RelationalNode::evaluate):

Location:

trunk/JavaScriptCore/kjs

Files:

• function.cpp (modified) (1 diff)
• function.h (modified) (1 diff)
• internal.cpp (modified) (1 diff)
• interpreter.cpp (modified) (1 diff)
• nodes.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -545 +545 @@
     break;
   }
+#if !NDEBUG
+  case KJSPrint: {
+    UString str = args[0].toString(exec);
+    puts(str.ascii());
+  }
+#endif
   }
 

trunk/JavaScriptCore/kjs/function.h

@@ -127 +127 @@
     virtual Value call(ExecState *exec, Object &thisObj, const List &args);
     virtual CodeType codeType() const;
-    enum { Eval, ParseInt, ParseFloat, IsNaN, IsFinite, Escape, UnEscape };
+    enum { Eval, ParseInt, ParseFloat, IsNaN, IsFinite, Escape, UnEscape 
+#if !NDEBUG
+           , KJSPrint
+#endif
+};
   private:
     int id;

trunk/JavaScriptCore/kjs/internal.cpp

@@ -648 +648 @@
   global.put(globExec,"escape",     Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::Escape,     1)), DontEnum);
   global.put(globExec,"unescape",   Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::UnEscape,   1)), DontEnum);
+#if !NDEBUG
+  global.put(globExec,"kjsprint",   Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::KJSPrint,   1)), DontEnum);
+#endif
 
   // built-in objects

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -112 +112 @@
 Completion Interpreter::evaluate(const UString &code, const Value &thisV)
 {
-  return rep->evaluate(code,thisV);
+  Completion comp = rep->evaluate(code,thisV);
+#if !NDEBUG
+  if (comp.complType() == Throw) {
+    lock();
+    ExecState *exec = rep->globalExec();
+    printf("Uncaught exception: %s\n", comp.value().toObject(exec).toString(exec).ascii());
+    unlock();
+  }
+#endif
+  return comp;
 }
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -694 +694 @@
 
   if (v.type() != ObjectType) {
-    return throwError(exec, TypeError, "Expression is no object. Cannot be new'ed");
+    return throwError(exec, TypeError, "Value used with new is not object.");
   }
 
   Object constr = Object(static_cast<ObjectImp*>(v.imp()));
   if (!constr.implementsConstruct()) {
-    return throwError(exec, TypeError, "Expression is no constructor.");
+    return throwError(exec, TypeError, "Value asked to construct is not a constructor.");
   }
 
@@ -743 +743 @@
     printInfo(exec, "WARNING: Failed function call attempt on", v, line);
 #endif
-    return throwError(exec, TypeError, "Expression is no object. Cannot be called.");
+    return throwError(exec, TypeError, "Value is not object. Cannot be called.");
   }
 
@@ -752 +752 @@
     printInfo(exec, "Failed function call attempt on", v, line);
 #endif
-    return throwError(exec, TypeError, "Expression does not allow calls.");
+    return throwError(exec, TypeError, "Object does not allow calls.");
   }
 
@@ -761 +761 @@
     printInfo(exec, "Exceeded maximum function call depth", v, line);
 #endif
-    return throwError(exec, RangeError, "Exceeded maximum call stack size.");
+    return throwError(exec, RangeError, "Exceeded maximum function call depth.");
   }
 #endif
@@ -1230 +1230 @@
       if (v2.type() != ObjectType)
           return throwError(exec,  TypeError,
-                             "Shift expression not an object into IN expression." );
+                             "Used IN expression with non-object." );
       Object o2(static_cast<ObjectImp*>(v2.imp()));
       b = o2.hasProperty(exec, Identifier(v1.toString(exec)));
@@ -1236 +1236 @@
     if (v2.type() != ObjectType)
         return throwError(exec,  TypeError,
-                           "Called instanceof operator on non-object." );
+                           "Used instanceof operator on non-object." );
 
     Object o2(static_cast<ObjectImp*>(v2.imp()));