Changeset 11525 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Dec 10, 2005, 4:38:07 PM (19 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Maciej.

• eliminated the old Undefined(), Null(), Boolean(), Number(), and String()

Code now uses jsUndefined(), jsNull(), jsBoolean(), jsNumber(), and jsString().

• bindings/NP_jsobject.cpp: (_NPN_Evaluate):
• bindings/c/c_instance.cpp: (KJS::Bindings::CInstance::invokeMethod): (KJS::Bindings::CInstance::invokeDefaultMethod):
• bindings/c/c_runtime.cpp: (CField::valueFromInstance):
• bindings/c/c_utility.cpp: (KJS::Bindings::convertNPVariantToValue):
• bindings/jni/jni_instance.cpp: (JavaInstance::invokeMethod): (JavaInstance::invokeDefaultMethod):
• bindings/jni/jni_jsobject.cpp: (JSObject::eval): (JSObject::convertJObjectToValue):
• bindings/jni/jni_runtime.cpp: (JavaArray::convertJObjectToArray): (JavaField::valueFromInstance): (JavaArray::valueAt):
• bindings/objc/WebScriptObject.mm: (-[WebScriptObject callWebScriptMethod:withArguments:]): (-[WebScriptObject evaluateWebScript:]): (-[WebScriptObject valueForKey:]): (-[WebScriptObject webScriptValueAtIndex:]):
• bindings/objc/objc_instance.mm: (ObjcInstance::invokeMethod): (ObjcInstance::invokeDefaultMethod): (ObjcInstance::getValueOfUndefinedField):
• bindings/objc/objc_runtime.mm: (ObjcField::valueFromInstance): (ObjcFallbackObjectImp::callAsFunction):
• bindings/objc/objc_utility.mm: (KJS::Bindings::convertNSStringToString): (KJS::Bindings::convertObjcValueToValue):
• bindings/runtime.h: (KJS::Bindings::Class::fallbackObject): (KJS::Bindings::Instance::getValueOfUndefinedField): (KJS::Bindings::Instance::valueOf):
• bindings/runtime_array.cpp: (RuntimeArrayImp::lengthGetter):
• bindings/runtime_method.cpp: (RuntimeMethodImp::lengthGetter): (RuntimeMethodImp::callAsFunction): (RuntimeMethodImp::execute):
• kjs/array_object.cpp: (ArrayInstanceImp::lengthGetter): (CompareWithCompareFunctionArguments::CompareWithCompareFunctionArguments): (ArrayPrototypeImp::ArrayPrototypeImp): (ArrayProtoFuncImp::ArrayProtoFuncImp): (ArrayProtoFuncImp::callAsFunction): (ArrayObjectImp::ArrayObjectImp):
• kjs/bool_object.cpp: (BooleanPrototypeImp::BooleanPrototypeImp): (BooleanProtoFuncImp::callAsFunction): (BooleanObjectImp::BooleanObjectImp): (BooleanObjectImp::callAsFunction):
• kjs/error_object.cpp: (ErrorPrototypeImp::ErrorPrototypeImp): (ErrorProtoFuncImp::ErrorProtoFuncImp): (ErrorProtoFuncImp::callAsFunction): (ErrorObjectImp::ErrorObjectImp): (NativeErrorImp::NativeErrorImp):
• kjs/function.cpp: (KJS::FunctionImp::callAsFunction): (KJS::FunctionImp::processParameters): (KJS::FunctionImp::argumentsGetter): (KJS::FunctionImp::lengthGetter): (KJS::DeclaredFunctionImp::execute): (KJS::encode): (KJS::decode): (KJS::GlobalFuncImp::callAsFunction):
• kjs/function_object.cpp: (FunctionPrototypeImp::FunctionPrototypeImp): (FunctionPrototypeImp::callAsFunction): (FunctionProtoFuncImp::callAsFunction): (FunctionObjectImp::FunctionObjectImp):
• kjs/internal.cpp: (KJS::InterpreterImp::initGlobalObject):
• kjs/interpreter.h:
• kjs/lookup.h:
• kjs/math_object.cpp: (MathObjectImp::getValueProperty): (MathFuncImp::callAsFunction):
• kjs/nodes.cpp: (Node::setExceptionDetailsIfNeeded): (NullNode::evaluate): (PropertyNode::evaluate): (FunctionCallBracketNode::evaluate): (FunctionCallDotNode::evaluate): (PostfixBracketNode::evaluate): (PostfixDotNode::evaluate): (VoidNode::evaluate): (PrefixBracketNode::evaluate): (PrefixDotNode::evaluate): (ShiftNode::evaluate): (valueForReadModifyAssignment): (AssignDotNode::evaluate): (AssignBracketNode::evaluate): (VarDeclNode::evaluate): (VarDeclNode::processVarDecls): (VarDeclListNode::evaluate): (ReturnNode::execute): (CaseClauseNode::evalStatements): (ParameterNode::evaluate): (FuncDeclNode::processFuncDecl):
• kjs/nodes.h: (KJS::StatementNode::evaluate):
• kjs/number_object.cpp: (NumberPrototypeImp::NumberPrototypeImp): (NumberProtoFuncImp::callAsFunction): (NumberObjectImp::NumberObjectImp): (NumberObjectImp::getValueProperty): (NumberObjectImp::callAsFunction):
• kjs/object.cpp: (KJS::ObjectImp::get): (KJS::Error::create):
• kjs/object_object.cpp: (ObjectPrototypeImp::ObjectPrototypeImp): (ObjectProtoFuncImp::callAsFunction): (ObjectObjectImp::ObjectObjectImp):
• kjs/property_slot.cpp: (KJS::PropertySlot::undefinedGetter):
• kjs/regexp_object.cpp: (RegExpPrototypeImp::RegExpPrototypeImp): (RegExpProtoFuncImp::callAsFunction): (RegExpObjectImp::RegExpObjectImp): (RegExpObjectImp::arrayOfMatches): (RegExpObjectImp::getBackref): (RegExpObjectImp::getLastMatch): (RegExpObjectImp::getLastParen): (RegExpObjectImp::getLeftContext): (RegExpObjectImp::getRightContext): (RegExpObjectImp::getValueProperty): (RegExpObjectImp::construct):
• kjs/string_object.cpp: (StringInstanceImp::StringInstanceImp): (StringPrototypeImp::StringPrototypeImp): (replace): (StringProtoFuncImp::callAsFunction): (StringObjectImp::StringObjectImp): (StringObjectImp::callAsFunction): (StringObjectFuncImp::StringObjectFuncImp): (StringObjectFuncImp::callAsFunction):
• kjs/testkjs.cpp: (TestFunctionImp::callAsFunction): (VersionFunctionImp::callAsFunction):
• kjs/value.h:

WebCore:

Reviewed by Maciej.

• eliminated the old Undefined(), Null(), Boolean(), Number(), and String()

Code now uses jsUndefined(), jsNull(), jsBoolean(), jsNumber(), and jsString().

• khtml/ecma/domparser.cpp: (KJS::DOMParserProtoFunc::callAsFunction):
• khtml/ecma/kjs_binding.cpp: (KJS::jsStringOrNull): (KJS::setDOMException):
• khtml/ecma/kjs_binding.h: (KJS::DOMFunction::toPrimitive):
• khtml/ecma/kjs_css.cpp: (KJS::DOMCSSStyleDeclaration::indexGetter): (KJS::DOMCSSStyleDeclaration::cssPropertyGetter): (KJS::DOMCSSStyleDeclaration::getValueProperty): (KJS::DOMCSSStyleDeclarationProtoFunc::callAsFunction): (KJS::DOMStyleSheet::getValueProperty): (KJS::getDOMStyleSheet): (KJS::DOMStyleSheetList::getValueProperty): (KJS::getDOMStyleSheetList): (KJS::DOMStyleSheetListFunc::callAsFunction): (KJS::DOMMediaList::getValueProperty): (KJS::DOMMediaList::indexGetter): (KJS::KJS::DOMMediaListProtoFunc::callAsFunction): (KJS::DOMCSSStyleSheet::getValueProperty): (KJS::DOMCSSStyleSheetProtoFunc::callAsFunction): (KJS::DOMCSSRuleList::getValueProperty): (KJS::DOMCSSRuleListFunc::callAsFunction): (KJS::DOMCSSRule::getValueProperty): (KJS::DOMCSSRuleFunc::callAsFunction): (KJS::CSSRuleConstructor::getValueProperty): (KJS::DOMCSSValue::getValueProperty): (KJS::getDOMCSSValue): (KJS::CSSValueConstructor::getValueProperty): (KJS::DOMCSSPrimitiveValue::getValueProperty): (KJS::DOMCSSPrimitiveValueProtoFunc::callAsFunction): (KJS::CSSPrimitiveValueConstructor::getValueProperty): (KJS::DOMCSSValueList::getValueProperty): (KJS::DOMCSSValueListFunc::callAsFunction): (KJS::DOMCounter::getValueProperty):
• khtml/ecma/kjs_dom.cpp: (KJS::DOMNode::getValueProperty): (KJS::DOMNode::toPrimitive): (KJS::DOMNode::getListener): (KJS::DOMNodeProtoFunc::callAsFunction): (KJS::DOMNodeList::toPrimitive): (KJS::DOMNodeList::getValueProperty): (KJS::DOMNodeList::callAsFunction): (KJS::DOMAttr::getValueProperty): (KJS::DOMDocument::getValueProperty): (KJS::DOMDocumentProtoFunc::callAsFunction): (KJS::DOMElement::getValueProperty): (KJS::DOMElement::attributeGetter): (KJS::DOMElementProtoFunc::callAsFunction): (KJS::DOMDOMImplementationProtoFunc::callAsFunction): (KJS::DOMDocumentType::getValueProperty): (KJS::DOMNamedNodeMap::lengthGetter): (KJS::DOMNamedNodeMapProtoFunc::callAsFunction): (KJS::DOMProcessingInstruction::getValueProperty): (KJS::DOMNotation::getValueProperty): (KJS::DOMEntity::getValueProperty): (KJS::getDOMNode): (KJS::NodeConstructor::getValueProperty): (KJS::DOMExceptionConstructor::getValueProperty): (KJS::DOMNamedNodesCollection::lengthGetter): (KJS::DOMCharacterData::getValueProperty): (KJS::DOMCharacterDataProtoFunc::callAsFunction): (KJS::DOMTextProtoFunc::callAsFunction):
• khtml/ecma/kjs_events.cpp: (KJS::JSLazyEventListener::parseCode): (KJS::EventConstructor::getValueProperty): (KJS::DOMEvent::getValueProperty): (KJS::DOMEventProtoFunc::callAsFunction): (KJS::getDOMEvent): (KJS::EventExceptionConstructor::getValueProperty): (KJS::DOMUIEvent::getValueProperty): (KJS::DOMUIEventProtoFunc::callAsFunction): (KJS::DOMMouseEvent::getValueProperty): (KJS::DOMMouseEventProtoFunc::callAsFunction): (KJS::DOMKeyboardEvent::getValueProperty): (KJS::DOMKeyboardEventProtoFunc::callAsFunction): (KJS::MutationEventConstructor::getValueProperty): (KJS::DOMMutationEvent::getValueProperty): (KJS::DOMMutationEventProtoFunc::callAsFunction): (KJS::DOMWheelEvent::getValueProperty): (KJS::DOMWheelEventProtoFunc::callAsFunction): (KJS::stringOrUndefined): (KJS::Clipboard::getValueProperty): (KJS::ClipboardProtoFunc::callAsFunction):
• khtml/ecma/kjs_html.cpp: (KJS::KJS::HTMLDocFunction::callAsFunction): (KJS::HTMLDocument::getValueProperty): (KJS::HTMLElement::framesetNameGetter): (KJS::HTMLElement::frameWindowPropertyGetter): (KJS::HTMLElement::runtimeObjectPropertyGetter): (KJS::KJS::HTMLElement::callAsFunction): (KJS::HTMLElement::htmlGetter): (KJS::HTMLElement::headGetter): (KJS::HTMLElement::linkGetter): (KJS::HTMLElement::titleGetter): (KJS::HTMLElement::metaGetter): (KJS::HTMLElement::baseGetter): (KJS::HTMLElement::isIndexGetter): (KJS::HTMLElement::styleGetter): (KJS::HTMLElement::bodyGetter): (KJS::HTMLElement::formGetter): (KJS::HTMLElement::selectGetter): (KJS::HTMLElement::optGroupGetter): (KJS::HTMLElement::optionGetter): (KJS::getInputSelectionStart): (KJS::getInputSelectionEnd): (KJS::HTMLElement::inputGetter): (KJS::HTMLElement::textAreaGetter): (KJS::HTMLElement::buttonGetter): (KJS::HTMLElement::labelGetter): (KJS::HTMLElement::fieldSetGetter): (KJS::HTMLElement::legendGetter): (KJS::HTMLElement::uListGetter): (KJS::HTMLElement::oListGetter): (KJS::HTMLElement::dListGetter): (KJS::HTMLElement::dirGetter): (KJS::HTMLElement::menuGetter): (KJS::HTMLElement::liGetter): (KJS::HTMLElement::divGetter): (KJS::HTMLElement::paragraphGetter): (KJS::HTMLElement::headingGetter): (KJS::HTMLElement::blockQuoteGetter): (KJS::HTMLElement::quoteGetter): (KJS::HTMLElement::preGetter): (KJS::HTMLElement::brGetter): (KJS::HTMLElement::baseFontGetter): (KJS::HTMLElement::fontGetter): (KJS::HTMLElement::hrGetter): (KJS::HTMLElement::modGetter): (KJS::HTMLElement::anchorGetter): (KJS::HTMLElement::imageGetter): (KJS::HTMLElement::objectGetter): (KJS::HTMLElement::paramGetter): (KJS::HTMLElement::appletGetter): (KJS::HTMLElement::mapGetter): (KJS::HTMLElement::areaGetter): (KJS::HTMLElement::scriptGetter): (KJS::HTMLElement::tableGetter): (KJS::HTMLElement::tableCaptionGetter): (KJS::HTMLElement::tableColGetter): (KJS::HTMLElement::tableSectionGetter): (KJS::HTMLElement::tableRowGetter): (KJS::HTMLElement::tableCellGetter): (KJS::HTMLElement::frameSetGetter): (KJS::HTMLElement::frameGetter): (KJS::HTMLElement::iFrameGetter): (KJS::HTMLElement::marqueeGetter): (KJS::HTMLElement::getValueProperty): (KJS::HTMLElementFunction::HTMLElementFunction): (KJS::KJS::HTMLElementFunction::callAsFunction): (KJS::HTMLCollection::lengthGetter): (KJS::KJS::HTMLCollection::callAsFunction): (KJS::KJS::HTMLCollection::getNamedItems): (KJS::KJS::HTMLCollectionProtoFunc::callAsFunction): (KJS::HTMLSelectCollection::selectedIndexGetter): (KJS::HTMLSelectCollection::getOwnPropertySlot): (KJS::OptionConstructorImp::OptionConstructorImp): (KJS::Image::getValueProperty): (KJS::KJS::Context2DFunction::callAsFunction): (KJS::Context2D::getValueProperty): (KJS::Context2D::Context2D): (KJS::GradientFunction::callAsFunction): (KJS::Gradient::getValueProperty): (KJS::ImagePattern::getValueProperty): (KJS::getSelectHTMLCollection):
• khtml/ecma/kjs_navigator.cpp: (KJS::Navigator::getValueProperty): (KJS::Plugins::getValueProperty): (KJS::Plugins::nameGetter): (KJS::MimeTypes::getValueProperty): (KJS::MimeTypes::nameGetter): (KJS::Plugin::getValueProperty): (KJS::Plugin::nameGetter): (KJS::MimeType::getValueProperty): (KJS::PluginsFunc::callAsFunction): (KJS::NavigatorFunc::callAsFunction):
• khtml/ecma/kjs_proxy.cpp: (TestFunctionImp::callAsFunction):
• khtml/ecma/kjs_range.cpp: (KJS::DOMRange::getValueProperty): (KJS::DOMRangeProtoFunc::callAsFunction): (KJS::RangeConstructor::getValueProperty):
• khtml/ecma/kjs_traversal.cpp: (KJS::DOMNodeIterator::getValueProperty): (KJS::DOMNodeIteratorProtoFunc::callAsFunction): (KJS::NodeFilterConstructor::getValueProperty): (KJS::DOMNodeFilterProtoFunc::callAsFunction): (KJS::DOMTreeWalker::getValueProperty): (KJS::DOMTreeWalkerProtoFunc::callAsFunction):
• khtml/ecma/kjs_views.cpp: (KJS::DOMAbstractViewProtoFunc::callAsFunction):
• khtml/ecma/kjs_window.cpp: (KJS::Screen::getValueProperty): (KJS::Window::retrieve): (KJS::showModalDialog): (KJS::Window::getValueProperty): (KJS::Window::getListener): (KJS::WindowFunc::callAsFunction): (KJS::FrameArray::getValueProperty): (KJS::FrameArray::indexGetter): (KJS::FrameArray::nameGetter): (KJS::Location::getValueProperty): (KJS::Location::toPrimitive): (KJS::LocationFunc::callAsFunction): (KJS::Selection::getValueProperty): (KJS::Selection::toPrimitive): (KJS::SelectionFunc::callAsFunction): (KJS::BarInfo::getValueProperty): (KJS::History::getValueProperty): (KJS::HistoryFunc::callAsFunction):
• khtml/ecma/xmlhttprequest.cpp: (KJS::XMLHttpRequest::getValueProperty): (KJS::XMLHttpRequest::getAllResponseHeaders): (KJS::XMLHttpRequest::getResponseHeader): (KJS::XMLHttpRequest::getStatus): (KJS::XMLHttpRequest::getStatusText): (KJS::XMLHttpRequestProtoFunc::callAsFunction):
• khtml/ecma/xmlserializer.cpp: (KJS::XMLSerializerProtoFunc::callAsFunction):
• ksvg2/ecma/Ecma.cpp: (KSVG::getSVGPathSeg):
• ksvg2/ecma/GlobalObject.cpp: (GlobalObject::get):
• kwq/WebCoreScriptDebugger.mm: (-[WebCoreScriptCallFrame evaluateWebScript:]):

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (29 diffs)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -44 +44 @@
   : ObjectImp(proto)
 {
-  setInternalValue(String(""));
+  setInternalValue(jsString(""));
 }
 
@@ -50 +50 @@
   : ObjectImp(proto)
 {
-  setInternalValue(String(string));
+  setInternalValue(jsString(string));
 }
 
@@ -146 +146 @@
 {
   // The constructor will be added later, after StringObjectImp has been built
-  putDirect(lengthPropertyName, jsZero(), DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, jsNumber(0), DontDelete|ReadOnly|DontEnum);
 }
 
@@ -339 +339 @@
     delete [] replacements;
 
-    return String(result);
+    return jsString(result);
   }
   
