JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / JSCell.cpp

diff --git a/runtime/JSCell.cpp b/runtime/JSCell.cpp
index 84349fe259fc694a458be2308aec7072d8bd8e74..2c403c813fb38568b0e60ce78989ddea4c953c12 100644 (file)
--- a/runtime/JSCell.cpp
+++ b/runtime/JSCell.cpp
@@ -96,7 +96,7 @@ ConstructType JSCell::getConstructData(JSCell*, ConstructData& constructData)
 
 void JSCell::put(JSCell* cell, ExecState* exec, PropertyName identifier, JSValue value, PutPropertySlot& slot)
 {
 
 void JSCell::put(JSCell* cell, ExecState* exec, PropertyName identifier, JSValue value, PutPropertySlot& slot)
 {

-    if (cell->isString()) {
+    if (cell->isString() || cell->isSymbol()) {

         JSValue(cell).putToPrimitive(exec, identifier, value, slot);
         return;
     }
         JSValue(cell).putToPrimitive(exec, identifier, value, slot);
         return;
     }


@@ -106,7 +106,7 @@ void JSCell::put(JSCell* cell, ExecState* exec, PropertyName identifier, JSValue
 
 void JSCell::putByIndex(JSCell* cell, ExecState* exec, unsigned identifier, JSValue value, bool shouldThrow)
 {
 
 void JSCell::putByIndex(JSCell* cell, ExecState* exec, unsigned identifier, JSValue value, bool shouldThrow)
 {

-    if (cell->isString()) {
+    if (cell->isString() || cell->isSymbol()) {

         PutPropertySlot slot(cell, shouldThrow);
         JSValue(cell).putToPrimitive(exec, Identifier::from(exec, identifier), value, slot);
         return;
         PutPropertySlot slot(cell, shouldThrow);
         JSValue(cell).putToPrimitive(exec, Identifier::from(exec, identifier), value, slot);
         return;


@@ -138,6 +138,8 @@ JSValue JSCell::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredTyp
 {
     if (isString())
         return static_cast<const JSString*>(this)->toPrimitive(exec, preferredType);
 {
     if (isString())
         return static_cast<const JSString*>(this)->toPrimitive(exec, preferredType);

+    if (isSymbol())
+        return static_cast<const Symbol*>(this)->toPrimitive(exec, preferredType);

     return static_cast<const JSObject*>(this)->toPrimitive(exec, preferredType);
 }
 
     return static_cast<const JSObject*>(this)->toPrimitive(exec, preferredType);
 }
 


@@ -145,6 +147,8 @@ bool JSCell::getPrimitiveNumber(ExecState* exec, double& number, JSValue& value)
 {
     if (isString())
         return static_cast<const JSString*>(this)->getPrimitiveNumber(exec, number, value);
 {
     if (isString())
         return static_cast<const JSString*>(this)->getPrimitiveNumber(exec, number, value);

+    if (isSymbol())
+        return static_cast<const Symbol*>(this)->getPrimitiveNumber(exec, number, value);

     return static_cast<const JSObject*>(this)->getPrimitiveNumber(exec, number, value);
 }
 
     return static_cast<const JSObject*>(this)->getPrimitiveNumber(exec, number, value);
 }
 


@@ -152,6 +156,8 @@ double JSCell::toNumber(ExecState* exec) const
 { 
     if (isString())
         return static_cast<const JSString*>(this)->toNumber(exec);
 { 
     if (isString())
         return static_cast<const JSString*>(this)->toNumber(exec);

+    if (isSymbol())
+        return static_cast<const Symbol*>(this)->toNumber(exec);

     return static_cast<const JSObject*>(this)->toNumber(exec);
 }
 
     return static_cast<const JSObject*>(this)->toNumber(exec);
 }
 


@@ -159,6 +165,8 @@ JSObject* JSCell::toObject(ExecState* exec, JSGlobalObject* globalObject) const
 {
     if (isString())
         return static_cast<const JSString*>(this)->toObject(exec, globalObject);
 {
     if (isString())
         return static_cast<const JSString*>(this)->toObject(exec, globalObject);

+    if (isSymbol())
+        return static_cast<const Symbol*>(this)->toObject(exec, globalObject);

     ASSERT(isObject());
     return jsCast<JSObject*>(const_cast<JSCell*>(this));
 }
     ASSERT(isObject());
     return jsCast<JSObject*>(const_cast<JSCell*>(this));
 }


@@ -236,4 +244,20 @@ PassRefPtr<ArrayBufferView> JSCell::getTypedArrayImpl(JSArrayBufferView*)
     return 0;
 }
 
     return 0;
 }
 

+uint32_t JSCell::getEnumerableLength(ExecState*, JSObject*)
+{
+    RELEASE_ASSERT_NOT_REACHED();
+    return 0;
+}
+
+void JSCell::getStructurePropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode)
+{
+    RELEASE_ASSERT_NOT_REACHED();
+}
+
+void JSCell::getGenericPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode)
+{
+    RELEASE_ASSERT_NOT_REACHED();
+}
+

 } // namespace JSC
 } // namespace JSC