Fixed argument serialization comma bug.

[cycript.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index 64f0bf52d2d5f920ef6844af2c08517c22ecb8f2..61edf639dc6653952bbb5c40450d3f18d8be5c27 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -40,12 +40,13 @@
 #define _GNU_SOURCE
 
 #include <substrate.h>
-#include "Struct.hpp"
+#include "cycript.hpp"
 
 #include "sig/parse.hpp"
 #include "sig/ffi_type.hpp"
 
 #include "Pooling.hpp"
+#include "Struct.hpp"
 
 #include <unistd.h>
 
@@ -53,14 +54,6 @@
 #include <CoreFoundation/CFLogUtilities.h>
 
 #include <CFNetwork/CFNetwork.h>
-#include <Foundation/Foundation.h>
-
-#include <JavaScriptCore/JSBase.h>
-#include <JavaScriptCore/JSValueRef.h>
-#include <JavaScriptCore/JSObjectRef.h>
-#include <JavaScriptCore/JSContextRef.h>
-#include <JavaScriptCore/JSStringRef.h>
-#include <JavaScriptCore/JSStringRefCF.h>
 
 #include <WebKit/WebScriptObject.h>
 
@@ -72,7 +65,6 @@
 #include <ext/stdio_filebuf.h>
 #include <set>
 #include <map>
-#include <sstream>
 
 #include "Parser.hpp"
 #include "Cycript.tab.hh"
@@ -90,8 +82,6 @@
 } while (false)
 
 
-#define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
-
 static JSContextRef Context_;
 
 static JSClassRef Functor_;
@@ -123,6 +113,7 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
 @end
 
 @interface NSObject (Cycript)
+- (bool) cy$isUndefined;
 - (NSString *) cy$toJSON;
 - (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
 @end
@@ -137,6 +128,10 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
 
 @implementation NSObject (Cycript)
 
+- (bool) cy$isUndefined {
+    return false;
+}
+
 - (NSString *) cy$toJSON {
     return [self description];
 }
@@ -149,6 +144,10 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
 
 @implementation WebUndefined (Cycript)
 
+- (bool) cy$isUndefined {
+    return true;
+}
+
 - (NSString *) cy$toJSON {
     return @"undefined";
 }
@@ -171,7 +170,12 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
             [json appendString:@","];
         else
             comma = true;
-        [json appendString:[object cy$toJSON]];
+        if (![object cy$isUndefined])
+            [json appendString:[object cy$toJSON]];
+        else {
+            [json appendString:@","];
+            comma = false;
+        }
     }
 
     [json appendString:@"]"];
@@ -271,7 +275,7 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
 
 @end
 
