Changeset 9352 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 10, 2005, 11:02:33 AM (20 years ago)

Author:

darin

Message:

Change by Mark Rowe <​[email protected]>.
Reviewed by me.

• further improvements to exception file/line number fix

• kjs/nodes.h: Added setExceptionDetailsIfNeeded function.
• kjs/nodes.cpp: Updated macros to call the new setExceptionDetailsIfNeeded function. (Node::setExceptionDetailsIfNeeded): Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (2 diffs)
• kjs/nodes.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-06-10  Darin Adler  <[email protected]>
+
+        Change by Mark Rowe <[email protected]>.
+        Reviewed by me.
+
+        - further improvements to exception file/line number fix
+
+        * kjs/nodes.h: Added setExceptionDetailsIfNeeded function.
+        * kjs/nodes.cpp: Updated macros to call the new setExceptionDetailsIfNeeded function.
+        (Node::setExceptionDetailsIfNeeded): Added.
+
 2005-06-09  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -68 +68 @@
 
 #define KJS_CHECKEXCEPTION \
-  if (exec->hadException()) \
+  if (exec->hadException()) { \
+    setExceptionDetailsIfNeeded(exec); \
     return Completion(Throw, exec->exception()); \
+  } \
   if (Collector::outOfMemory()) \
     return Completion(Throw, Error::create(exec,GeneralError,"Out of memory"));
 
 #define KJS_CHECKEXCEPTIONVALUE \
-  if (exec->hadException()) {\
-    Object exception = exec->exception().toObject(exec); \
-    exception.put(exec, "line", Number(line)); \
-    exception.put(exec, "sourceURL", String(sourceURL)); \
+  if (exec->hadException()) { \
+    setExceptionDetailsIfNeeded(exec); \
     return exec->exception(); \
-  }\
+  } \
   if (Collector::outOfMemory()) \
     return Undefined(); // will be picked up by KJS_CHECKEXCEPTION
 
 #define KJS_CHECKEXCEPTIONREFERENCE \
-  if (exec->hadException()) \
-    return Reference::makeValueReference(Undefined());; \
+  if (exec->hadException()) { \
+    setExceptionDetailsIfNeeded(exec); \
+    return Reference::makeValueReference(Undefined()); \
+  } \
   if (Collector::outOfMemory()) \
     return Reference::makeValueReference(Undefined()); // will be picked up by KJS_CHECKEXCEPTION
 
 #define KJS_CHECKEXCEPTIONLIST \
-  if (exec->hadException()) \
+  if (exec->hadException()) { \
+    setExceptionDetailsIfNeeded(exec); \
     return List(); \
+  } \
   if (Collector::outOfMemory()) \
     return List(); // will be picked up by KJS_CHECKEXCEPTION
@@ -176 +180 @@
   return result;
 }
+
+void Node::setExceptionDetailsIfNeeded(ExecState *exec)
+{
+    if (exec->hadException()) {
+        Object exception = exec->exception().toObject(exec);
+        if (!exception.hasProperty(exec, "line") &&
+            !exception.hasProperty(exec, "sourceURL")) {
+            exception.put(exec, "line", Number(line));
+            exception.put(exec, "sourceURL", String(sourceURL));
+        }
+    }
+}
+
 
 // ------------------------------ StatementNode --------------------------------

trunk/JavaScriptCore/kjs/nodes.h

@@ -107 +107 @@
     Value throwError(ExecState *exec, ErrorType e, const char *msg, Value v, Node *expr);
     Value throwError(ExecState *exec, ErrorType e, const char *msg, Identifier label);
+    void setExceptionDetailsIfNeeded(ExecState *exec);
     int line;
     UString sourceURL;