Changeset 3313 in webkit for trunk/JavaScriptCore/kjs/grammar.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/grammar.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/grammar.cpp

@@ -333 +333 @@
    520,   521,   527,   532,   537,   539,   543,   545,   548,   550,
    553,   555,   558,   560,   563,   569,   573,   575,   576,   579,
-   583,   587,   590,   594,   596,   601,   603,   607,   610,   614,
-   617,   621,   623,   626,   628
+   583,   587,   590,   594,   596,   601,   603,   606,   609,   613,
+   616,   620,   622,   625,   627
 };
 #endif
@@ -1902 +1902 @@
 case 170:
 #line 550 "grammar.y"
-{ yyval.clist = yyvsp[-1].clist->append(yyvsp[0].ccl); ;
+{ yyval.clist = new ClauseListNode(yyvsp[-1].clist, yyvsp[0].ccl); ;
     break;}
 case 171:
@@ -1974 +1974 @@
 case 187:
 #line 603 "grammar.y"
-{ yyval.param = yyvsp[-2].param->append(*yyvsp[0].ident);
-                                     delete yyvsp[0].ident; ;
+{ yyval.param = new ParameterNode(yyvsp[-2].param, *yyvsp[0].ident); delete yyvsp[0].ident; ;
     break;}
 case 188:
-#line 608 "grammar.y"
+#line 607 "grammar.y"
 { yyval.body = new FunctionBodyNode(0L);
                                      DBG(yyval.body, yylsp[-1], yylsp[0]);;
     break;}
 case 189:
-#line 610 "grammar.y"
+#line 609 "grammar.y"
 { yyval.body = new FunctionBodyNode(yyvsp[-1].srcs);
                                      DBG(yyval.body, yylsp[-2], yylsp[0]);;
     break;}
 case 190:
-#line 615 "grammar.y"
+#line 614 "grammar.y"
 { yyval.prog = new ProgramNode(0L);
                                      Parser::progNode = yyval.prog; ;
     break;}
 case 191:
-#line 617 "grammar.y"
+#line 616 "grammar.y"
 { yyval.prog = new ProgramNode(yyvsp[0].srcs);
                                      Parser::progNode = yyval.prog; ;
     break;}
 case 192:
+#line 621 "grammar.y"
+{ yyval.srcs = new SourceElementsNode(yyvsp[0].stat); ;
+    break;}
+case 193:
 #line 622 "grammar.y"
-{ yyval.srcs = new SourceElementsNode(yyvsp[0].stat); ;
-    break;}
-case 193:
-#line 623 "grammar.y"
 { yyval.srcs = new SourceElementsNode(yyvsp[-1].srcs, yyvsp[0].stat); ;
     break;}
 case 194:
+#line 626 "grammar.y"
+{ yyval.stat = yyvsp[0].stat; ;
+    break;}
+case 195:
 #line 627 "grammar.y"
-{ yyval.stat = yyvsp[0].stat; ;
-    break;}
-case 195:
-#line 628 "grammar.y"
 { yyval.stat = yyvsp[0].func; ;
     break;}
@@ -2236 +2235 @@
   return 1;
 }
-#line 631 "grammar.y"
+#line 630 "grammar.y"