Changeset 54510 in webkit

Timestamp:

Feb 8, 2010, 2:26:59 PM (16 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

Files:

• ChangeLog (modified) (1 diff)
• parser/Grammar.y (modified) (3 diffs)
• parser/NodeConstructors.h (modified) (3 diffs)
• runtime/CommonIdentifiers.cpp (modified) (1 diff)
• runtime/CommonIdentifiers.h (modified) (1 diff)
• runtime/FunctionPrototype.cpp (modified) (1 diff)
• runtime/Identifier.cpp (modified) (1 diff)
• runtime/PropertyNameArray.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-02-08  Gavin Barraclough  <[email protected]>
+
+        Reviewed by Sam Weinig.
+
+        Use an empty identifier instead of a null identifier for parse
+        tokens without an identifier.
+
+        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):
+
 2010-02-08  Gustavo Noronha Silva  <[email protected]>
 

trunk/JavaScriptCore/parser/Grammar.y

@@ -1148 +1148 @@
 
 TryStatement:
-    TRY Block FINALLY Block             { $$ = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, $2.m_node, GLOBAL_DATA->propertyNames->nullIdentifier, false, 0, $4.m_node),
+    TRY Block FINALLY Block             { $$ = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, $2.m_node, GLOBAL_DATA->propertyNames->emptyIdentifier, false, 0, $4.m_node),
                                                                                          mergeDeclarationLists($2.m_varDeclarations, $4.m_varDeclarations),
                                                                                          mergeDeclarationLists($2.m_funcDeclarations, $4.m_funcDeclarations),
@@ -1189 +1189 @@
 
 FunctionExpr:
-    FUNCTION '(' ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeInfo(new (GLOBAL_DATA) FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, $5, GLOBAL_DATA->lexer->sourceCode($4, $6, @4.first_line)), ClosureFeature, 0); setStatementLocation($5, @4, @6); }
+    FUNCTION '(' ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeInfo(new (GLOBAL_DATA) FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->emptyIdentifier, $5, GLOBAL_DATA->lexer->sourceCode($4, $6, @4.first_line)), ClosureFeature, 0); setStatementLocation($5, @4, @6); }
     | FUNCTION '(' FormalParameterList ')' OPENBRACE FunctionBody CLOSEBRACE
       {
-          $$ = createNodeInfo(new (GLOBAL_DATA) FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, $6, GLOBAL_DATA->lexer->sourceCode($5, $7, @5.first_line), $3.m_node.head), $3.m_features | ClosureFeature, 0);
+          $$ = createNodeInfo(new (GLOBAL_DATA) FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->emptyIdentifier, $6, GLOBAL_DATA->lexer->sourceCode($5, $7, @5.first_line), $3.m_node.head), $3.m_features | ClosureFeature, 0);
           if ($3.m_features & ArgumentsFeature)
               $6->setUsesArguments();
@@ -1982 +1982 @@
     else
         return 0;
-    return new (globalData) PropertyNode(globalData, name, new (globalData) FuncExprNode(globalData, globalData->propertyNames->nullIdentifier, body, source, params), type);
+    return new (globalData) PropertyNode(globalData, name, new (globalData) FuncExprNode(globalData, globalData->propertyNames->emptyIdentifier, body, source, params), type);
 }
 

trunk/JavaScriptCore/parser/NodeConstructors.h

@@ -742 +742 @@
     inline ContinueNode::ContinueNode(JSGlobalData* globalData)
         : StatementNode(globalData)
-        , m_ident(globalData->propertyNames->nullIdentifier)
+        , m_ident(globalData->propertyNames->emptyIdentifier)
     {
     }
@@ -754 +754 @@
     inline BreakNode::BreakNode(JSGlobalData* globalData)
         : StatementNode(globalData)
-        , m_ident(globalData->propertyNames->nullIdentifier)
+        , m_ident(globalData->propertyNames->emptyIdentifier)
     {
     }
@@ -878 +878 @@
     inline ForInNode::ForInNode(JSGlobalData* globalData, ExpressionNode* l, ExpressionNode* expr, StatementNode* statement)
         : StatementNode(globalData)
-        , m_ident(globalData->propertyNames->nullIdentifier)
+        , m_ident(globalData->propertyNames->emptyIdentifier)
         , m_init(0)
         , m_lexpr(l)

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();