Changeset 5314 in webkit for trunk/JavaScriptCore/kjs/grammar.y

Timestamp:

Oct 30, 2003, 10:42:38 AM (22 years ago)

Author:

mjs

Message:

Reviewed by Darin.

• fixed 3426076 - Leak of JS lexer data visiting ​http://www.ebay.com

• kjs/grammar.cpp: (yyerror): Updated the commented code.
• kjs/grammar.y: Don't delete string and identifier tokens when done with them any more, they'll get cleaned up by the lexer now.
• kjs/internal.cpp: (Parser::parse): Tell lexer when done parsing.
• kjs/lexer.cpp: (Lexer::Lexer): Initialize new data members. (Lexer::lex): Use new methods to make strings and identifiers, and save them. (Lexer::makeIdentifier): Make a new Identifier and save it in an auto-growing array. (Lexer::makeUString): Likewise for UStrings. (Lexer::doneParsing): Clean up arrays of Ifentifiers and UStrings.
• kjs/lexer.h:

File:

• trunk/JavaScriptCore/kjs/grammar.y (modified) (14 diffs)

trunk/JavaScriptCore/kjs/grammar.y

@@ -168 +168 @@
   | FALSETOKEN                     { $$ = new BooleanNode(false); }
   | NUMBER                         { $$ = new NumberNode($1); }
-  | STRING                         { $$ = new StringNode($1); delete $1; }
+  | STRING                         { $$ = new StringNode($1); }
   | '/'       /* a RegExp ? */     { Lexer *l = Lexer::curr();
                                      if (!l->scanRegExp()) YYABORT;
@@ -180 +180 @@
 PrimaryExpr:
     THIS                           { $$ = new ThisNode(); }
-  | IDENT                          { $$ = new ResolveNode(*$1);
-                                     delete $1; }
+  | IDENT                          { $$ = new ResolveNode(*$1); }
   | Literal
   | ArrayLiteral
@@ -218 +217 @@
 
 PropertyName:
-    IDENT                          { $$ = new PropertyNode(*$1); delete $1; }
-  | STRING                         { $$ = new PropertyNode(Identifier(*$1)); delete $1; }
+    IDENT                          { $$ = new PropertyNode(*$1); }
+  | STRING                         { $$ = new PropertyNode(Identifier(*$1)); }
   | NUMBER                         { $$ = new PropertyNode($1); }
 ;
@@ -227 +226 @@
   | FunctionExpr
   | MemberExpr '[' Expr ']'        { $$ = new AccessorNode1($1, $3); }
-  | MemberExpr '.' IDENT           { $$ = new AccessorNode2($1, *$3); delete $3; }
+  | MemberExpr '.' IDENT           { $$ = new AccessorNode2($1, *$3); }
   | NEW MemberExpr Arguments       { $$ = new NewExprNode($2, $3); }
 ;
@@ -240 +239 @@
   | CallExpr Arguments             { $$ = new FunctionCallNode($1, $2); }
   | CallExpr '[' Expr ']'          { $$ = new AccessorNode1($1, $3); }
-  | CallExpr '.' IDENT             { $$ = new AccessorNode2($1, *$3);
-                                     delete $3; }
+  | CallExpr '.' IDENT             { $$ = new AccessorNode2($1, *$3); }
 ;
 
@@ -429 +427 @@
 
 VariableDeclaration:
-    IDENT                          { $$ = new VarDeclNode(*$1, 0); delete $1; }
-  | IDENT Initializer              { $$ = new VarDeclNode(*$1, $2); delete $1; }
+    IDENT                          { $$ = new VarDeclNode(*$1, 0); }
+  | IDENT Initializer              { $$ = new VarDeclNode(*$1, $2); }
 ;
 
@@ -471 +469 @@
   | FOR '(' VAR IDENT IN Expr ')'
             Statement              { $$ = new ForInNode(*$4,0L,$6,$8);
-                                     DBG($$,@1,@7);
-                                     delete $4; }
+                                     DBG($$,@1,@7); }
   | FOR '(' VAR IDENT Initializer IN Expr ')'
             Statement              { $$ = new ForInNode(*$4,$5,$7,$9);
-                                     DBG($$,@1,@8);
-                                     delete $4; }
+                                     DBG($$,@1,@8); }
 ;
 
@@ -490 +486 @@
                                      } else
                                        YYABORT; }
-  | CONTINUE IDENT ';'             { $$ = new ContinueNode(*$2); DBG($$,@1,@3);
-                                     delete $2; }
+  | CONTINUE IDENT ';'             { $$ = new ContinueNode(*$2); DBG($$,@1,@3); }
   | CONTINUE IDENT error           { if (automatic()) {
                                        $$ = new ContinueNode(*$2);DBG($$,@1,@2);
-                                       delete $2;
                                      } else
                                        YYABORT; }
@@ -505 +499 @@
                                      } else
                                        YYABORT; }
-  | BREAK IDENT ';'                { $$ = new BreakNode(*$2); DBG($$,@1,@3);
-                                     delete $2; }
+  | BREAK IDENT ';'                { $$ = new BreakNode(*$2); DBG($$,@1,@3); }
   | BREAK IDENT error              { if (automatic()) {
                                        $$ = new BreakNode(*$2); DBG($$,@1,@2);
-                                       delete $2;
                                      } else
                                        YYABORT;
@@ -566 +558 @@
 LabelledStatement:
     IDENT ':' Statement            { $3->pushLabel(*$1);
-                                     $$ = new LabelNode(*$1, $3);
-                                     delete $1; }
+                                     $$ = new LabelNode(*$1, $3); }
 ;
 
@@ -581 +572 @@
 
 Catch:
-    CATCH '(' IDENT ')' Block      { $$ = new CatchNode(*$3, $5); delete $3; }
+    CATCH '(' IDENT ')' Block      { $$ = new CatchNode(*$3, $5); }
 ;
 
@@ -589 +580 @@
 
 FunctionDeclaration:
-    FUNCTION IDENT '(' ')' FunctionBody    { $$ = new FuncDeclNode(*$2, 0L, $5);
-                                             delete $2; }
+    FUNCTION IDENT '(' ')' FunctionBody    { $$ = new FuncDeclNode(*$2, 0L, $5); }
   | FUNCTION IDENT '(' FormalParameterList ')' FunctionBody
-                                   { $$ = new FuncDeclNode(*$2, $4, $6);
-                                     delete $2; }
+                                   { $$ = new FuncDeclNode(*$2, $4, $6); }
 
 FunctionExpr:
@@ -603 +592 @@
 
 FormalParameterList:
-    IDENT                          { $$ = new ParameterNode(*$1); delete $1; }
-  | FormalParameterList ',' IDENT  { $$ = new ParameterNode($1, *$3); delete $3; }
+    IDENT                          { $$ = new ParameterNode(*$1); }
+  | FormalParameterList ',' IDENT  { $$ = new ParameterNode($1, *$3); }
 ;
 
@@ -633 +622 @@
 %%
 
-int yyerror (const char *)  /* Called by yyparse on error */
+int yyerror (const char * /* s */)  /* Called by yyparse on error */
 {
-//  fprintf(stderr, "ERROR: %s at line %d\n",
-//        s, KJScript::lexer()->lineNo());
+  // fprintf(stderr, "ERROR: %s at line %d\n",
+  //      s, KJS::Lexer::curr()->lineNo());
   return 1;
 }