Changeset 4363 in webkit for trunk/JavaScriptCore/kjs/interpreter.cpp

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.

File:

• trunk/JavaScriptCore/kjs/interpreter.cpp (modified) (2 diffs)

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 );*/ }