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

trunk/JavaScriptCore/kjs/Parser.cpp

@@ -4 +4 @@
  *  Copyright (C) 1999-2001 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
- *  Copyright (C) 2003, 2006 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2006, 2007 Apple Inc.
  *
  *  This library is free software; you can redistribute it and/or
@@ -31 +31 @@
 #include <wtf/Vector.h>
 
-extern int kjsyyparse();
-
 namespace KJS {
 
-int Parser::sid = 0;
+Parser::Parser()
+    : m_sourceId(0)
+{
+}
 
-static RefPtr<ProgramNode>* progNode;
-
-PassRefPtr<ProgramNode> Parser::parse(const UString& sourceURL, int startingLineNumber,
+PassRefPtr<ProgramNode> Parser::parseProgram(const UString& sourceURL, int startingLineNumber,
     const UChar* code, unsigned length,
     int* sourceId, int* errLine, UString* errMsg)
 {
+    parse(sourceURL, startingLineNumber, code, length, sourceId, errLine, errMsg);
+    return m_progNode.release();
+}
+
+PassRefPtr<FunctionBodyNode> Parser::parseFunctionBody(const UString& sourceURL, int startingLineNumber,
+    const UChar* code, unsigned length,
+    int* sourceId, int* errLine, UString* errMsg)
+{
+    parse(sourceURL, startingLineNumber, code, length, sourceId, errLine, errMsg);
+    return m_progNode.release();
+}
+
+void Parser::parse(const UString& sourceURL, int startingLineNumber,
+    const UChar* code, unsigned length,
+    int* sourceId, int* errLine, UString* errMsg)
+{
+    ASSERT(!m_progNode);
+
     if (errLine)
         *errLine = -1;
     if (errMsg)
         *errMsg = 0;
-    if (!progNode)
-        progNode = new RefPtr<ProgramNode>;
+        
+    Lexer& lexer = KJS::lexer();
 
-    Lexer::curr()->setCode(sourceURL, startingLineNumber, code, length);
-    *progNode = 0;
-    sid++;
+    lexer.setCode(sourceURL, startingLineNumber, code, length);
+    m_sourceId++;
     if (sourceId)
-        *sourceId = sid;
-
-    // Enable this and the #define YYDEBUG in grammar.y to debug a parse error
-    //extern int kjsyydebug;
-    //kjsyydebug=1;
+        *sourceId = m_sourceId;
 
     int parseError = kjsyyparse();
-    bool lexError = Lexer::curr()->sawError();
-    Lexer::curr()->doneParsing();
-    PassRefPtr<ProgramNode> prog = progNode->release();
-    *progNode = 0;
+    bool lexError = lexer.sawError();
+    lexer.clear();
 
     Node::clearNewNodes();
 
     if (parseError || lexError) {
-        int eline = Lexer::curr()->lineNo();
         if (errLine)
-            *errLine = eline;
+            *errLine = lexer.lineNo();
         if (errMsg)
             *errMsg = "Parse error";
-        return 0;
+        m_progNode = 0;
     }
-
-    return prog;
 }
 
-void Parser::accept(PassRefPtr<ProgramNode> prog)
+void Parser::didFinishParsing(PassRefPtr<ProgramNode> progNode)
 {
-    *progNode = prog;
+    m_progNode = progNode;
 }
 
-UString Parser::prettyPrint(const UString& code, int* errLine, UString* errMsg)
+Parser& parser()
 {
-    RefPtr<ProgramNode> progNode = parse(UString(), 0, code.data(), code.size(), 0, errLine, errMsg);
-    if (!progNode)
-        return 0;
-    
-    return progNode->toString();
+    ASSERT(JSLock::currentThreadIsHoldingLock());
+
+    static Parser staticParser;
+    return staticParser;
 }
 
-}
+} // namespace KJS