Changeset 37337 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 6, 2008, 11:31:07 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-10-06 Maciej Stachowiak <​[email protected]>

Not reviewed. Build fix.

• revert toBoolean changes (r37333 and r37335); need to make WebCore work with these

• API/JSValueRef.cpp: (JSValueToBoolean):
• ChangeLog:
• JavaScriptCore.exp:
• VM/CodeBlock.cpp: (JSC::CodeBlock::dump):
• VM/Machine.cpp: (JSC::Machine::privateExecute): (JSC::Machine::cti_op_loop_if_true): (JSC::Machine::cti_op_not): (JSC::Machine::cti_op_jtrue):
• kjs/ArrayPrototype.cpp: (JSC::arrayProtoFuncFilter): (JSC::arrayProtoFuncEvery): (JSC::arrayProtoFuncSome):
• kjs/BooleanConstructor.cpp: (JSC::constructBoolean): (JSC::callBooleanConstructor):
• kjs/GetterSetter.h:
• kjs/JSCell.h: (JSC::JSValue::toBoolean):
• kjs/JSNumberCell.cpp: (JSC::JSNumberCell::toBoolean):
• kjs/JSNumberCell.h:
• kjs/JSObject.cpp: (JSC::JSObject::toBoolean):
• kjs/JSObject.h:
• kjs/JSString.cpp: (JSC::JSString::toBoolean):
• kjs/JSString.h:
• kjs/JSValue.h:
• kjs/RegExpConstructor.cpp: (JSC::setRegExpConstructorMultiline):
• kjs/RegExpObject.cpp: (JSC::RegExpObject::match):
• kjs/RegExpPrototype.cpp: (JSC::regExpProtoFuncToString):

JavaScriptGlue:

2008-10-06 Maciej Stachowiak <​[email protected]>

Not reviewed. Build fix.

• revert toBoolean changes (r37333 and r37335); need to make WebCore work with these

• JSUtils.cpp: (KJSValueToCFTypeInternal):

Location:

trunk/JavaScriptCore/kjs

Files:

• ArrayPrototype.cpp (modified) (3 diffs)
• BooleanConstructor.cpp (modified) (2 diffs)
• GetterSetter.h (modified) (1 diff)
• JSCell.h (modified) (2 diffs)
• JSNumberCell.cpp (modified) (1 diff)
• JSNumberCell.h (modified) (1 diff)
• JSObject.cpp (modified) (1 diff)
• JSObject.h (modified) (3 diffs)
• JSString.cpp (modified) (1 diff)
• JSString.h (modified) (2 diffs)
• JSValue.h (modified) (1 diff)
• RegExpConstructor.cpp (modified) (1 diff)
• RegExpObject.cpp (modified) (1 diff)
• RegExpPrototype.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/ArrayPrototype.cpp

@@ -583 +583 @@
         JSValue* result = call(exec, function, callType, callData, applyThis, eachArguments);
 
-        if (result->toBoolean())
+        if (result->toBoolean(exec))
             resultArray->put(exec, filterIndex++, v);
     }
@@ -657 +657 @@
         eachArguments.append(thisObj);
 
-        bool predicateResult = call(exec, function, callType, callData, applyThis, eachArguments)->toBoolean();
+        bool predicateResult = call(exec, function, callType, callData, applyThis, eachArguments)->toBoolean(exec);
 
         if (!predicateResult) {
@@ -721 +721 @@
         eachArguments.append(thisObj);
 
-        bool predicateResult = call(exec, function, callType, callData, applyThis, eachArguments)->toBoolean();
+        bool predicateResult = call(exec, function, callType, callData, applyThis, eachArguments)->toBoolean(exec);
 
         if (predicateResult) {

trunk/JavaScriptCore/kjs/BooleanConstructor.cpp

@@ -42 +42 @@
 {
     BooleanObject* obj = new (exec) BooleanObject(exec->lexicalGlobalObject()->booleanObjectStructure());
-    obj->setInternalValue(jsBoolean(args.at(exec, 0)->toBoolean()));
+    obj->setInternalValue(jsBoolean(args.at(exec, 0)->toBoolean(exec)));
     return obj;
 }
@@ -60 +60 @@
 static JSValue* callBooleanConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
-    return jsBoolean(args.at(exec, 0)->toBoolean());
+    return jsBoolean(args.at(exec, 0)->toBoolean(exec));
 }
 

trunk/JavaScriptCore/kjs/GetterSetter.h

@@ -53 +53 @@
         virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
-        bool toBoolean(ExecState*) const;
+        virtual bool toBoolean(ExecState*) const;
         virtual double toNumber(ExecState*) const;
         virtual UString toString(ExecState*) const;

trunk/JavaScriptCore/kjs/JSCell.h

@@ -73 +73 @@
         virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType) const = 0;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*&) = 0;
-        bool toBoolean() const;
+        virtual bool toBoolean(ExecState*) const = 0;
         virtual double toNumber(ExecState*) const = 0;
         virtual UString toString(ExecState*) const = 0;
