Changeset 4363 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

May 13, 2003, 2:19:57 PM (22 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

• fixed 3254484 - Add a way to print JavaScript exceptions to the console via the debug menu
• improved JavaScript error message format

• kjs/error_object.cpp: (ErrorProtoFuncImp::call): Include line number in toString output.
• kjs/internal.cpp: (Parser::parse): Remove redundant fprintf.
• kjs/interpreter.cpp: (Interpreter::evaluate): Log if the flag is on. Include filename in log output. (Interpreter::shouldPrintExceptions): Check the global flag. (Interpreter::setShouldPrintExceptions): Set the global flag.
• kjs/interpreter.h:
• kjs/nodes.cpp: (Node::throwError): Add variants that include value and expression or label in format. (NewExprNode::evaluate): Improve error message. (FunctionCallNode::evaluate): Improve error message. (RelationalNode::evaluate): Improve error message. (ContinueNode::execute): Improve error message. (BreakNode::execute): Improve error message. (LabelNode::execute): Improve error message.
• kjs/nodes.h:

WebCore:

Reviewed by Darin.

• fixed 3254484 - Add a way to print JavaScript exceptions to the console via the debug menu

• khtml/ecma/kjs_proxy.cpp: (KJSProxyImpl::evaluate): Pass the filename.
• kwq/WebCoreJavaScript.h:
• kwq/WebCoreJavaScript.mm: (+[WebCoreJavaScript shouldPrintExceptions]): Call through to JavaScriptCore. (+[WebCoreJavaScript setShouldPrintExceptions:]): Call through to JavaScriptCore.
• khtml/ecma/kjs_events.cpp: (JSEventListener::handleEvent): Print exception if there is one.
• khtml/ecma/kjs_window.cpp: (ScheduledAction::execute): Print exception in the function case.

WebKit:

Reviewed by Darin.

• fixed 3254484 - Add a way to print JavaScript exceptions to the console via the debug menu

• Misc.subproj/WebCoreStatistics.h:
• Misc.subproj/WebCoreStatistics.m: (+[WebCoreStatistics shouldPrintExceptions]): Call through to WebCore. (+[WebCoreStatistics setShouldPrintExceptions:]): Call through to WebCore.

WebBrowser:

Reviewed by Darin.

• fixed 3254484 - Add a way to print JavaScript exceptions to the console via the debug menu

• Debug/DebugUtilities.m: (-[DebugUtilities createDebugMenu]): Include "Log JavaScript Exceptions" item. (-[BrowserDocument toggleLogJavaScriptExceptions:]): Call WebKit to do the toggle. (-[BrowserDocument validate_toggleLogJavaScriptExceptions:]): Set state properly.

Location:

trunk/JavaScriptCore/kjs

Files:

• error_object.cpp (modified) (1 diff)
• internal.cpp (modified) (1 diff)
• interpreter.cpp (modified) (2 diffs)
• interpreter.h (modified) (2 diffs)
• nodes.cpp (modified) (10 diffs)
• nodes.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/error_object.cpp

@@ -65 +65 @@
 {
   // toString()
-  UString s = "Error";
+  UString s;
 
-  Value v = thisObj.get(exec, namePropertyName);
+  Value v = thisObj.get(exec, "line");
   if (v.type() != UndefinedType) {
-    s = v.toString(exec);
+    s += v.toString(exec) += ": ";
+  }
+
+
+  v = thisObj.get(exec, namePropertyName);
+  if (v.type() != UndefinedType) {
+    s += v.toString(exec);
   }
 
   v = thisObj.get(exec, messagePropertyName);
   if (v.type() != UndefinedType) {
-    s += ": "+v.toString(exec);
+    s += " - " + v.toString(exec);
   }
 

trunk/JavaScriptCore/kjs/internal.cpp

@@ -456 +456 @@
     if (errMsg)
       *errMsg = "Parse error at line " + UString::from(eline);
-#ifndef NDEBUG
-    fprintf(stderr, "KJS: JavaScript parse error at line %d.\n", eline);
-#endif
     delete prog;
     return 0;

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -116 +116 @@
 }
 
-Completion Interpreter::evaluate(const UString &code, const Value &thisV)
+Completion Interpreter::evaluate(const UString &code, const Value &thisV, const UString &filename)
 {
   Completion comp = rep->evaluate(code,thisV);
-#ifndef NDEBUG
-  if (comp.complType() == Throw) {
+
+#if APPLE_CHANGES
+  if (shouldPrintExceptions() && comp.complType() == Throw) {
     lock();
     ExecState *exec = rep->globalExec();
-    printf("Uncaught exception: %s\n", comp.value().toObject(exec).toString(exec).ascii());
+    char *f = strdup(filename.ascii());
+    const char *message = comp.value().toObject(exec).toString(exec).ascii();
+    printf("%s:%s\n", f, message);
+    free(f);
     unlock();
   }
 #endif
+
   return comp;
 }
@@ -313 +318 @@
 #endif
 
+#if APPLE_CHANGES
+static bool printExceptions = false;
+
+bool Interpreter::shouldPrintExceptions()
+{
+  return printExceptions;
+}
+
+void Interpreter::setShouldPrintExceptions(bool print)
+{
+  printExceptions = print;
+}
+#endif
+
 void Interpreter::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }

trunk/JavaScriptCore/kjs/interpreter.h

@@ -187 +187 @@
      * @return A completion object representing the result of the execution.
      */
-    Completion evaluate(const UString &code, const Value &thisV = Value());
+    Completion evaluate(const UString &code, const Value &thisV = Value(), const UString &filename = UString());
 
     /**
@@ -339 +339 @@
     static void finalCheck();
 #endif
+
+#if APPLE_CHANGES
+    static bool shouldPrintExceptions();
+    static void setShouldPrintExceptions(bool);
+#endif
+
   private:
     InterpreterImp *rep;

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -131 +131 @@
 }
 
+Value Node::throwError(ExecState *exec, ErrorType e, const char *msg, Value v, Node *expr)
+{
+  char *vStr = strdup(v.toString(exec).ascii());
+  char *exprStr = strdup(expr->toString().ascii());
+  
+  int length =  strlen(msg) - 4 /* two %s */ + strlen(vStr) + strlen(exprStr) + 1 /* null terminator */;
+  char *str = new char[length];
+  sprintf(str, msg, vStr, exprStr);
+  free(vStr);
+  free(exprStr);
+
+  Value result = throwError(exec, e, str);
+  delete [] str;
+  
+  return result;
+}
+
+
+Value Node::throwError(ExecState *exec, ErrorType e, const char *msg, Identifier label)
+{
+  const char *l = label.ascii();
+  int length = strlen(msg) - 2 /* %s */ + strlen(l) + 1 /* null terminator */;
+  char *message = new char[length];
+  sprintf(message, msg, l);
+
+  Value result = throwError(exec, e, message);
+  delete [] message;
+
+  return result;
+}
+
 // ------------------------------ StatementNode --------------------------------
 StatementNode::StatementNode() : l0(-1), l1(-1), sid(-1), breakPoint(false)