-JSContextRef JSGetContext() {
+JSContextRef CYGetJSContext() {
     return Context_;
 }
 
@@ -479,7 +483,7 @@ void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
 
 @end
 
-CFStringRef JSValueToJSONCopy(JSContextRef context, JSValueRef value) {
+CFStringRef CYCopyJSONString(JSContextRef context, JSValueRef value) {
     id object(CYCastNSObject(context, value));
     return reinterpret_cast<CFStringRef>([(object == nil ? @"null" : [object cy$toJSON]) retain]);
 }
@@ -507,13 +511,13 @@ static void OnData(CFSocketRef socket, CFSocketCallBackType type, CFDataRef addr
                 JSStringRef script(JSStringCreateWithCFString(code));
                 CFRelease(code);
 
-                JSValueRef result(JSEvaluateScript(JSGetContext(), script, NULL, NULL, 0, NULL));
+                JSValueRef result(JSEvaluateScript(CYGetJSContext(), script, NULL, NULL, 0, NULL));
                 JSStringRelease(script);
 
                 CFHTTPMessageRef response(CFHTTPMessageCreateResponse(kCFAllocatorDefault, 200, NULL, kCFHTTPVersion1_1));
                 CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Type"), CFSTR("application/json; charset=utf-8"));
 
-                CFStringRef json(JSValueToJSONCopy(JSGetContext(), result));
+                CFStringRef json(CYCopyJSONString(CYGetJSContext(), result));
                 CFDataRef body(CFStringCreateExternalRepresentation(kCFAllocatorDefault, json, kCFStringEncodingUTF8, NULL));
                 CFRelease(json);
 
@@ -841,7 +845,7 @@ static JSValueRef Global_getProperty(JSContextRef context, JSObjectRef object, J
         if (NSMutableArray *entry = [Bridge_ objectForKey:name])
             switch ([[entry objectAtIndex:0] intValue]) {
                 case 0:
-                    return JSEvaluateScript(JSGetContext(), CYJSString([entry objectAtIndex:1]), NULL, NULL, 0, NULL);
+                    return JSEvaluateScript(CYGetJSContext(), CYJSString([entry objectAtIndex:1]), NULL, NULL, 0, NULL);
                 case 1:
                     return CYMakeFunction(context, [name cy$symbol], [[entry objectAtIndex:1] UTF8String]);
                 case 2:
@@ -918,6 +922,9 @@ static JSStaticValue Pointer_staticValues[2] = {
 };
 
 CYDriver::CYDriver(const std::string &filename) :
+    state_(CYClear),
+    data_(NULL),
+    size_(0),
     filename_(filename),
     source_(NULL)
 {
@@ -928,68 +935,11 @@ CYDriver::~CYDriver() {
     ScannerDestroy();
 }
 
-void CYDriver::Clear() {
-    source_ = NULL;
-    pool_.Clear();
-}
-
-extern int cydebug;
-
-void cy::parser::error(const cy::parser::location_type &loc, const std::string &msg) {
-    std::cerr << loc << ": " << msg << std::endl;
-}
-
-void CYConsole(FILE *fin, FILE *fout, FILE *ferr) {
-    //cydebug = 1;
-
-    CYDriver driver("<stdin>");
-
-    while (!feof(fin)) { _pooled
-        driver.Clear();
-
-        cy::parser parser(driver);
-        if (parser.parse() != 0)
-            continue;
-
-        if (driver.source_ == NULL) {
-            fputs("driver.source == NULL\n", fout);
-            break;
-        }
-
-        std::ostringstream str;
-        driver.source_->Show(str);
-
-        std::string code(str.str());
-        std::cout << code << std::endl;
-
-        JSStringRef script(JSStringCreateWithUTF8CString(code.c_str()));
-
-        JSContextRef context(JSGetContext());
-
-        JSValueRef exception(NULL);
-        JSValueRef result(JSEvaluateScript(context, script, NULL, NULL, 0, &exception));
-        JSStringRelease(script);
-
-        if (exception != NULL)
-            result = exception;
-
-        if (!JSValueIsUndefined(context, result)) {
-            CFStringRef json;
-
-            @try { json:
-                json = JSValueToJSONCopy(context, result);
-            } @catch (id error) {
-                CYThrow(context, error, &result);
-                goto json;
-            }
-
-            fputs([reinterpret_cast<const NSString *>(json) UTF8String], fout);
-            CFRelease(json);
-
-            fputs("\n", fout);
-            fflush(fout);
-        }
-    }
+void cy::parser::error(const cy::parser::location_type &location, const std::string &message) {
+    CYDriver::Error error;
+    error.location_ = location;
+    error.message_ = message;
+    driver.errors_.push_back(error);
 }
 
 MSInitialize { _pooled
@@ -1062,8 +1012,8 @@ MSInitialize { _pooled
     length_ = JSStringCreateWithUTF8CString("length");
 
     JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetProperty(JSGetContext(), global, CYJSString("Array"), &exception));
+    JSValueRef value(JSObjectGetProperty(CYGetJSContext(), global, CYJSString("Array"), &exception));
     CYThrow(context, exception);
-    Array_ = JSValueToObject(JSGetContext(), value, &exception);
+    Array_ = JSValueToObject(CYGetJSContext(), value, &exception);
     CYThrow(context, exception);
 }