Changeset 29804 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jan 26, 2008, 1:01:40 AM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

Reviewed by Oliver.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17013 JSC can't round trip certain for-loops

Test: fast/js/toString-for-var-decl.html

• kjs/nodes.h: Added PlaceholderTrueNode so we can put nodes into for loops without injecting the word "true" into them (nice, but not the bug fix). Fixed ForNode constructor so expr1WasVarDecl is set only when there is an expression, since it's common for the actual variable declaration to be moved by the parser.

• kjs/nodes2string.cpp: (KJS::PlaceholderTrueNode::streamTo): Added. Empty.

LayoutTests:

Reviewed by Oliver.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17013 JSC can't round trip certain for-loops

• fast/js/resources/toString-for-var-decl.js: Streamlined the test a bit, with more of the execution within shouldBe so that exceptions are caught for us. Added a new test case reflecting the just-fixed bug.
• fast/js/toString-for-var-decl-expected.txt: Updated.

Location:

trunk/JavaScriptCore/kjs

Files:

• nodes.h (modified) (2 diffs)
• nodes2string.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/nodes.h

@@ -237 +237 @@
   };
 
+  class PlaceholderTrueNode : public TrueNode {
+  public:
+    // Like TrueNode, but does not serialize as "true".
+    PlaceholderTrueNode() KJS_FAST_CALL : TrueNode() { }
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+  };
+
   class NumberNode : public ExpressionNode {
   public:
@@ -1815 +1822 @@
   public:
       ForNode(ExpressionNode* e1, ExpressionNode* e2, ExpressionNode* e3, StatementNode* s, bool e1WasVarDecl) KJS_FAST_CALL
-        : expr1(e1 ? e1 : new TrueNode)
-        , expr2(e2 ? e2 : new TrueNode)
-        , expr3(e3 ? e3 : new TrueNode)
+        : expr1(e1 ? e1 : new PlaceholderTrueNode)
+        , expr2(e2 ? e2 : new PlaceholderTrueNode)
+        , expr3(e3 ? e3 : new PlaceholderTrueNode)
         , statement(s)
-        , expr1WasVarDecl(e1WasVarDecl)
+        , expr1WasVarDecl(e1 && e1WasVarDecl)
     {
         ASSERT(expr1);

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -288 +288 @@
 }
 
+void PlaceholderTrueNode::streamTo(SourceStream&) const
+{
+}
+
 void NumberNode::streamTo(SourceStream& s) const
 {