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

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -186 +186 @@
 
   // parse the source code
-  int sid;
+  int sourceId;
   int errLine;
   UString errMsg;
-  RefPtr<ProgramNode> progNode = Parser::parse(sourceURL, lineNumber, body.data(),body.size(),&sid,&errLine,&errMsg);
+  RefPtr<FunctionBodyNode> functionBody = parser().parseFunctionBody(sourceURL, lineNumber, body.data(), body.size(), &sourceId, &errLine, &errMsg);
 
   // notify debugger that source has been parsed
@@ -195 +195 @@
   if (dbg) {
     // send empty sourceURL to indicate constructed code
-    bool cont = dbg->sourceParsed(exec, sid, UString(), body, lineNumber, errLine, errMsg);
+    bool cont = dbg->sourceParsed(exec, sourceId, UString(), body, lineNumber, errLine, errMsg);
     if (!cont) {
       dbg->imp()->abort();
@@ -203 +203 @@
 
   // no program node == syntax error - throw a syntax error
-  if (!progNode)
+  if (!functionBody)
     // we can't return a Completion(Throw) here, so just set the exception
     // and return it
-    return throwError(exec, SyntaxError, errMsg, errLine, sid, sourceURL);
+    return throwError(exec, SyntaxError, errMsg, errLine, sourceId, sourceURL);
 
   ScopeChain scopeChain;
   scopeChain.push(exec->lexicalInterpreter()->globalObject());
-  FunctionBodyNode *bodyNode = progNode.get();
-
-  FunctionImp* fimp = new FunctionImp(exec, functionName, bodyNode, scopeChain);
+
+  FunctionImp* fimp = new FunctionImp(exec, functionName, functionBody.get(), scopeChain);
   
   // parse parameter list. throw syntax error on illegal identifiers
@@ -232 +231 @@
               c++, i++;
           if (i == len) {
-              bodyNode->addParam(Identifier(param));
+              functionBody->addParam(Identifier(param));
               params++;
               break;
           } else if (*c == ',') {
-              bodyNode->addParam(Identifier(param));
+              functionBody->addParam(Identifier(param));
               params++;
               c++, i++;