@@ -348 +348 @@
   // Do the replacement
   if (matchPos == -1)
-    return String(source);
+    return jsString(source);
   
   if (replacementFunction) {
@@ -361 +361 @@
   }
 
-  return String(source.substr(0, matchPos) + replacementString + source.substr(matchPos + matchLen));
+  return jsString(source.substr(0, matchPos) + replacementString + source.substr(matchPos + matchLen));
 }
 
@@ -374 +374 @@
       return throwError(exec, TypeError);
 
-    return String(thisObj->internalValue()->toString(exec));
+    return jsString(thisObj->internalValue()->toString(exec));
   }
 
@@ -401 +401 @@
     else
       u = "";
-    result = String(u);
+    result = jsString(u);
     break;
   case CharCodeAt:
@@ -408 +408 @@
     dpos = a0->isUndefined() ? 0 : a0->toInteger(exec);
     if (dpos >= 0 && dpos < len) // false for NaN
-      result = Number(s[static_cast<int>(dpos)].unicode());
+      result = jsNumber(s[static_cast<int>(dpos)].unicode());
     else
       result = jsNaN();
@@ -417 +417 @@
         s += it->toString(exec);
     }
-    result = String(s);
+    result = jsString(s);
     break;
   }
@@ -432 +432 @@
         dpos = 0;
     }
