Changeset 440 for trunk/JavaScriptCore/kjs/JSString.h

Timestamp:

08/18/08 11:14:49 (5 months ago)

Author:

odole

Message:

merge with webkit revision 35814

Files:

• trunk/JavaScriptCore/kjs/JSString.h (modified) (6 diffs)

trunk/JavaScriptCore/kjs/JSString.h

@@ -28 +28 @@
-#include "ExecState.h"
-#include "JSCell.h"
+#include "JSNumberCell.h"
-#include "PropertySlot.h"
-#include "identifier.h"
@@ -51 +52 @@
-
-        bool getStringPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
-
+ExecState*, 
-
-        bool canGetIndex(unsigned i) { return i < static_cast<unsigned>(m_value.size()); }
@@ -78 +79 @@
-        virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
-
-        static JSValue* lengthGetter(ExecState*, const Identifier&, const PropertySlot&);
-        static JSValue* indexGetter(ExecState*, const Identifier&, const PropertySlot&);
-        static JSValue* indexNumericPropertyGetter(ExecState*, unsigned, const PropertySlot&);
-
-        UString m_value;
-    };
@@ -96 +93 @@
-    {
-        if (propertyName == exec->propertyNames().length) {
-Custom(this, lengthGetter
+Value(jsNumber(exec, value().size())
-            return true;
-        }
@@ -103 +100 @@
-        unsigned i = propertyName.toStrictUInt32(&isStrictUInt32);
-        if (isStrictUInt32 && i < static_cast<unsigned>(m_value.size())) {
-CustomIndex(this, i, indexGetter
+Value(jsString(exec, value().substr(i, 1))
-            return true;
-        }
@@ -110 +107 @@
-    }
-        
-
+ExecState* exec, 
-    {
-        if (propertyName < static_cast<unsigned>(m_value.size())) {
-CustomNumeric(this, indexNumericPropertyGetter
+Value(jsString(exec, value().substr(propertyName, 1))
-            return true;
-        }