@@ -658 +689 @@
 
   if (v.type() != ObjectType) {
-    return throwError(exec, TypeError, "Value used with new is not object.");
+    return throwError(exec, TypeError, "Value %s (result of expression %s) is not an object. Cannot be used with new.", v, expr);
   }
 
   Object constr = Object(static_cast<ObjectImp*>(v.imp()));
   if (!constr.implementsConstruct()) {
-    return throwError(exec, TypeError, "Value asked to construct is not a constructor.");
+    return throwError(exec, TypeError, "Value %s (result of expression %s) is not a constructor. Cannot be used with new.", v, expr);
   }
 
@@ -704 +735 @@
 
   if (v.type() != ObjectType) {
-#ifndef NDEBUG
-    printInfo(exec, "WARNING: Failed function call attempt on", v, line);
-#endif
-    return throwError(exec, TypeError, "Value is not object. Cannot be called.");
+    return throwError(exec, TypeError, "Value %s (result of expression %s) is not object. Cannot be called.", v, expr);
   }
 
@@ -713 +741 @@
 
   if (!func.implementsCall()) {
-#ifndef NDEBUG
-    printInfo(exec, "Failed function call attempt on", v, line);
-#endif
-    return throwError(exec, TypeError, "Object does not allow calls.");
+    return throwError(exec, TypeError, "Object %s (result of expression %s) does not allow calls.", v, expr);
   }
 
@@ -722 +747 @@
   static int depth = 0; // sum of all concurrent interpreters
   if (++depth > KJS_MAX_STACK) {
-#ifndef NDEBUG
-    printInfo(exec, "Exceeded maximum function call depth", v, line);
-#endif
-    return throwError(exec, RangeError, "Exceeded maximum function call depth.");
+    return throwError(exec, RangeError, "Exceeded maximum function call depth calling %s (result of expression %s).", v, expr);
   }
 #endif
@@ -1192 +1214 @@
       if (v2.type() != ObjectType)
           return throwError(exec,  TypeError,
-                             "Used IN expression with non-object." );
+                             "Value %s (result of expression %s) is not an object. Cannot be used with IN expression.", v2, expr2);
       Object o2(static_cast<ObjectImp*>(v2.imp()));
       b = o2.hasProperty(exec, Identifier(v1.toString(exec)));
@@ -1198 +1220 @@
     if (v2.type() != ObjectType)
         return throwError(exec,  TypeError,
-                           "Used instanceof operator on non-object." );
+                           "Value %s (result of expression %s) is not an object. Cannot be used with instanceof operator.", v2, expr2);
 
     Object o2(static_cast<ObjectImp*>(v2.imp()));
@@ -2148 +2170 @@
   Value dummy;
   return exec->context().imp()->seenLabels()->contains(ident) ?
-    Completion(Continue, dummy, ident) :
+    Completion(Break, dummy, ident) :
     Completion(Throw,
-               throwError(exec, SyntaxError, "Label not found in containing block"));
+               throwError(exec, SyntaxError, "Label %s not found in containing block. Can't continue.", ident));
 }
 
@@ -2164 +2186 @@
     Completion(Break, dummy, ident) :
     Completion(Throw,
-               throwError(exec, SyntaxError, "Label not found in containing block"));
+               throwError(exec, SyntaxError, "Label %s not found in containing block. Can't break.", ident));
 }
 
@@ -2519 +2541 @@
   if (!exec->context().imp()->seenLabels()->push(label)) {
     return Completion( Throw,
-                       throwError(exec, SyntaxError, "Duplicated label found" ));
+                       throwError(exec, SyntaxError, "Duplicated label %s found.", label));
   };
   e = statement->execute(exec);

trunk/JavaScriptCore/kjs/nodes.h

@@ -100 +100 @@
   protected:
     Value throwError(ExecState *exec, ErrorType e, const char *msg);
+    Value throwError(ExecState *exec, ErrorType e, const char *msg, Value v, Node *expr);
+    Value throwError(ExecState *exec, ErrorType e, const char *msg, Identifier label);
     int line;
     unsigned int refcount;