{Functor,Selector}.type should return @encode().

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index 30f611735a0495d074b355efdb7af4f175d60876..f79711b5ba5e1382fcf55801be9212697e089406 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -34,13 +34,13 @@
 #include <sstream>
 #include <cmath>
 
-#include "Parser.hpp"
-#include "Cycript.tab.hh"
-
 #include "Error.hpp"
-#include "String.hpp"
 #include "Execute.hpp"
-#include "JavaScript.hpp"
+#include "Parser.hpp"
+#include "String.hpp"
+
+#include "Cycript.tab.hh"
+#include "Driver.hpp"
 
 #include "ConvertUTF.h"
 
@@ -191,27 +191,7 @@ double CYCastDouble(const char *value) {
     return CYCastDouble(value, strlen(value));
 }
 
-size_t CYArrayLength(JSContextRef context, JSObjectRef array) {
-    return CYCastDouble(context, CYGetProperty(context, array, length_s));
-}
-
-JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetPropertyAtIndex(context, array, index, &exception));
-    CYThrow(context, exception);
-    return value;
-}
-
-void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSValueRef arguments[1];
-    arguments[0] = value;
-    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
-    JSObjectCallAsFunction(context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments, &exception);
-    CYThrow(context, exception);
-}
-
-extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) {
+extern "C" bool CydgetMemoryParse(const uint16_t **data, size_t *size) {
     CYLocalPool local;
 
     CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size)));
@@ -219,8 +199,11 @@ extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) {
     CYDriver driver(stream);
 
     cy::parser parser(driver);
-    if (parser.parse() != 0 || !driver.errors_.empty())
-        return;
+    if (parser.parse() != 0 || !driver.errors_.empty()) {
+        *data = NULL;
+        *size = 0;
+        return false;
+    }
 
     CYOptions options;
     CYContext context(options);
@@ -239,6 +222,7 @@ extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) {
 
     *data = copy;
     *size = utf16.size;
+    return true;
 }
 
 CYPool &CYGetGlobalPool() {