Changeset 10496 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 8, 2005, 6:19:19 PM (20 years ago)

Author:

darin

Message:

• fixed overloaded versions of throwError so that they substitute *all* expected parameters into the message string -- some versions used to skip parameters, resulting in "%s" being printed in the error message.

Reviewed by Geoff.

• kjs/nodes.h: Updated declarations to use "const &" and not to name parameters
• kjs/nodes.cpp: (Node::throwError): Updated to match above and add one missing call to substitute.

Location:

trunk/JavaScriptCore/kjs

Files:

• nodes.cpp (modified) (3 diffs)
• nodes.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -147 +147 @@
 
 
-ValueImp *Node::throwError(ExecState *exec, ErrorType e, const char *msg, Identifier label)
+ValueImp *Node::throwError(ExecState *exec, ErrorType e, const char *msg, const Identifier &label)
 {
     UString message = msg;
@@ -163 +163 @@
 }
 
-ValueImp *Node::throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Node *expr, Identifier label)
+ValueImp *Node::throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Node *expr, const Identifier &label)
 {
     UString message = msg;
     substitute(message, v->toString(exec));
     substitute(message, expr->toString());
+    substitute(message, label.ustring());
     return KJS::throwError(exec, e, message, lineNo(), sourceId(), &sourceURL);
 }
 
-ValueImp *Node::throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Identifier label)
+ValueImp *Node::throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, const Identifier &label)
 {
     UString message = msg;
@@ -178 +179 @@
     return KJS::throwError(exec, e, message, lineNo(), sourceId(), &sourceURL);
 }
-
 
 void Node::setExceptionDetailsIfNeeded(ExecState *exec)

trunk/JavaScriptCore/kjs/nodes.h

@@ -99 +99 @@
   protected:
     ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg);
-    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Node *expr);
-    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, Identifier label);
-    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Identifier ident);
-    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Node *e1, Node *e2);
-    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Node *expr, Identifier ident);
+    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *, Node *);
+    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, const Identifier &);
+    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *, const Identifier &);
+    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *, Node *, Node *);
+    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *, Node *, const Identifier &);
 
     void setExceptionDetailsIfNeeded(ExecState *exec);