Changeset 21027 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Apr 23, 2007, 1:38:46 AM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Maciej.

• fix <rdar://problem/4840688> REGRESSION (r10588, r10621): JavaScript won't parse modifications of non-references (breaks 300themovie.warnerbros.com, fedex.com)

Despite the ECMAScript specification's claim that you can treat these as syntax
errors, doing so creates some website incompatibilities. So this patch turns them back
into evaluation errors instead.

Test: fast/js/modify-non-references.html

• kjs/grammar.y: Change makeAssignNode, makePrefixNode, and makePostfixNode so that they never fail to parse. Update rules that use them. Fix a little bit of indenting. Use new PostfixErrorNode, PrefixErrorNode, and AssignErrorNode classes.

• kjs/nodes.h: Added an overload of throwError that takes a char* argument. Replaced setExceptionDetailsIfNeeded and debugExceptionIfNeeded with handleException, which does both. Added PostfixErrorNode, PrefixErrorNode, and AssignErrorNode classes.

• kjs/nodes.cpp: Changed exception macros to use handleException; simpler and smaller code size than the two functions that we used before. (Node::throwError): Added the overload mentioned above. (Node::handleException): Added. Contains the code from both setExceptionDetailsIfNeeded and debugExceptionIfNeeded. (PostfixErrorNode::evaluate): Added. Throws an exception. (PrefixErrorNode::evaluate): Ditto. (AssignErrorNode::evaluate): Ditto. (ThrowNode::execute): Call handleException instead of debugExceptionIfNeeded; this effectively adds a call to setExceptionDetailsIfNeeded, which may help with getting the correct file and line number for these exceptions.

• kjs/nodes2string.cpp: (PostfixErrorNode::streamTo): Added. (PrefixErrorNode::streamTo): Added. (AssignErrorNode::streamTo): Added.

LayoutTests:

Reviewed by Maciej.

• test for <rdar://problem/4840688> REGRESSION (r10588, r10621): JavaScript won't parse modifications of non-references (breaks 300themovie.warnerbros.com, fedex.com)

• fast/js/modify-non-references-expected.txt: Added.
• fast/js/modify-non-references.html: Added.
• fast/js/resources/modify-non-references.js: Added.

• fast/js/assign-expected.txt: Updated for different exception text.
• fast/js/postfix-syntax-expected.txt: Ditto.
• fast/js/prefix-syntax-expected.txt: Ditto.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (12 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -3 +3 @@
  *  Copyright (C) 1999-2002 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
- *  Copyright (C) 2003 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -55 +55 @@
 #define KJS_CHECKEXCEPTION \
   if (exec->hadException()) { \
-    setExceptionDetailsIfNeeded(exec); \
     JSValue *ex = exec->exception(); \
     exec->clearException(); \
-    debugExceptionIfNeeded(exec, ex); \
+    handleException(exec, ex); \
     return Completion(Throw, ex); \
   } \
@@ -66 +65 @@
 #define KJS_CHECKEXCEPTIONVALUE \
   if (exec->hadException()) { \
-    setExceptionDetailsIfNeeded(exec); \
-    debugExceptionIfNeeded(exec, exec->exception()); \
+    handleException(exec); \
     return jsUndefined(); \
   } \
@@ -75 +73 @@
 #define KJS_CHECKEXCEPTIONLIST \
   if (exec->hadException()) { \
-    setExceptionDetailsIfNeeded(exec); \
-    debugExceptionIfNeeded(exec, exec->exception()); \
+    handleException(exec); \
     return List(); \
   } \
@@ -222 +219 @@
 }
 
+JSValue *Node::throwError(ExecState* exec, ErrorType e, const char* msg, const char* string)
+{
+    UString message = msg;
+    substitute(message, string);
+    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), currentSourceURL(exec));
+}
+
 JSValue *Node::throwError(ExecState *exec, ErrorType e, const char *msg, JSValue *v, Node *expr)
 {
@@ -269 +273 @@
 }
 
-void Node::setExceptionDetailsIfNeeded(ExecState *exec)
-{
-    JSValue *exceptionValue = exec->exception();
+void Node::handleException(ExecState* exec)
+{
+    handleException(exec, exec->exception());
+}
+
+void Node::handleException(ExecState* exec, JSValue* exceptionValue)
+{
     if (exceptionValue->isObject()) {
-        JSObject *exception = static_cast<JSObject *>(exceptionValue);
+        JSObject* exception = static_cast<JSObject*>(exceptionValue);
         if (!exception->hasProperty(exec, "line") && !exception->hasProperty(exec, "sourceURL")) {
             exception->put(exec, "line", jsNumber(m_line));
@@ -279 +287 @@
         }
     }
-}
-
-void Node::debugExceptionIfNeeded(ExecState* exec, JSValue* exceptionValue)
-{
     Debugger* dbg = exec->dynamicInterpreter()->debugger();
     if (dbg && !dbg->hasHandledException(exec, exceptionValue)) {
@@ -874 +878 @@
 }
 
+// ------------------------------ PostfixErrorNode -----------------------------------
+
+JSValue* PostfixErrorNode::evaluate(ExecState* exec)
+{
+    throwError(exec, ReferenceError, "Postfix %s operator applied to value that is not a reference.",
+        m_oper == OpPlusPlus ? "++" : "--");
+    handleException(exec);
+    return jsUndefined();
+}
+
+// ------------------------------ DeleteResolveNode -----------------------------------
+
 // ECMA 11.4.1
 
-// ------------------------------ DeleteResolveNode -----------------------------------
 JSValue *DeleteResolveNode::evaluate(ExecState *exec)
 {
@@ -901 +916 @@
 
 // ------------------------------ DeleteBracketNode -----------------------------------
+
 JSValue *DeleteBracketNode::evaluate(ExecState *exec)
 {
@@ -1108 +1124 @@
 
   return n2;
+}
+
+// ------------------------------ PrefixErrorNode -----------------------------------
+
+JSValue* PrefixErrorNode::evaluate(ExecState* exec)
+{
+    throwError(exec, ReferenceError, "Prefix %s operator applied to value that is not a reference.",
+        m_oper == OpPlusPlus ? "++" : "--");
+    handleException(exec);
+    return jsUndefined();
 }
 
@@ -1467 +1493 @@
 }
 
+// ------------------------------ AssignErrorNode -----------------------------------
+
+JSValue* AssignErrorNode::evaluate(ExecState* exec)
+{
+    throwError(exec, ReferenceError, "Left side of assignment is not a reference.");
+    handleException(exec);
+    return jsUndefined();
+}
+
 // ------------------------------ AssignBracketNode -----------------------------------
 
@@ -2289 +2324 @@
   KJS_CHECKEXCEPTION
 
-  debugExceptionIfNeeded(exec, v);
-
+  handleException(exec, v);
   return Completion(Throw, v);
 }