Added more UIKit bridging, better factored property access on structs (fixing a crash...

[cycript.git] / Application.mm

diff --git a/Application.mm b/Application.mm
index aaf1d5e510f313d0cbe670d76f9b2554eae3369b..49828302de9d80e7471fedef2b6296230985e8f5 100644 (file)
--- a/Application.mm
+++ b/Application.mm
@@ -24,10 +24,12 @@
 
 static jmp_buf ctrlc_;
 
 
 static jmp_buf ctrlc_;
 

-void sigint(int) {
+static void sigint(int) {

     longjmp(ctrlc_, 1);
 }
 
     longjmp(ctrlc_, 1);
 }
 

+static JSStringRef Result_;
+

 void Run(const char *code, FILE *fout) { _pooled
     JSStringRef script(JSStringCreateWithUTF8CString(code));
 
 void Run(const char *code, FILE *fout) { _pooled
     JSStringRef script(JSStringCreateWithUTF8CString(code));
 


@@ -37,30 +39,30 @@ void Run(const char *code, FILE *fout) { _pooled
     JSValueRef result(JSEvaluateScript(context, script, NULL, NULL, 0, &exception));
     JSStringRelease(script);
 
     JSValueRef result(JSEvaluateScript(context, script, NULL, NULL, 0, &exception));
     JSStringRelease(script);
 

-    if (exception != NULL)
+    if (exception != NULL) { error:

         result = exception;
         result = exception;

+        exception = NULL;
+    }

 
     if (!JSValueIsUndefined(context, result)) {
 
     if (!JSValueIsUndefined(context, result)) {

-        CFStringRef json;
+        CYPool pool;
+        const char *json;

 
 

-        @try { json:
-            json = CYCopyJSONString(context, result);
-        } @catch (id error) {
-            CYThrow(context, error, &result);
-            goto json;
-        }
+        json = CYPoolJSONString(pool, context, result, &exception);
+        if (exception != NULL)
+            goto error;
+
+        CYSetProperty(context, CYGetGlobalObject(context), Result_, result);

 
         if (fout != NULL) {
 
         if (fout != NULL) {

-            fputs([reinterpret_cast<const NSString *>(json) UTF8String], fout);
+            fputs(json, fout);

             fputs("\n", fout);
             fflush(fout);
         }
             fputs("\n", fout);
             fflush(fout);
         }

-
-        CFRelease(json);

     }
 }
 
     }
 }
 

-void Console() {
+static void Console() {

     bool bypass(false);
     bool debug(false);
 
     bool bypass(false);
     bool debug(false);
 


@@ -162,7 +164,7 @@ void Console() {
     fflush(fout);
 }
 
     fflush(fout);
 }
 

-void *Map(const char *path, size_t *psize) {
+static void *Map(const char *path, size_t *psize) {

     int fd;
     _syscall(fd = open(path, O_RDONLY));
 
     int fd;
     _syscall(fd = open(path, O_RDONLY));
 


@@ -189,6 +191,8 @@ int main(int argc, const char *argv[]) {
         script = argv[1];
     }
 
         script = argv[1];
     }
 

+    Result_ = CYCopyJSString("_");
+

     if (script == NULL || strcmp(script, "-") == 0)
         Console();
     else {
     if (script == NULL || strcmp(script, "-") == 0)
         Console();
     else {