Changeset 54510 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Feb 8, 2010, 2:26:59 PM (15 years ago)

Author:

[email protected]

Message:

Use an empty identifier instead of a null identifier for parse
tokens without an identifier.

Reviewed by Sam Weinig.

This helps encapsulate the null UStringImpl within UString.

• parser/Grammar.y:
• parser/NodeConstructors.h:

(JSC::ContinueNode::ContinueNode):
(JSC::BreakNode::BreakNode):
(JSC::ForInNode::ForInNode):

• runtime/CommonIdentifiers.cpp:

(JSC::CommonIdentifiers::CommonIdentifiers):

• runtime/CommonIdentifiers.h:
• runtime/FunctionPrototype.cpp:

(JSC::FunctionPrototype::FunctionPrototype):

Location:

trunk/JavaScriptCore/runtime

Files:

• CommonIdentifiers.cpp (modified) (1 diff)
• CommonIdentifiers.h (modified) (1 diff)
• FunctionPrototype.cpp (modified) (1 diff)
• Identifier.cpp (modified) (1 diff)
• PropertyNameArray.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/CommonIdentifiers.cpp

@@ -29 +29 @@
 
 CommonIdentifiers::CommonIdentifiers(JSGlobalData* globalData)
-    : nullIdentifier(globalData, nullCString)
-    , emptyIdentifier(globalData, "")
+    : emptyIdentifier(globalData, "")
     , underscoreProto(globalData, "__proto__")
     , thisIdentifier(globalData, "this")

trunk/JavaScriptCore/runtime/CommonIdentifiers.h

@@ -91 +91 @@
 
     public:
-        const Identifier nullIdentifier;
         const Identifier emptyIdentifier;
         const Identifier underscoreProto;

trunk/JavaScriptCore/runtime/FunctionPrototype.cpp

@@ -39 +39 @@
 
 FunctionPrototype::FunctionPrototype(ExecState* exec, NonNullPassRefPtr<Structure> structure)
-    : InternalFunction(&exec->globalData(), structure, exec->propertyNames().nullIdentifier)
+    : InternalFunction(&exec->globalData(), structure, exec->propertyNames().emptyIdentifier)
 {
     putDirectWithoutTransition(exec->propertyNames().length, jsNumber(exec, 0), DontDelete | ReadOnly | DontEnum);

trunk/JavaScriptCore/runtime/Identifier.cpp

@@ -124 +124 @@
 PassRefPtr<UString::Rep> Identifier::add(JSGlobalData* globalData, const char* c)
 {
-    if (!c) {
-        UString::Rep* rep = UString::null().rep();
-        rep->hash();
-        return rep;
-    }
+    ASSERT(c);
+
     if (!c[0]) {
         UString::Rep::empty().hash();

trunk/JavaScriptCore/runtime/PropertyNameArray.cpp

@@ -31 +31 @@
 void PropertyNameArray::add(UString::Rep* identifier)
 {
-    ASSERT(identifier == UString::null().rep() || identifier == &UString::Rep::empty() || identifier->isIdentifier());
+    ASSERT(identifier == &UString::Rep::empty() || identifier->isIdentifier());
 
     size_t size = m_data->propertyNameVector().size();