Delay expansion of MAKE, to allow using jobserver.

[cycript.git] / Execute.cpp

diff --git a/Execute.cpp b/Execute.cpp
index f7ee72434860c0f23547c7367287024614439d17..673c8dafb870c3921272bb3c1f9761622a3ef898 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -86,7 +86,7 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J
 
 void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef value) {
     JSObjectSetPrototype(context, object, value);
-    _assert(CYIsEqual(context, JSObjectGetPrototype(context, object), value));
+    _assert(CYIsStrictEqual(context, JSObjectGetPrototype(context, object), value));
 }
 /* }}} */
 /* JavaScript Strings {{{ */
@@ -241,9 +241,6 @@ struct Struct_privateData :
     }
 };
 
-typedef std::map<const char *, Type_privateData *, CYCStringLess> TypeMap;
-static TypeMap Types_;
-
 JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
     Struct_privateData *internal(new Struct_privateData(context, owner));
     CYPool &pool(*internal->pool_);
@@ -326,6 +323,10 @@ bool CYIsEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs) {
     return _jsccall(JSValueIsEqual, context, lhs, rhs);
 }
 
+bool CYIsStrictEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs) {
+    return JSValueIsStrictEqual(context, lhs, rhs);
+}
+
 size_t CYArrayLength(JSContextRef context, JSObjectRef array) {
     return CYCastDouble(context, CYGetProperty(context, array, length_s));
 }