Changeset 27842 in webkit for trunk/JavaScriptCore/kjs/interpreter.cpp

Timestamp:

Nov 15, 2007, 10:54:09 PM (18 years ago)

Author:

[email protected]

Message:

Reviewed by Eric Seidel.

Another round of grammar / parsing cleanup.

1. Created distinct parser calls for parsing function bodies vs programs. This will help later with optimizing global variable access.

2. Turned Parser into a singleton. Cleaned up Lexer's singleton interface.

3. Modified Lexer to free a little more memory when done lexing. (Added FIXMEs for similar issues that I didn't fix.)

4. Changed Lexer::makeIdentifier and Lexer::makeUString to start respecting the arguments passed to them. (No behavior change, but this problem could have caused serious problems for an unsuspecting user of these functions.)

5. Removed KJS_DEBUG_MEM because it was bit-rotted.

6. Removed Parser::prettyPrint because the same work was simpler to do at the call site.

7. Some renames:

"Parser::accept" => "Parser::didFinishParsing"
"Parser::sid" => "Parser::m_sourceID"
"Lexer::doneParsing" => "Lexer::clear"
"sid" => "sourceId"
"lineno" => "lineNo"

• JavaScriptCore.exp:
• kjs/Parser.cpp: (KJS::Parser::Parser): (KJS::Parser::parseProgram): (KJS::Parser::parseFunctionBody): (KJS::Parser::parse): (KJS::Parser::didFinishParsing): (KJS::parser):
• kjs/Parser.h: (KJS::Parser::sourceId):
• kjs/function.cpp: (KJS::GlobalFuncImp::callAsFunction):
• kjs/function_object.cpp: (FunctionObjectImp::construct):
• kjs/grammar.y:
• kjs/interpreter.cpp: (KJS::Interpreter::checkSyntax): (KJS::Interpreter::evaluate):
• kjs/interpreter.h:
• kjs/lexer.cpp: (kjsyylex): (KJS::lexer): (KJS::Lexer::Lexer): (KJS::Lexer::~Lexer): (KJS::Lexer::scanRegExp): (KJS::Lexer::doneParsing): (KJS::Lexer::makeIdentifier): (KJS::Lexer::makeUString):
• kjs/lexer.h: (KJS::Lexer::pattern): (KJS::Lexer::flags): (KJS::Lexer::sawError):
• kjs/nodes.cpp: (KJS::Node::Node): (KJS::FunctionBodyNode::FunctionBodyNode):
• kjs/nodes.h:
• kjs/testkjs.cpp: (prettyPrintScript): (kjsmain):
• kjs/ustring.cpp:
• kjs/ustring.h:

File:

• trunk/JavaScriptCore/kjs/interpreter.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -309 +309 @@
     int errLine;
     UString errMsg;
-    RefPtr<ProgramNode> progNode = Parser::parse(sourceURL, startingLineNumber, code, codeLength, 0, &errLine, &errMsg);
+    RefPtr<ProgramNode> progNode = parser().parseProgram(sourceURL, startingLineNumber, code, codeLength, 0, &errLine, &errMsg);
     if (!progNode)
         return Completion(Throw, Error::create(&m_globalExec, SyntaxError, errMsg, errLine, 0, sourceURL));
@@ -329 +329 @@
     
     // parse the source code
-    int sid;
+    int sourceId;
     int errLine;
     UString errMsg;
-    RefPtr<ProgramNode> progNode = Parser::parse(sourceURL, startingLineNumber, code, codeLength, &sid, &errLine, &errMsg);
+    RefPtr<ProgramNode> progNode = parser().parseProgram(sourceURL, startingLineNumber, code, codeLength, &sourceId, &errLine, &errMsg);
     
     // notify debugger that source has been parsed
     if (m_debugger) {
-        bool cont = m_debugger->sourceParsed(&m_globalExec, sid, sourceURL, UString(code, codeLength), startingLineNumber, errLine, errMsg);
+        bool cont = m_debugger->sourceParsed(&m_globalExec, sourceId, sourceURL, UString(code, codeLength), startingLineNumber, errLine, errMsg);
         if (!cont)
             return Completion(Break);
@@ -343 +343 @@
     // no program node means a syntax error occurred
     if (!progNode)
-        return Completion(Throw, Error::create(&m_globalExec, SyntaxError, errMsg, errLine, sid, sourceURL));
+        return Completion(Throw, Error::create(&m_globalExec, SyntaxError, errMsg, errLine, sourceId, sourceURL));
     
     m_globalExec.clearException();
@@ -605 +605 @@
 }
 
-#ifdef KJS_DEBUG_MEM
-#include "lexer.h"
-void Interpreter::finalCheck()
-{
-  fprintf(stderr,"Interpreter::finalCheck()\n");
-  Collector::collect();
-
-  Node::finalCheck();
-  Collector::finalCheck();
-  Lexer::globalClear();
-  UString::globalClear();
-}
-#endif
-
 static bool printExceptions = false;