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

Timestamp:

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

Author:

bdash

Message:

2007-05-11 Kimmo Kinnunen <Kimmo Kinnunen>

Reviewed by Darin.

• Fixes ​http://bugs.webkit.org/show_bug.cgi?id=10878 (Incorrect decompilation for "4..x")
• Group numbers in dotted expressions in toString() output, so we avoid the 4.x constructs when the original input is 4..x. 4..x means the same as 4. .x or (4).x or Number(4).x

• kjs/nodes2string.cpp: (KJS::SourceStream::): Add boolean flag to indicate that if next item is a number, it should be grouped. Add new formatting enum which turns on the boolean flag. (KJS::SourceStream::SourceStream): Added. Initialize the flag. (SourceStream::operator<<): Added. New overloaded operator with double value as parameter. (NumberNode::streamTo): Use the double operator (ArrayNode::streamTo): (DotAccessorNode::streamTo): (FunctionCallDotNode::streamTo): (FunctionCallParenDotNode::streamTo): (PostfixDotNode::streamTo): (DeleteDotNode::streamTo): (PrefixDotNode::streamTo): (AssignDotNode::streamTo): Use the new formatting enum to turn on the grouping flag.

2007-05-11 Kimmo Kinnunen <Kimmo Kinnunen>

Reviewed by Darin.

Tests for ​http://bugs.webkit.org/show_bug.cgi?id=10878
Bug 10878: Incorrect decompilation for "4..x"

• fast/js/resources/toString-number-dot-expr.js: Added.
• fast/js/toString-number-dot-expr-expected.txt: Added.
• fast/js/toString-number-dot-expr.html: Added.

File:

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

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -32 +32 @@
   public:
     enum Format {
-      Endl, Indent, Unindent
+      Endl, Indent, Unindent, DotExpr
     };
-
+    SourceStream() : m_groupIfNumber(false) {}
     UString toString() const { return str; }
     SourceStream& operator<<(const Identifier &);
     SourceStream& operator<<(const UString &);
     SourceStream& operator<<(const char *);
+    SourceStream& operator<<(double);
     SourceStream& operator<<(char);
     SourceStream& operator<<(Format f);
     SourceStream& operator<<(const Node *);
     template <typename T> SourceStream& operator<<(RefPtr<T> n) { return this->operator<<(n.get()); }
+
   private:
     UString str; /* TODO: buffer */
     UString ind;
+    bool m_groupIfNumber;
   };
 }
@@ -53 +56 @@
 SourceStream& SourceStream::operator<<(char c)
 {
+  m_groupIfNumber = false;
   UChar ch(c);
   str += UString(&ch, 1);
@@ -60 +64 @@
 SourceStream& SourceStream::operator<<(const char *s)
 {
+  m_groupIfNumber = false;
   str += UString(s);
   return *this;
 }
 
+SourceStream& SourceStream::operator<<(double value)
+{
+  if (m_groupIfNumber)
+    str.append("(");
+
+  str += UString::from(value);
+
+  if (m_groupIfNumber)
+    str.append(")");
+
+  m_groupIfNumber = false;
+  return *this;
+}
+
 SourceStream& SourceStream::operator<<(const UString &s)
 {
+  m_groupIfNumber = false;
   str += s;
   return *this;
@@ -72 +92 @@
 SourceStream& SourceStream::operator<<(const Identifier &s)
 {
+  m_groupIfNumber = false;
   str += s.ustring();
   return *this;
@@ -80 +101 @@
   if (n)
     n->streamTo(*this);
+  m_groupIfNumber = false;
   return *this;
 }
@@ -85 +107 @@
 SourceStream& SourceStream::operator<<(Format f)
 {
+  m_groupIfNumber = false;
   switch (f) {
     case Endl:
@@ -95 +118 @@
       ind = ind.substr(0, ind.size() - 2);
       break;
+  case DotExpr:
+      m_groupIfNumber = true;
+      break;
   }
 
@@ -115 +141 @@
 }
 
-void NumberNode::streamTo(SourceStream &s) const { s << UString::from(value); }
+void NumberNode::streamTo(SourceStream &s) const { s << value; }
 
 void StringNode::streamTo(SourceStream &s) const
@@ -206 +232 @@
 void DotAccessorNode::streamTo(SourceStream &s) const
 {
-  s << expr << "." << ident;
+  s << SourceStream::DotExpr << expr << "." << ident;
 }
 
@@ -248 +274 @@
 void FunctionCallDotNode::streamTo(SourceStream &s) const
 {
-  s << base << "." << ident << args;
+  s << SourceStream::DotExpr << base << "." << ident << args;
 }
 
 void FunctionCallParenDotNode::streamTo(SourceStream &s) const
 {
-  s << "(" << base << "." << ident << ")" << args;
+  s << "(" << SourceStream::DotExpr << base << "." << ident << ")" << args;
 }
 
@@ -276 +302 @@
 void PostfixDotNode::streamTo(SourceStream &s) const
 {
-  s << m_base << "." << m_ident;
+  s << SourceStream::DotExpr << m_base << "." << m_ident;
   if (m_oper == OpPlusPlus)
     s << "++";
@@ -304 +330 @@
 void DeleteDotNode::streamTo(SourceStream &s) const
 {
-  s << "delete " << m_base << "." << m_ident;
+  s << "delete " << SourceStream::DotExpr << m_base << "." << m_ident;
 }
 
@@ -351 +377 @@
   else
     s << "--";
-  s << m_base << "." << m_ident;
+  s << SourceStream::DotExpr << m_base << "." << m_ident;
 }
 
@@ -539 +565 @@
 void AssignDotNode::streamTo(SourceStream &s) const
 {
-  s << m_base << "." << m_ident;
+  s << SourceStream::DotExpr << m_base << "." << m_ident;
   streamAssignmentOperatorTo(s, m_oper);
   s << m_right;