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

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -52 +52 @@
 int kjsyylex()
 {
-  return Lexer::curr()->lex();
+  return lexer().lex();
 }
 
 namespace KJS {
 
-static Lexer* currLexer = 0;
-
 static bool isDecimalDigit(int);
+
+Lexer& lexer()
+{
+    ASSERT(JSLock::currentThreadIsHoldingLock());
+
+    // FIXME: We'd like to avoid calling new here, but we don't currently 
+    // support tearing down the Lexer at app quit time, since that would involve
+    // tearing down its UString data members without holding the JSLock.
+    static Lexer* staticLexer = new Lexer;
+    return *staticLexer;
+}
 
 Lexer::Lexer()
@@ -76 +85 @@
   buffer8 = new char[size8];
   buffer16 = new KJS::UChar[size16];
-  currLexer = this;
 }
 
 Lexer::~Lexer()
 {
-  doneParsing();
   delete [] buffer8;
   delete [] buffer16;
 }
-
-Lexer *Lexer::curr()
-{
-  if (!currLexer) {
-    // create singleton instance
-    currLexer = new Lexer();
-  }
-  return currLexer;
-}
-
-#ifdef KJS_DEBUG_MEM
-void Lexer::globalClear()
-{
-  delete currLexer;
-  currLexer = 0L;
-}
-#endif
 
 void Lexer::setCode(const UString &sourceURL, int startingLineNumber, const KJS::UChar *c, unsigned int len)
@@ -786 +776 @@
 KJS::UChar Lexer::convertUnicode(int c1, int c2, int c3, int c4)
 {
+  // FIXME: This conversion is lossy. See http://bugs.webkit.org/show_bug.cgi?id=4920.
   return KJS::UChar((convertHex(c1) << 4) + convertHex(c2),
                (convertHex(c3) << 4) + convertHex(c4));
@@ -851 +842 @@
     }
     else { // end of regexp
-      pattern = UString(buffer16, pos16);
+      m_pattern = UString(buffer16, pos16);
       pos16 = 0;
       shift(1);
@@ -863 +854 @@
     shift(1);
   }
-  flags = UString(buffer16, pos16);
+  m_flags = UString(buffer16, pos16);
 
   return true;
 }
 
-
-void Lexer::doneParsing()
-{
-  for (unsigned i = 0; i < numIdentifiers; i++) {
+void Lexer::clear()
+{
+  for (unsigned i = 0; i < numIdentifiers; i++)
     delete identifiers[i];
-  }
   fastFree(identifiers);
   identifiers = 0;
@@ -879 +868 @@
   identifiersCapacity = 0;
 
-  for (unsigned i = 0; i < numStrings; i++) {
+  for (unsigned i = 0; i < numStrings; i++)
     delete strings[i];
-  }
   fastFree(strings);
   strings = 0;
   numStrings = 0;
   stringsCapacity = 0;
+  
+  m_pattern = 0;
+  m_flags = 0;
+  m_sourceURL = 0;
 }
 
@@ -891 +883 @@
 const int growthFactor = 2;
 
-// FIXME: this completely ignores its parameters, instead using buffer16 and pos16 - wtf?
-Identifier *Lexer::makeIdentifier(KJS::UChar*, unsigned int)
+Identifier* Lexer::makeIdentifier(KJS::UChar* buffer, unsigned int pos)
 {
   if (numIdentifiers == identifiersCapacity) {
@@ -899 +890 @@
   }
 
-  KJS::Identifier *identifier = new KJS::Identifier(buffer16, pos16);
+  KJS::Identifier *identifier = new KJS::Identifier(buffer, pos);
   identifiers[numIdentifiers++] = identifier;
   return identifier;
 }
  
-// FIXME: this completely ignores its parameters, instead using buffer16 and pos16 - wtf?
-UString *Lexer::makeUString(KJS::UChar*, unsigned int)
+UString* Lexer::makeUString(KJS::UChar* buffer, unsigned int pos)
 {
   if (numStrings == stringsCapacity) {
@@ -912 +902 @@
   }
 
-  UString *string = new UString(buffer16, pos16);
+  UString *string = new UString(buffer, pos);
   strings[numStrings++] = string;
   return string;
 }
 
-}
+} // namespace KJS