-    result = Number(s.find(u2, static_cast<int>(dpos)));
+    result = jsNumber(s.find(u2, static_cast<int>(dpos)));
     break;
   case LastIndexOf:
@@ -447 +447 @@
         dpos = 0;
     }
-    result = Number(s.rfind(u2, static_cast<int>(dpos)));
+    result = jsNumber(s.rfind(u2, static_cast<int>(dpos)));
     break;
   case Match:
@@ -468 +468 @@
     UString mstr = regExpObj->performMatch(reg, u, 0, &pos);
     if (id == Search) {
-      result = Number(pos);
+      result = jsNumber(pos);
     } else {
       // Exec
@@ -474 +474 @@
         // case without 'g' flag is handled like RegExp.prototype.exec
         if (mstr.isNull()) {
-          result = Null();
+          result = jsNull();
         } else {
           result = regExpObj->arrayOfMatches(exec,mstr);
@@ -486 +486 @@
             list.append(jsUndefined());
           else
-            list.append(String(mstr));
+            list.append(jsString(mstr));
           lastIndex = pos;
           pos += mstr.isEmpty() ? 1 : mstr.size();
@@ -492 +492 @@
         }
         if (imp)
-          imp->put(exec, "lastIndex", Number(lastIndex), DontDelete|DontEnum);
+          imp->put(exec, "lastIndex", jsNumber(lastIndex), DontDelete|DontEnum);
         if (list.isEmpty()) {
           // if there are no matches at all, it's important to return
           // Null instead of an empty array, because this matches
           // other browsers and because Null is a false value.
-          result = Null(); 
+          result = jsNull(); 
         } else {
           result = exec->lexicalInterpreter()->builtinArray()->construct(exec, list);
@@ -521 +521 @@
         if (to > len)
           to = len;
-        result = String(s.substr(static_cast<int>(from), static_cast<int>(to - from)));
+        result = jsString(s.substr(static_cast<int>(from), static_cast<int>(to - from)));
       } else {
-        result = String("");
+        result = jsString("");
       }
       break;
@@ -539 +539 @@
       if (u.isEmpty() && !reg.match(u, 0).isNull()) {
         // empty string matched by regexp -> empty array
-        res->put(exec,lengthPropertyName, Number(0));
+        res->put(exec,lengthPropertyName, jsNumber(0));
         break;
       }
@@ -553 +553 @@
         pos = mpos + (mstr.isEmpty() ? 1 : mstr.size());
         if (mpos != p0 || !mstr.isEmpty()) {
-          res->put(exec,i, String(u.substr(p0, mpos-p0)));
+          res->put(exec,i, jsString(u.substr(p0, mpos-p0)));
           p0 = mpos + mstr.size();
           i++;
@@ -563 +563 @@
         if (u.isEmpty()) {
           // empty separator matches empty string -> empty array
-          put(exec,lengthPropertyName, Number(0));
+          put(exec,lengthPropertyName, jsNumber(0));
           break;
         } else {
           while (static_cast<uint32_t>(i) != limit && i < u.size()-1)
-            res->put(exec, i++, String(u.substr(p0++, 1)));
+            res->put(exec, i++, jsString(u.substr(p0++, 1)));
         }
       } else {
         while (static_cast<uint32_t>(i) != limit && (pos = u.find(u2, p0)) >= 0) {
-          res->put(exec, i, String(u.substr(p0, pos-p0)));
+          res->put(exec, i, jsString(u.substr(p0, pos-p0)));
           p0 = pos + u2.size();
           i++;
@@ -579 +579 @@
     // add remaining string, if any
     if (static_cast<uint32_t>(i) != limit)
-      res->put(exec, i++, String(u.substr(p0)));
-    res->put(exec,lengthPropertyName, Number(i));
+      res->put(exec, i++, jsString(u.substr(p0)));
+    res->put(exec,lengthPropertyName, jsNumber(i));
     }
     break;
@@ -599 +599 @@
         d2 = len - d;
     }
-    result = String(s.substr(static_cast<int>(d), static_cast<int>(d2)));
+    result = jsString(s.substr(static_cast<int>(d), static_cast<int>(d2)));
     break;
   }