@@ -273 +273 @@
     }
 
-    inline bool JSValue::toBoolean() const
-    {
-        return JSImmediate::isImmediate(this) ? JSImmediate::toBoolean(this) : asCell()->toBoolean();
+    inline bool JSValue::toBoolean(ExecState* exec) const
+    {
+        return JSImmediate::isImmediate(this) ? JSImmediate::toBoolean(this) : asCell()->toBoolean(exec);
     }
 

trunk/JavaScriptCore/kjs/JSNumberCell.cpp

@@ -39 +39 @@
     value = this;
     return true;
+}
+
+bool JSNumberCell::toBoolean(ExecState*) const
+{
+    return m_value < 0.0 || m_value > 0.0; // false for NaN
 }
 

trunk/JavaScriptCore/kjs/JSNumberCell.h

@@ -53 +53 @@
         virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
-        bool toBoolean() const { return m_value < 0.0 || m_value > 0.0; /* false for NaN */ }
+        virtual bool toBoolean(ExecState*) const;
         virtual double toNumber(ExecState*) const;
         virtual UString toString(ExecState*) const;

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -431 +431 @@
 }
 
+bool JSObject::toBoolean(ExecState*) const
+{
+    return true;
+}
+
 double JSObject::toNumber(ExecState* exec) const
 {

trunk/JavaScriptCore/kjs/JSObject.h

@@ -29 +29 @@
 #include "ExecState.h"
 #include "JSNumberCell.h"
-#include "JSString.h"
 #include "PropertyMap.h"
 #include "PropertySlot.h"
@@ -111 +110 @@
         virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType = NoPreference) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
-        bool toBoolean() const { return true; }
+        virtual bool toBoolean(ExecState*) const;
         virtual double toNumber(ExecState*) const;
         virtual UString toString(ExecState*) const;
@@ -246 +245 @@
     }
     return false;
-}
-
-inline bool JSCell::toBoolean() const
-{
-    JSType type = structureID()->typeInfo().type();
-    if (type == NumberType)
-        return static_cast<const JSNumberCell*>(this)->toBoolean();
-    if (type == ObjectType)
-        return static_cast<const JSObject*>(this)->toBoolean();
-    ASSERT(type == StringType);
-    return static_cast<const JSString*>(this)->toBoolean();
 }
 

trunk/JavaScriptCore/kjs/JSString.cpp

@@ -41 +41 @@
     number = m_value.toDouble();
     return false;
+}
+
+bool JSString::toBoolean(ExecState*) const
+{
+    return !m_value.isEmpty();
 }
 

trunk/JavaScriptCore/kjs/JSString.h

@@ -93 +93 @@
         static PassRefPtr<StructureID> createStructureID(JSValue* proto) { return StructureID::create(proto, TypeInfo(StringType, NeedsThisConversion)); }
 
-        bool toBoolean() const { return !m_value.isEmpty(); }
-
     private:
         enum VPtrStealingHackType { VPtrStealingHack };
@@ -104 +102 @@
         virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
+        virtual bool toBoolean(ExecState*) const;
         virtual double toNumber(ExecState*) const;
         virtual JSObject* toObject(ExecState*) const;

trunk/JavaScriptCore/kjs/JSValue.h

@@ -97 +97 @@
         bool getPrimitiveNumber(ExecState*, double& number, JSValue*&);
 
-        bool toBoolean() const;
+        bool toBoolean(ExecState*) const;
 
         // toNumber conversion is expected to be side effect free if an exception has

trunk/JavaScriptCore/kjs/RegExpConstructor.cpp

@@ -312 +312 @@
 }
 
-void setRegExpConstructorMultiline(ExecState*, JSObject* baseObject, JSValue* value)
-{
-    static_cast<RegExpConstructor*>(baseObject)->setMultiline(value->toBoolean());
+void setRegExpConstructorMultiline(ExecState* exec, JSObject* baseObject, JSValue* value)
+{
+    static_cast<RegExpConstructor*>(baseObject)->setMultiline(value->toBoolean(exec));
 }
   

trunk/JavaScriptCore/kjs/RegExpObject.cpp

@@ -122 +122 @@
     }
 
-    bool global = get(exec, exec->propertyNames().global)->toBoolean();
+    bool global = get(exec, exec->propertyNames().global)->toBoolean(exec);
     int lastIndex = 0;
     if (global) {

trunk/JavaScriptCore/kjs/RegExpPrototype.cpp

@@ -107 +107 @@
     UString result = "/" + static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().source)->toString(exec);
     result.append('/');
-    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().global)->toBoolean())
+    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().global)->toBoolean(exec))
         result.append('g');
-    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().ignoreCase)->toBoolean())
+    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().ignoreCase)->toBoolean(exec))
         result.append('i');
-    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().multiline)->toBoolean())
+    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().multiline)->toBoolean(exec))
         result.append('m');
     return jsNontrivialString(exec, result);