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

Timestamp:

Jan 25, 2008, 11:54:50 PM (17 years ago)

Author:

[email protected]

Message:

Fix for bug 17012: REGRESSION: JSC can't round trip an object literal

Reviewed by Maciej.

Add logic to ensure that object literals and function expressions get
parenthesis when necessary.

File:

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

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -42 +42 @@
 class SourceStream {
 public:
-    SourceStream() : m_numberNeedsParens(false), m_precedence(PrecExpression) { }
+    SourceStream() : m_numberNeedsParens(false), m_atStartOfStatement(true), m_precedence(PrecExpression) { }
     UString toString() const { return m_string; }
     SourceStream& operator<<(const Identifier&);
@@ -61 +61 @@
     UString m_spacesForIndentation;
     bool m_numberNeedsParens;
+    bool m_atStartOfStatement;
     Precedence m_precedence;
 };
@@ -151 +152 @@
 {
     m_numberNeedsParens = false;
+    m_atStartOfStatement = false;
     UChar ch(c);
     m_string.append(ch);
@@ -159 +161 @@
 {
     m_numberNeedsParens = false;
+    m_atStartOfStatement = false;
     m_string += s;
     return *this;
@@ -167 +170 @@
     bool needParens = m_numberNeedsParens;
     m_numberNeedsParens = false;
+    m_atStartOfStatement = false;
 
     if (needParens)
@@ -180 +184 @@
 {
     m_numberNeedsParens = false;
+    m_atStartOfStatement = false;
     m_string += s;
     return *this;
@@ -187 +192 @@
 {
     m_numberNeedsParens = false;
+    m_atStartOfStatement = false;
     m_string += s.ustring();
     return *this;
@@ -193 +199 @@
 SourceStream& SourceStream::operator<<(const Node* n)
 {
-    bool needParens = m_precedence != PrecExpression && n->precedence() > m_precedence;
+    bool needParens = (m_precedence != PrecExpression && n->precedence() > m_precedence) || (m_atStartOfStatement && n->needsParensIfLeftmost());
     m_precedence = PrecExpression;
     if (n) {
@@ -208 +214 @@
 {
     m_numberNeedsParens = false;
+    m_atStartOfStatement = true;
     m_string.append('\n');
     m_string.append(m_spacesForIndentation);
@@ -216 +223 @@
 {
     m_numberNeedsParens = false;
+    m_atStartOfStatement = false;
     m_spacesForIndentation += "  ";
     return *this;
@@ -223 +231 @@
 {
     m_numberNeedsParens = false;
+    m_atStartOfStatement = false;
     m_spacesForIndentation = m_spacesForIndentation.substr(0, m_spacesForIndentation.size() - 2);
     return *this;