Better version checking for bison, flex, and gperf that falls through to other versio...

[cycript.git] / Execute.cpp

diff --git a/Execute.cpp b/Execute.cpp
index 806fd39f7478e0ef227e5344ffbd1a4f63c4a39f..8ac1b14657925697d8624e9c56de008a7d014a9c 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -165,6 +165,7 @@ JSStringRef push_s;
 JSStringRef splice_s;
 JSStringRef toCYON_s;
 JSStringRef toJSON_s;
 JSStringRef splice_s;
 JSStringRef toCYON_s;
 JSStringRef toJSON_s;

+JSStringRef toPointer_s;

 
 static JSStringRef Result_;
 
 
 static JSStringRef Result_;
 


@@ -514,12 +515,19 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value) {
     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:
             return NULL;
     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:
             return NULL;

-        /*case kJSTypeObject:
+        case kJSTypeObject: {
+            JSObjectRef object((JSObjectRef) value);

             if (JSValueIsObjectOfClass(context, value, Pointer_)) {
             if (JSValueIsObjectOfClass(context, value, Pointer_)) {

-                Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate((JSObjectRef) value)));
+                Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));

                 return internal->value_;
                 return internal->value_;

-            }*/
-        default:
+            }
+            JSValueRef toPointer(CYGetProperty(context, object, toPointer_s));
+            if (CYIsCallable(context, toPointer)) {
+                JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL));
+                _assert(value != NULL);
+                return CYCastPointer_(context, value);
+            }
+        } default:

             double number(CYCastDouble(context, value));
             if (std::isnan(number))
                 throw CYJSError(context, "cannot convert value to pointer");
             double number(CYCastDouble(context, value));
             if (std::isnan(number))
                 throw CYJSError(context, "cannot convert value to pointer");


@@ -1308,6 +1316,7 @@ void CYInitializeDynamic() {
     splice_s = JSStringCreateWithUTF8CString("splice");
     toCYON_s = JSStringCreateWithUTF8CString("toCYON");
     toJSON_s = JSStringCreateWithUTF8CString("toJSON");
     splice_s = JSStringCreateWithUTF8CString("splice");
     toCYON_s = JSStringCreateWithUTF8CString("toCYON");
     toJSON_s = JSStringCreateWithUTF8CString("toJSON");

+    toPointer_s = JSStringCreateWithUTF8CString("toPointer");

 
     Result_ = JSStringCreateWithUTF8CString("_");
 
 
     Result_ = JSStringCreateWithUTF8CString("_");
 


@@ -1429,7 +1438,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYSetProperty(context, global, CYJSString("$cyq"), &$cyq);
 
     JSObjectRef System(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, global, CYJSString("$cyq"), &$cyq);
 
     JSObjectRef System(JSObjectMake(context, NULL, NULL));

-    CYSetProperty(context, cy, CYJSString("System"), Function);
+    CYSetProperty(context, cy, CYJSString("System"), System);

 
     CYSetProperty(context, global, CYJSString("system"), System);
     CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));
 
     CYSetProperty(context, global, CYJSString("system"), System);
     CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));