Changeset 30105

Timestamp:

2008-02-08 21:17:06 (8 months ago)

Author:

oliver@apple.com

Message:

<rdar://problem/5731773> REGRESSION (r28973): Extraneous parentheses in function.toString()
https://bugs.webkit.org/show_bug.cgi?id=17214

Reviewed by Maciej

Make a subclass of CommaNode to provide the correct precedence for each expression in
a variable declaration list.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/kjs/grammar.y (modified) (1 diff)
• JavaScriptCore/kjs/nodes.h (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/function-toString-parentheses-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/resources/function-toString-parentheses.js (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-02-08  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        <rdar://problem/5731773> REGRESSION (r28973): Extraneous parentheses in function.toString()
+        https://bugs.webkit.org/show_bug.cgi?id=17214
+
+        Make a subclass of CommaNode to provide the correct precedence for each expression in
+        a variable declaration list.
+
+        * kjs/grammar.y:
+        * kjs/nodes.h:
+        (KJS::VarDeclCommaNode::):
+
 2008-02-08  Darin Adler  <darin@apple.com>
 

trunk/JavaScriptCore/kjs/grammar.y

@@ -1247 +1247 @@
     if (!list)
         return init;
-    return new CommaNode(list, init);
+    return new VarDeclCommaNode(list, init);
 }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -2277 +2277 @@
         RefPtr<ExpressionNode> m_expr2;
     };
+    
+    class VarDeclCommaNode : public CommaNode {
+    public:
+        VarDeclCommaNode(ExpressionNode* expr1, ExpressionNode* expr2) KJS_FAST_CALL
+            : CommaNode(expr1, expr2)
+        {
+        }
+        virtual Precedence precedence() const { return PrecAssignment; }
+    };
 
     class ConstDeclNode : public ExpressionNode {

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-08  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Test cases for decompilation of variable declaration lists.
+
+        * fast/js/function-toString-parentheses-expected.txt:
+        * fast/js/resources/function-toString-parentheses.js:
+
 2008-02-08  Darin Adler  <darin@apple.com>
 

trunk/LayoutTests/fast/js/function-toString-parentheses-expected.txt

@@ -482 +482 @@
 PASS compileAndSerializeLeftmostTest('(function () { })()') is '(function () { })()'
 PASS compileAndSerializeLeftmostTest('x = function () { }') is 'x = function () { }'
+PASS compileAndSerializeLeftmostTest('var a') is 'var a'
+PASS compileAndSerializeLeftmostTest('var a = 1') is 'var a = 1'
+PASS compileAndSerializeLeftmostTest('var a, b') is 'var a, b'
+PASS compileAndSerializeLeftmostTest('var a = 1, b = 2') is 'var a = 1, b = 2'
+PASS compileAndSerializeLeftmostTest('var a, b, c') is 'var a, b, c'
+PASS compileAndSerializeLeftmostTest('var a = 1, b = 2, c = 3') is 'var a = 1, b = 2, c = 3'
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/js/resources/function-toString-parentheses.js

@@ -199 +199 @@
 shouldBe("compileAndSerializeLeftmostTest('x = function () { }')", "'x = function () { }'");
 
+shouldBe("compileAndSerializeLeftmostTest('var a')", "'var a'");
+shouldBe("compileAndSerializeLeftmostTest('var a = 1')", "'var a = 1'");
+shouldBe("compileAndSerializeLeftmostTest('var a, b')", "'var a, b'");
+shouldBe("compileAndSerializeLeftmostTest('var a = 1, b = 2')", "'var a = 1, b = 2'");
+shouldBe("compileAndSerializeLeftmostTest('var a, b, c')", "'var a, b, c'");
+shouldBe("compileAndSerializeLeftmostTest('var a = 1, b = 2, c = 3')", "'var a = 1, b = 2, c = 3'");
+
 var successfullyParsed = true;