Use C int promotion rule to work around BOOL cast.

diff --git a/Execute.cpp b/Execute.cpp
index 5669730ddb35c6ae2751a9cd3da3c8d765b2b923..18bdce662cd135149d142b17d4a561e6f482f472 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -198,6 +198,7 @@ JSStringRef constructor_s;
 JSStringRef cy_s;
 JSStringRef cyi_s;
 JSStringRef cyt_s;
 JSStringRef cy_s;
 JSStringRef cyi_s;
 JSStringRef cyt_s;

+JSStringRef cyt__s;

 JSStringRef length_s;
 JSStringRef message_s;
 JSStringRef name_s;
 JSStringRef length_s;
 JSStringRef message_s;
 JSStringRef name_s;


@@ -874,31 +875,39 @@ void Function::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *
     _assert(false);
 }
 
     _assert(false);
 }
 

+// XXX: this code is getting worse, not better :/
+

 #define CYFromFFI_(Type_) \
 template <> \
 JSValueRef Primitive<Type_>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \
     JSValueRef value(CYCastJSValue(context, *reinterpret_cast<Type_ *>(data))); \
     JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value)); \
 #define CYFromFFI_(Type_) \
 template <> \
 JSValueRef Primitive<Type_>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \
     JSValueRef value(CYCastJSValue(context, *reinterpret_cast<Type_ *>(data))); \
     JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value)); \

-    CYSetProperty(context, typed, cyt_s, CYMakeType(context, *this), kJSPropertyAttributeDontEnum); \
+    CYSetProperty(context, typed, cyt__s, CYMakeType(context, *this), kJSPropertyAttributeDontEnum); \

     return typed; \
 }
 
     return typed; \
 }
 

+#define CYFromFFI_2(Type_) \
+template <> \
+JSValueRef Primitive<Type_>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \
+    return CYCastJSValue(context, *reinterpret_cast<Type_ *>(data)); \
+}
+

 CYFromFFI_(wchar_t)
 CYFromFFI_(float)
 CYFromFFI_(double)
 CYFromFFI_(long double)
 
 CYFromFFI_(wchar_t)
 CYFromFFI_(float)
 CYFromFFI_(double)
 CYFromFFI_(long double)
 

-CYFromFFI_(signed char)
-CYFromFFI_(signed int)
+CYFromFFI_2(signed char)
+CYFromFFI_2(signed int)

 CYFromFFI_(signed long int)
 CYFromFFI_(signed long long int)
 CYFromFFI_(signed long int)
 CYFromFFI_(signed long long int)

-CYFromFFI_(signed short int)
+CYFromFFI_2(signed short int)

 
 

-CYFromFFI_(unsigned char)
-CYFromFFI_(unsigned int)
+CYFromFFI_2(unsigned char)
+CYFromFFI_2(unsigned int)

 CYFromFFI_(unsigned long int)
 CYFromFFI_(unsigned long long int)
 CYFromFFI_(unsigned long int)
 CYFromFFI_(unsigned long long int)

-CYFromFFI_(unsigned short int)
+CYFromFFI_2(unsigned short int)

 
 #ifdef __SIZEOF_INT128__
 CYFromFFI_(signed __int128)
 
 #ifdef __SIZEOF_INT128__
 CYFromFFI_(signed __int128)


@@ -1273,7 +1282,10 @@ static sig::Type *CYGetType(CYPool &pool, JSContextRef context, JSValueRef value
     if (JSValueIsNull(context, value))
         return &PointerToVoid_;
     JSObjectRef object(CYCastJSObject(context, value));
     if (JSValueIsNull(context, value))
         return &PointerToVoid_;
     JSObjectRef object(CYCastJSObject(context, value));

-    JSObjectRef type(CYCastJSObject(context, CYGetProperty(context, object, cyt_s)));
+    JSValueRef check(CYGetProperty(context, object, cyt_s));
+    if (JSValueIsUndefined(context, check))
+        CYThrow("could not infer type of argument '%s'", CYPoolCString(pool, context, value));
+    JSObjectRef type(CYCastJSObject(context, check));

     _assert(JSValueIsObjectOfClass(context, type, CYPrivate<Type_privateData>::Class_));
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(type)));
     return internal->type_;
     _assert(JSValueIsObjectOfClass(context, type, CYPrivate<Type_privateData>::Class_));
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(type)));
     return internal->type_;


@@ -2234,6 +2246,7 @@ void CYInitializeDynamic() {
     cy_s = JSStringCreateWithUTF8CString("$cy");
     cyi_s = JSStringCreateWithUTF8CString("$cyi");
     cyt_s = JSStringCreateWithUTF8CString("$cyt");
     cy_s = JSStringCreateWithUTF8CString("$cy");
     cyi_s = JSStringCreateWithUTF8CString("$cyi");
     cyt_s = JSStringCreateWithUTF8CString("$cyt");

+    cyt__s = JSStringCreateWithUTF8CString("$cyt_");

     length_s = JSStringCreateWithUTF8CString("length");
     message_s = JSStringCreateWithUTF8CString("message");
     name_s = JSStringCreateWithUTF8CString("name");
     length_s = JSStringCreateWithUTF8CString("length");
     message_s = JSStringCreateWithUTF8CString("message");
     name_s = JSStringCreateWithUTF8CString("name");

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 64dcbace747a36b799f855f58fa30b95a481d987..3265b2ef5596f92d32ec238dbcdcd85460515051 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -46,6 +46,7 @@ extern JSStringRef constructor_s;
 extern JSStringRef cy_s;
 extern JSStringRef cyi_s;
 extern JSStringRef cyt_s;
 extern JSStringRef cy_s;
 extern JSStringRef cyi_s;
 extern JSStringRef cyt_s;

+extern JSStringRef cyt__s;

 extern JSStringRef length_s;
 extern JSStringRef message_s;
 extern JSStringRef name_s;
 extern JSStringRef length_s;
 extern JSStringRef message_s;
 extern JSStringRef name_s;

diff --git a/libcycript.cy b/libcycript.cy
index 5c809401c01394c5c2dba712d65107058767260d..7690a299f7eadf6aa43074ecf5433c17c1dbf797 100644 (file)
--- a/libcycript.cy
+++ b/libcycript.cy
@@ -21,6 +21,13 @@
 
 (function() {
 
 
 (function() {
 

+Number.prototype.__defineGetter__('$cyt', function() {
+    if (this.$cyt_)
+        return this.$cyt_;
+    if ((this|0) == this)
+        return int;
+});
+

 this.typeid = function(object) {
     return object.$cyt;
 };
 this.typeid = function(object) {
     return object.$cyt;
 };