@@ -624 +624 @@
       start = temp;
     }
-    result = String(s.substr((int)start, (int)end-(int)start));
+    result = jsString(s.substr((int)start, (int)end-(int)start));
     }
     break;
@@ -632 +632 @@
     for (i = 0; i < len; i++)
       u[i] = u[i].toLower();
-    result = String(u);
+    result = jsString(u);
     break;
   case ToUpperCase:
@@ -639 +639 @@
     for (i = 0; i < len; i++)
       u[i] = u[i].toUpper();
-    result = String(u);
+    result = jsString(u);
     break;
 #ifndef KJS_PURE_ECMA
   case Big:
-    result = String("<big>" + s + "</big>");
+    result = jsString("<big>" + s + "</big>");
     break;
   case Small:
-    result = String("<small>" + s + "</small>");
+    result = jsString("<small>" + s + "</small>");
     break;
   case Blink:
-    result = String("<blink>" + s + "</blink>");
+    result = jsString("<blink>" + s + "</blink>");
     break;
   case Bold:
-    result = String("<b>" + s + "</b>");
+    result = jsString("<b>" + s + "</b>");
     break;
   case Fixed:
-    result = String("<tt>" + s + "</tt>");
+    result = jsString("<tt>" + s + "</tt>");
     break;
   case Italics:
