Changeset 21409 in webkit for trunk/JavaScriptCore/kjs/nodes2string.cpp

Timestamp:

May 11, 2007, 9:45:45 AM (18 years ago)

Author:

bdash

Message:

2007-05-11 Kimmo Kinnunen <Kimmo Kinnunen>

Reviewed by Darin.

• Fix for bug ​http://bugs.webkit.org/show_bug.cgi?id=13620 Bogus decompilation of "for (var j = 1 in [])"
• ForInNode toString()'ed to syntax error if there was var decl and initializer
• ForNode toStringed()'ed lost 'var ' if it was present

• kjs/nodes2string.cpp: (VarDeclListNode::streamTo): Print "var " here (VarStatementNode::streamTo): Don't print "var " here (ForNode::streamTo): Remove TODO comment, VarDeclListNode will stream the "var " (ForInNode::streamTo): ForIn initializer is printed by VarDeclNode

2007-05-11 Kimmo Kinnunen <Kimmo Kinnunen>

Reviewed by Darin.

• Tests for bug ​http://bugs.webkit.org/show_bug.cgi?id=13620 Bogus decompilation of "for (var j = 1 in [])"

Testcase covers toString()ing functions with
for-statements of form for (var j = 1 in []) and for (var j=0;j<10;j++)

• fast/js/resources/toString-for-var-decl.js: Added.
• fast/js/toString-for-var-decl-expected.txt: Added.
• fast/js/toString-for-var-decl.html: Added.

File:

• trunk/JavaScriptCore/kjs/nodes2string.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -594 +594 @@
 void VarDeclListNode::streamTo(SourceStream &s) const
 {
-  s << var;
+  s << "var " << var;
   for (VarDeclListNode *n = next.get(); n; n = n->next.get())
     s << ", " << n->var;
@@ -601 +601 @@
 void VarStatementNode::streamTo(SourceStream &s) const
 {
-  s << SourceStream::Endl << "var " << next << ";";
+  s << SourceStream::Endl << next << ";";
 }
 
@@ -645 +645 @@
 {
   s << SourceStream::Endl << "for ("
-    << expr1  // TODO: doesn't properly do "var i = 0"
+    << expr1
     << "; " << expr2
     << "; " << expr3
@@ -658 +658 @@
   else
     s << lexpr;
-  
-  if (init)
-    s << " = " << init;
+
   s << " in " << expr << ")" << SourceStream::Indent
     << statement << SourceStream::Unindent;