Changeset 11805 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 29, 2005, 3:38:57 AM (19 years ago)

Author:

ggaren

Message:

Patch by Maks Orlovich, reviewed by mjs.

This has 2 very minor fixes, covered by KJS testsuite:

1. Enumerates string indices in property list (with the same bug as array object has in corresponding code). This is a mozilla emulation thing.
2. Permits properties with integer names in prototypes to be found

• kjs/string_object.cpp: (StringInstance::getOwnPropertySlot): (StringInstanceImp::propList):
• kjs/string_object.h:

Location:

trunk/JavaScriptCore/kjs

Files:

• string_object.cpp (modified) (3 diffs)
• string_object.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -29 +29 @@
 #include "interpreter.h"
 #include "operations.h"
+#include "reference_list.h"
 #include "regexp.h"
 #include "regexp_object.h"
@@ -76 +77 @@
     const UString s = internalValue()->toString(exec);
     const unsigned length = s.size();
-    if (index >= length)
-      return false;
+    if (index < length) {
     slot.setCustomIndex(this, index, indexGetter);
     return true;
+  }
   }
 
@@ -97 +98 @@
     return false;
   return JSObject::deleteProperty(exec, propertyName);
+}
+
+ReferenceList StringInstance::propList(ExecState *exec, bool recursive)
+{
+  ReferenceList properties = JSObject::propList(exec,recursive);
+
+  //### FIXME: should avoid duplicates with prototype
+  UString str = internalValue()->toString(exec);
+  for (int i = 0; i < str.size(); i++)
+    properties.append(Reference(this, i));
+  return properties;
 }
 

trunk/JavaScriptCore/kjs/string_object.h

@@ -36 +36 @@
     virtual void put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr = None);
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
+    virtual ReferenceList propList(ExecState *exec, bool recursive);
 
     virtual const ClassInfo *classInfo() const { return &info; }