Changeset 36660 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.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/VM/CodeGenerator.cpp (modified) (2 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -1431 +1431 @@
     UNUSED_PARAM(max);
     ASSERT(node->isString());
-    UString::Rep* clause = static_cast<StringNode*>(node)->value().rep();
+    UString::Rep* clause = static_cast<StringNode*>(node)->value().ustring().rep();
     ASSERT(clause->size() == 1);
     
@@ -1461 +1461 @@
         
         ASSERT(nodes[i]->isString());
-        UString::Rep* clause = static_cast<StringNode*>(nodes[i])->value().rep();
+        UString::Rep* clause = static_cast<StringNode*>(nodes[i])->value().ustring().rep();
         OffsetLocation location;
         location.branchOffset = labels[i]->offsetFrom(switchAddress);