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

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.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -314 +314 @@
     class StringNode : public ExpressionNode {
     public:
-        StringNode(JSGlobalData* globalData, const UString* v) JSC_FAST_CALL
+        StringNode(JSGlobalData* globalData, const Identifier& v) JSC_FAST_CALL
             : ExpressionNode(globalData, StringType)
-            , m_value(*v)
+            , m_value(v)
         {
         }
@@ -323 +323 @@
         
         virtual bool isString() const JSC_FAST_CALL { return true; }
-        UString& value() { return m_value; }
+        const Identifier& value() { return m_value; }
         virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return true; }
         virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
@@ -329 +329 @@
 
     private:
-        UString m_value;
+        Identifier m_value;
     };