Changeset 2766 in webkit for trunk/JavaScriptCore/kjs/function_object.cpp

Timestamp:

Nov 19, 2002, 3:45:44 PM (23 years ago)

Author:

darin

Message:

JavaScriptCore:

• next step towards atomic identifiers; Identifier is no longer derived from UString

• kjs/identifier.h: Remove base class and add _ustring member.
• kjs/identifier.cpp: Add null and an == that works with const char *.
• kjs/property_map.cpp: Get rep through _ustring.

• kjs/function.cpp: (FunctionImp::parameterString): Call ustring().
• kjs/function_object.cpp: (FunctionProtoFuncImp::call): Ditto.
• kjs/nodes.cpp: (PropertyNode::evaluate): Ditto. (VarDeclNode::evaluate): Ditto. (ForInNode::execute): Ditto.
• kjs/nodes2string.cpp: (SourceStream::operator<<): Add overload for Identifier.
• kjs/reference.cpp: (Reference::getValue): Call ustring().
• kjs/regexp_object.cpp: (RegExpObjectImp::get): Call ustring().

WebCore:

• next step towards atomic identifiers; Identifier is no longer derived from UString

• khtml/ecma/kjs_binding.cpp: (Identifier::string): Added. (Identifier::qstring): Added.

• khtml/ecma/kjs_binding.h:
• khtml/ecma/kjs_css.cpp: (jsNameToProp): (DOMCSSStyleDeclaration::tryPut): (DOMStyleSheet::tryPut): (DOMStyleSheetList::tryGet): (DOMMediaList::tryGet): (DOMCSSRuleList::tryGet): (DOMCSSValueList::tryGet):
• khtml/ecma/kjs_dom.cpp: (DOMNodeList::hasProperty): (DOMNodeList::tryGet): (DOMNodeListFunc::DOMNodeListFunc): (DOMElement::tryGet): (DOMNamedNodeMap::hasProperty): (DOMNamedNodeMap::tryGet): (DOMNamedNodesCollection::tryGet):
• khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::tryGet): (HTMLElementFunction::HTMLElementFunction): (KJS::HTMLElement::putValue): (KJS::HTMLCollection::hasProperty): (KJS::HTMLCollection::tryGet): (KJS::HTMLSelectCollection::tryPut): (OptionConstructorImp::OptionConstructorImp):
• khtml/ecma/kjs_navigator.cpp: (Plugins::get): (MimeTypes::get): (Plugin::get):
• khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): (FrameArray::get): Use lengthPropertyName instead of "length" for better speed.

File:

• trunk/JavaScriptCore/kjs/function_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -95 +95 @@
        DeclaredFunctionImp *fi = static_cast<DeclaredFunctionImp*>
                                  (thisObj.imp());
-       return String("function " + fi->name() + "(" +
+       return String("function " + fi->name().ustring() + "(" +
          fi->parameterString() + ") " + fi->body->toString());
     } else if (thisObj.inherits(&FunctionImp::info) &&
         !static_cast<FunctionImp*>(thisObj.imp())->name().isNull()) {
-      result = String("function " + static_cast<FunctionImp*>(thisObj.imp())->name() + "()");
+      result = String("function " + static_cast<FunctionImp*>(thisObj.imp())->name().ustring() + "()");
     }
     else {