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

Timestamp:

Jan 26, 2008, 10:27:57 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Mark Rowe.

Cleanup node2string a little.

• Remove some unnecessary branching.
• Factor out bracket and dot streaming into static inline functions.

• kjs/nodes.h:
• kjs/nodes2string.cpp: (KJS::bracketNodeStreamTo): (KJS::dotNodeStreamTo): (KJS::FunctionCallBracketNode::streamTo): (KJS::FunctionCallDotNode::streamTo): (KJS::PostIncBracketNode::streamTo): (KJS::PostDecBracketNode::streamTo): (KJS::PostIncDotNode::streamTo): (KJS::PostDecDotNode::streamTo): (KJS::DeleteBracketNode::streamTo): (KJS::DeleteDotNode::streamTo): (KJS::PreIncBracketNode::streamTo): (KJS::PreDecBracketNode::streamTo): (KJS::PreIncDotNode::streamTo): (KJS::PreDecDotNode::streamTo): (KJS::ReadModifyBracketNode::streamTo): (KJS::AssignBracketNode::streamTo): (KJS::ReadModifyDotNode::streamTo): (KJS::AssignDotNode::streamTo): (KJS::WhileNode::streamTo):

File:

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

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -262 +262 @@
 }
 
+static inline void bracketNodeStreamTo(SourceStream& s, const RefPtr<ExpressionNode>& base, const RefPtr<ExpressionNode>& subscript)
+{
+    s << PrecCall << base.get() << "[" << subscript.get() << "]";
+}
+
+static inline void dotNodeStreamTo(SourceStream& s, const RefPtr<ExpressionNode>& base, const Identifier& ident)
+{
+    s << DotExpr << PrecCall << base.get() << "." << ident;
+}
+
 // --------
 
@@ -420 +430 @@
 void FunctionCallBracketNode::streamTo(SourceStream& s) const
 {
-    s << PrecCall << base << "[" << subscript << "]" << args;
+    bracketNodeStreamTo(s, base, subscript);
+    s << args;
 }
 
 void FunctionCallDotNode::streamTo(SourceStream& s) const
 {
-    s << DotExpr << PrecCall << base << "." << ident << args;
+    dotNodeStreamTo(s, base, ident);
+    s << args;
 }
 
@@ -438 +450 @@
 }
 
-void PostfixBracketNode::streamTo(SourceStream& s) const
-{
-    s << PrecCall << m_base << "[" << m_subscript << "]";
-    if (isIncrement())
-        s << "++";
-    else
-        s << "--";
-}
-
-void PostfixDotNode::streamTo(SourceStream& s) const
-{
-    s << DotExpr << PrecCall << m_base << "." << m_ident;
-    if (isIncrement())
-        s << "++";
-    else
-        s << "--";
+void PostIncBracketNode::streamTo(SourceStream& s) const
+{
+    bracketNodeStreamTo(s, m_base, m_subscript);
+    s << "++";
+}
+
+void PostDecBracketNode::streamTo(SourceStream& s) const
+{
+    bracketNodeStreamTo(s, m_base, m_subscript);
+    s << "--";
+}
+
+void PostIncDotNode::streamTo(SourceStream& s) const
+{
+    dotNodeStreamTo(s, m_base, m_ident);
+    s << "++";
+}
+
+void PostDecDotNode::streamTo(SourceStream& s) const
+{
+    dotNodeStreamTo(s, m_base, m_ident);
+    s << "--";
 }
 
@@ -472 +490 @@
 void DeleteBracketNode::streamTo(SourceStream& s) const
 {
-    s << "delete " << PrecCall << m_base << "[" << m_subscript << "]";
+    s << "delete ";
+    bracketNodeStreamTo(s, m_base, m_subscript);
 }
 
 void DeleteDotNode::streamTo(SourceStream& s) const
 {
-    s << "delete " << DotExpr << PrecCall << m_base << "." << m_ident;
+    s << "delete ";
+    dotNodeStreamTo(s, m_base, m_ident);
 }
 
@@ -510 +530 @@
 }
 
-void PrefixBracketNode::streamTo(SourceStream& s) const
-{
-    if (isIncrement())
-        s << "++";
-    else
-        s << "--";
-    s << PrecCall << m_base << "[" << m_subscript << "]";
-}
-
-void PrefixDotNode::streamTo(SourceStream& s) const
-{
-    if (isIncrement())
-        s << "++";
-    else
-        s << "--";
-    s << DotExpr << PrecCall << m_base << "." << m_ident;
+void PreIncBracketNode::streamTo(SourceStream& s) const
+{
+    s << "++";
+    bracketNodeStreamTo(s, m_base, m_subscript);
+}
+
+void PreDecBracketNode::streamTo(SourceStream& s) const
+{
+    s << "--";
+    bracketNodeStreamTo(s, m_base, m_subscript);
+}
+
+void PreIncDotNode::streamTo(SourceStream& s) const
+{
+    s << "++";
+    dotNodeStreamTo(s, m_base, m_ident);
+}
+
+void PreDecDotNode::streamTo(SourceStream& s) const
+{
+    s << "--";
+    dotNodeStreamTo(s, m_base, m_ident);
 }
 
@@ -690 +716 @@
 void ReadModifyBracketNode::streamTo(SourceStream& s) const
 {
-    s << PrecCall << m_base << '[' << m_subscript << "] "
-        << operatorString(m_oper) << ' ' << PrecAssignment << m_right;
+    bracketNodeStreamTo(s, m_base, m_subscript);
+    s << ' ' << operatorString(m_oper) << ' ' << PrecAssignment << m_right;
 }
 
 void AssignBracketNode::streamTo(SourceStream& s) const
 {
-    s << PrecCall << m_base << '[' << m_subscript << "] = " << PrecAssignment << m_right;
+    bracketNodeStreamTo(s, m_base, m_subscript);
+    s << " = " << PrecAssignment << m_right;
 }
 
 void ReadModifyDotNode::streamTo(SourceStream& s) const
 {
-    s << DotExpr << PrecCall << m_base << "." << m_ident << ' '
-        << operatorString(m_oper) << ' ' << PrecAssignment << m_right;
+    dotNodeStreamTo(s, m_base, m_ident);
+    s << ' ' << operatorString(m_oper) << ' ' << PrecAssignment << m_right;
 }
 
 void AssignDotNode::streamTo(SourceStream& s) const
 {
-    s << DotExpr << PrecCall << m_base << "." << m_ident << " = " << PrecAssignment << m_right;
+    dotNodeStreamTo(s, m_base, m_ident);
+    s << " = " << PrecAssignment << m_right;
 }
 
@@ -807 +835 @@
 void WhileNode::streamTo(SourceStream& s) const
 {
-  s << Endl << "while (" << expr << ')' << Indent << statement << Unindent;
+    s << Endl << "while (" << expr << ')' << Indent << statement << Unindent;
 }
 
@@ -934 +962 @@
 }
 
-}
+} // namespace KJS