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

Timestamp:

Nov 18, 2002, 10:53:35 PM (23 years ago)

Author:

darin

Message:

• property and string improvements giving a 7% or so improvement in JavaScript iBench

• kjs/property_map.h: Rewrite to use a hash table.
• kjs/property_map.cpp: Ditto.

• kjs/string_object.h:
• kjs/string_object.cpp: (StringInstanceImp::StringInstanceImp): Construct a string with the right value instead of putting the string in later. (StringInstanceImp::get): Get the length from the string, not a separate property. (StringInstanceImp::put): Ignore attempts to set length, since we don't put it in the property map. (StringInstanceImp::hasProperty): Return true for length. (StringInstanceImp::deleteProperty): Return false for length. (StringObjectImp::construct): Call new StringInstanceImp constructor. Don't try to set a length property.

• kjs/ustring.h: Make the rep deref know how to deallocate the rep.
• kjs/ustring.cpp: (UString::release): Move the real work to the rep's deref, since the hash table now uses the rep directly.

• kjs/object.h: Remove unused field.

File:

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

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -42 +42 @@
 {
   setInternalValue(String(""));
+}
+
+StringInstanceImp::StringInstanceImp(const Object &proto, const UString &string)
+  : ObjectImp(proto)
+{
+  setInternalValue(String(string));
+}
+
+Value StringInstanceImp::get(ExecState *exec, const UString &propertyName) const
+{
+  if (propertyName == lengthPropertyName)
+    return Number(internalValue().toString(exec).size());
+  return ObjectImp::get(exec, propertyName);
+}
+
+void StringInstanceImp::put(ExecState *exec, const UString &propertyName, const Value &value, int attr)
+{
+  if (propertyName == lengthPropertyName)
+    return;
+  ObjectImp::put(exec, propertyName, value, attr);
+}
+
+bool StringInstanceImp::hasProperty(ExecState *exec, const UString &propertyName) const
+{
+  if (propertyName == lengthPropertyName)
+    return true;
+  return ObjectImp::hasProperty(exec, propertyName);
+}
+
+bool StringInstanceImp::deleteProperty(ExecState *exec, const UString &propertyName)
+{
+  if (propertyName == lengthPropertyName)
+    return false;
+  return ObjectImp::deleteProperty(exec, propertyName);
 }
 
@@ -517 +551 @@
 {
   Object proto = exec->interpreter()->builtinStringPrototype();
-  Object obj(new StringInstanceImp(proto ));
-
-  UString s;
-  if (args.size() > 0)
-    s = args.begin()->dispatchToString(exec);
-  else
-    s = UString("");
-
-  obj.setInternalValue(String(s));
-  obj.put(exec, lengthPropertyName, Number(s.size()), ReadOnly|DontEnum|DontDelete);
-
-  return obj;
+  if (args.size() == 0)
+    return Object(new StringInstanceImp(proto));
+  return Object(new StringInstanceImp(proto, args.begin()->dispatchToString(exec)));
 }