Changeset 36660 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Sep 18, 2008, 11:32:12 PM (17 years ago)

Author:

Darin Adler

Message:

2008-09-18 Darin Adler <Darin Adler>

Reviewed by Maciej Stachowiak.

• ​https://bugs.webkit.org/show_bug.cgi?id=20927 simplify/streamline the code to turn strings into identifiers while parsing

• kjs/grammar.y: Get rid of string from the union, and use ident for STRING as well as for IDENT.

• kjs/lexer.cpp: (JSC::Lexer::lex): Use makeIdentifier instead of makeUString for String.
• kjs/lexer.h: Remove makeUString.

• kjs/nodes.h: Changed StringNode to hold an Identifier instead of UString.

• VM/CodeGenerator.cpp: (JSC::keyForCharacterSwitch): Updated since StringNode now holds an Identifier. (JSC::prepareJumpTableForStringSwitch): Ditto.
• kjs/nodes.cpp: (JSC::StringNode::emitCode): Ditto. The comment from here is now in the lexer. (JSC::processClauseList): Ditto.
• kjs/nodes2string.cpp: (JSC::StringNode::streamTo): Ditto.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -254 +254 @@
     if (dst == ignoredResult())
         return 0;
-
-    // We atomize constant strings, in case they're later used in property lookup.
-    return generator.emitLoad(dst, jsOwnedString(generator.globalExec(), Identifier(generator.globalExec(), m_value).ustring()));
+    return generator.emitLoad(dst, jsOwnedString(generator.globalExec(), m_value.ustring()));
 }
 
@@ -1495 +1493 @@
                 break;
             }
-            UString& value = static_cast<StringNode*>(clauseExpression)->value();
+            const UString& value = static_cast<StringNode*>(clauseExpression)->value().ustring();
             if (singleCharacterSwitch &= value.size() == 1) {
                 int32_t intVal = value.rep()->data()[0];