-    result = String("<i>" + s + "</i>");
+    result = jsString("<i>" + s + "</i>");
     break;
   case Strike:
-    result = String("<strike>" + s + "</strike>");
+    result = jsString("<strike>" + s + "</strike>");
     break;
   case Sub:
-    result = String("<sub>" + s + "</sub>");
+    result = jsString("<sub>" + s + "</sub>");
     break;
   case Sup:
-    result = String("<sup>" + s + "</sup>");
+    result = jsString("<sup>" + s + "</sup>");
     break;
   case Fontcolor:
-    result = String("<font color=\"" + a0->toString(exec) + "\">" + s + "</font>");
+    result = jsString("<font color=\"" + a0->toString(exec) + "\">" + s + "</font>");
     break;
   case Fontsize:
-    result = String("<font size=\"" + a0->toString(exec) + "\">" + s + "</font>");
+    result = jsString("<font size=\"" + a0->toString(exec) + "\">" + s + "</font>");
     break;
   case Anchor:
-    result = String("<a name=\"" + a0->toString(exec) + "\">" + s + "</a>");
+    result = jsString("<a name=\"" + a0->toString(exec) + "\">" + s + "</a>");
     break;
   case Link:
-    result = String("<a href=\"" + a0->toString(exec) + "\">" + s + "</a>");
+    result = jsString("<a href=\"" + a0->toString(exec) + "\">" + s + "</a>");
     break;
 #endif
@@ -700 +700 @@
 
   // no. of arguments for constructor
-  putDirect(lengthPropertyName, jsOne(), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, jsNumber(1), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -727 +727 @@
 {
   if (args.isEmpty())
-    return String("");
+    return jsString("");
   else {
     ValueImp *v = args[0];
-    return String(v->toString(exec));
+    return jsString(v->toString(exec));
   }
 }
@@ -740 +740 @@
   : InternalFunctionImp(funcProto)
 {
-  putDirect(lengthPropertyName, jsOne(), DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, jsNumber(1), DontDelete|ReadOnly|DontEnum);
 }
 
@@ -764 +764 @@
     s = "";
 
-  return String(s);
-}
+  return jsString(s);
+}