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

Timestamp:

Jan 13, 2003, 7:49:23 AM (22 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• turned more recursion into iteration, and fixed some backwards stuff

• kjs/grammar.y: Use the normal idiom for CaseClauses and FormalParameterList rather than using append().
• kjs/grammar.cpp: Regenerated.

• kjs/nodes.h: Change ClauseListNode and ParameterNode to use the normal idiom, and got rid of append methods. Also added friend declarations and calls to reverseList().
• kjs/nodes.cpp: (StatListNode::ref): Iteration, not recursion. (StatListNode::deref): Iteration, not recursion. (StatListNode::execute): Iteration, not recursion. (StatListNode::processVarDecls): Iteration, not recursion. (CaseClauseNode::reverseList): Added. (ClauseListNode::ref): Iteration, not recursion. (ClauseListNode::deref): Iteration, not recursion. (ClauseListNode::processVarDecls): Iteration, not recursion. (CaseBlockNode::reverseLists): Added. (ParameterNode::ref): Iteration, not recursion. (ParameterNode::deref): Iteration, not recursion. (FuncDeclNode::reverseParameterList): Added. (FuncExprNode::reverseParameterList): Added. (SourceElementsNode::ref): Iteration, not recursion. (SourceElementsNode::deref): Iteration, not recursion. (SourceElementsNode::execute): Use variable name of n to match other functions. (SourceElementsNode::processFuncDecl): Ditto. (SourceElementsNode::processVarDecls): Ditto.

• kjs/nodes2string.cpp: (SourceStream::operator<<): Used a switch statement for a bit of added clarity. (ElementNode::streamTo): Iteration, not recursion. (PropertyValueNode::streamTo): Iteration, not recursion. (ArgumentListNode::streamTo): Iteration, not recursion. (StatListNode::streamTo): Iteration, not recursion, and fixed order. (VarDeclListNode::streamTo): Iteration, not recursion. (ClauseListNode::streamTo): Used for statement to match other functions. (CaseBlockNode::streamTo): Used for statement to match other functions. (ParameterNode::streamTo): Iteration, not recursion. (SourceElementsNode::streamTo): Iteration, not recursion, and fixed order that has been backwards since I changed how this works in nodes.cpp.

File:

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

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -82 +82 @@
 SourceStream& SourceStream::operator<<(Format f)
 {
-  if (f == Endl)
-    str += "\n" + ind;
-  else if (f == Indent)
-    ind += "  ";
-  else
-    ind = ind.substr(0, ind.size() - 2);
+  switch (f) {
+    case Endl:
+      str += "\n" + ind;
+      break;
+    case Indent:
+      ind += "  ";
+      break;
+    case Unindent:
+      ind = ind.substr(0, ind.size() - 2);
+      break;
+  }
 
   return *this;
@@ -122 +127 @@
 void ElementNode::streamTo(SourceStream &s) const
 {
-  for (int i = 0; i < elision; i++)
-    s << ",";
-  s << node;
-  if (list)
-    s << "," << list;
+  for (const ElementNode *n = this; n; n = n->list) {
+    for (int i = 0; i < n->elision; i++)
+      s << ",";
+    s << n->node;
+  }
 }
 
@@ -147 +152 @@
 void PropertyValueNode::streamTo(SourceStream &s) const
 {
-  s << name << ": " << assign;
-  if (list)
-    s << ", " << list;
+  for (const PropertyValueNode *n = this; n; n = n->list)
+    s << n->name << ": " << n->assign;
 }
 
@@ -173 +177 @@
 {
   s << expr;
-  if (list)
-    s << ", " << list;
+  for (ArgumentListNode *n = list; n; n = n->list)
+    s << ", " << n->expr;
 }
 
@@ -389 +393 @@
 void StatListNode::streamTo(SourceStream &s) const
 {
-  s << list << statement;
+  for (const StatListNode *n = this; n; n = n->list)
+    s << n->statement;
 }
 
@@ -405 +410 @@
 {
   s << var;
-  if (list)
-    s << ", " << list;
+  for (VarDeclListNode *n = list; n; n = n->list)
+    s << ", " << n->var;
 }
 
@@ -517 +522 @@
 void ClauseListNode::streamTo(SourceStream &s) const
 {
-  const ClauseListNode *l = this;
-  do {
-    s << l;
-    l = l->nx;
-  } while (l);
+  for (const ClauseListNode *n = this; n; n = n->next())
+    s << n->clause();
 }
 
 void CaseBlockNode::streamTo(SourceStream &s) const
 {
-  const ClauseListNode *cl = list1;
-  while (cl) {
-    s << cl->clause();
-    cl = cl->next();
-  }
+  for (const ClauseListNode *n = list1; n; n = n->next())
+    s << n->clause();
   if (def)
     s << def;
-  cl = list2;
-  while (cl) {
-    s << cl->clause();
-    cl = cl->next();
-  }
+  for (const ClauseListNode *n = list2; n; n = n->next())
+    s << n->clause();
 }
 
@@ -578 +574 @@
 {
   s << id;
-  if (next)
-    s << ", " << next;
+  for (ParameterNode *n = next; n; n = n->next)
+    s << ", " << n->id;
 }
 
@@ -598 +594 @@
 void SourceElementsNode::streamTo(SourceStream &s) const
 {
-  s << elements << element;
-}
-
+  for (const SourceElementsNode *n = this; n; n = n->elements)
+    s << n->element;
+}
+