Removed with(Cycript.all), unified the All_ instances, and moved Cycript.all prototyp...

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index 78f0fd0eaf1086e8f7f2648e8d1e1634e44eb358..f95cf9e805bde5df9d1ca4db1aaaa2c656ff7d6e 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -86,6 +86,65 @@ char *sqlite3_column_pooled(apr_pool_t *pool, sqlite3_stmt *stmt, int n) {
 
 struct CYHooks *hooks_;
 
 
 struct CYHooks *hooks_;
 

+/* C Strings {{{ */
+template <typename Type_>
+_finline size_t iconv_(size_t (*iconv)(iconv_t, Type_, size_t *, char **, size_t *), iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) {
+    return iconv(cd, const_cast<Type_>(inbuf), inbytesleft, outbuf, outbytesleft);
+}
+
+#ifdef __GLIBC__
+#define UCS_2_INTERNAL "UCS-2"
+#else
+#define UCS_2_INTERNAL "UCS-2-INTERNAL"
+#endif
+
+CYUTF8String CYPoolUTF8String(apr_pool_t *pool, CYUTF16String utf16) {
+    _assert(pool != NULL);
+
+    const char *in(reinterpret_cast<const char *>(utf16.data));
+
+    iconv_t conversion(_syscall(iconv_open("UTF-8", UCS_2_INTERNAL)));
+
+    // XXX: this is wrong
+    size_t size(utf16.size * 5);
+    char *out(new(pool) char[size]);
+    CYUTF8String utf8(out, size);
+
+    size = utf16.size * 2;
+    _syscall(iconv_(&iconv, conversion, const_cast<char **>(&in), &size, &out, &utf8.size));
+
+    *out = '\0';
+    utf8.size = out - utf8.data;
+
+    _syscall(iconv_close(conversion));
+
+    return utf8;
+}
+
+CYUTF16String CYPoolUTF16String(apr_pool_t *pool, CYUTF8String utf8) {
+    _assert(pool != NULL);
+
+    const char *in(utf8.data);
+
+    iconv_t conversion(_syscall(iconv_open(UCS_2_INTERNAL, "UTF-8")));
+
+    // XXX: this is wrong
+    size_t size(utf8.size * 5);
+    uint16_t *temp(new (pool) uint16_t[size]);
+    CYUTF16String utf16(temp, size * 2);
+    char *out(reinterpret_cast<char *>(temp));
+
+    size = utf8.size;
+    _syscall(iconv_(&iconv, conversion, const_cast<char **>(&in), &size, &out, &utf16.size));
+
+    utf16.size = reinterpret_cast<uint16_t *>(out) - utf16.data;
+    temp[utf16.size] = 0;
+
+    _syscall(iconv_close(conversion));
+
+    return utf16;
+}
+/* }}} */

 /* JavaScript Properties {{{ */
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
     JSValueRef exception(NULL);
 /* JavaScript Properties {{{ */
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
     JSValueRef exception(NULL);


@@ -113,7 +172,7 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J
     CYThrow(context, exception);
 }
 
     CYThrow(context, exception);
 }
 

-void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef (*callback)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *), JSPropertyAttributes attributes = kJSPropertyAttributeNone) {
+void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef (*callback)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *), JSPropertyAttributes attributes) {

     CYSetProperty(context, object, name, JSObjectMakeFunctionWithCallback(context, name, callback), attributes);
 }
 /* }}} */
     CYSetProperty(context, object, name, JSObjectMakeFunctionWithCallback(context, name, callback), attributes);
 }
 /* }}} */


@@ -144,36 +203,8 @@ static CYUTF16String CYCastUTF16String(JSStringRef value) {
     return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value));
 }
 
     return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value));
 }
 

-template <typename Type_>
-_finline size_t iconv_(size_t (*iconv)(iconv_t, Type_, size_t *, char **, size_t *), iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) {
-    return iconv(cd, const_cast<Type_>(inbuf), inbytesleft, outbuf, outbytesleft);
-}
-

 CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
 CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {

-    _assert(pool != NULL);
-
-    CYUTF16String utf16(CYCastUTF16String(value));
-    const char *in(reinterpret_cast<const char *>(utf16.data));
-
-#ifdef __GLIBC__
-    iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2")));
-#else
-    iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2-INTERNAL")));
-#endif
-
-    size_t size(JSStringGetMaximumUTF8CStringSize(value));
-    char *out(new(pool) char[size]);
-    CYUTF8String utf8(out, size);
-
-    size = utf16.size * 2;
-    _syscall(iconv_(&iconv, conversion, const_cast<char **>(&in), &size, &out, &utf8.size));
-
-    *out = '\0';
-    utf8.size = out - utf8.data;
-
-    _syscall(iconv_close(conversion));
-
-    return utf8;
+    return CYPoolUTF8String(pool, CYCastUTF16String(value));

 }
 
 const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
 }
 
 const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSStringRef value) {


@@ -300,11 +331,11 @@ bool CYIsKey(CYUTF8String value) {
 }
 /* }}} */
 
 }
 /* }}} */
 

+static JSClassRef All_;

 static JSClassRef Context_;
 static JSClassRef Functor_;
 static JSClassRef Global_;
 static JSClassRef Pointer_;
 static JSClassRef Context_;
 static JSClassRef Functor_;
 static JSClassRef Global_;
 static JSClassRef Pointer_;

-static JSClassRef Runtime_;

 static JSClassRef Struct_;
 
 JSStringRef Array_s;
 static JSClassRef Struct_;
 
 JSStringRef Array_s;


@@ -1120,7 +1151,13 @@ static void *CYCastSymbol(const char *name) {
     return dlsym(RTLD_DEFAULT, name);
 }
 
     return dlsym(RTLD_DEFAULT, name);
 }
 

-static JSValueRef Runtime_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    JSObjectRef global(CYGetGlobalObject(context));
+    JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
+    if (JSValueRef value = CYGetProperty(context, cycript, property))
+        if (!JSValueIsUndefined(context, value))
+            return value;
+

     CYPool pool;
     CYUTF8String name(CYPoolUTF8String(pool, context, property));
 
     CYPool pool;
     CYUTF8String name(CYPoolUTF8String(pool, context, property));
 


@@ -1427,6 +1464,35 @@ const char *CYExecute(apr_pool_t *pool, const char *code) {
     return json;
 }
 
     return json;
 }
 

+extern "C" void CydgetSetupContext(JSGlobalContextRef context) {
+    CYSetupContext(context);
+}
+
+extern "C" void CydgetPoolParse(apr_pool_t *pool, const uint16_t **data, size_t *size) {
+    CYDriver driver("");
+    cy::parser parser(driver);
+
+    CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size)));
+
+    driver.data_ = utf8.data;
+    driver.size_ = utf8.size;
+
+    if (parser.parse() != 0 || !driver.errors_.empty())
+        return;
+
+    CYContext context(driver.pool_);
+    driver.program_->Replace(context);
+    std::ostringstream str;
+    CYOutput out(str);
+    out << *driver.program_;
+    std::string code(str.str());
+
+    CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size())));
+
+    *data = utf16.data;
+    *size = utf16.size;
+}
+

 static apr_pool_t *Pool_;
 
 static bool initialized_;
 static apr_pool_t *Pool_;
 
 static bool initialized_;


@@ -1444,6 +1510,11 @@ void CYInitialize() {
 
     JSClassDefinition definition;
 
 
     JSClassDefinition definition;
 

+    definition = kJSClassDefinitionEmpty;
+    definition.className = "All";
+    definition.getProperty = &All_getProperty;
+    All_ = JSClassCreate(&definition);
+

     definition = kJSClassDefinitionEmpty;
     definition.className = "Context";
     definition.finalize = &CYFinalize;
     definition = kJSClassDefinitionEmpty;
     definition.className = "Context";
     definition.finalize = &CYFinalize;


@@ -1482,11 +1553,6 @@ void CYInitialize() {
     definition.finalize = &CYFinalize;
     Type_privateData::Class_ = JSClassCreate(&definition);
 
     definition.finalize = &CYFinalize;
     Type_privateData::Class_ = JSClassCreate(&definition);
 

-    definition = kJSClassDefinitionEmpty;
-    definition.className = "Runtime";
-    definition.getProperty = &Runtime_getProperty;
-    Runtime_ = JSClassCreate(&definition);
-

     definition = kJSClassDefinitionEmpty;
     //definition.getProperty = &Global_getProperty;
     Global_ = JSClassCreate(&definition);
     definition = kJSClassDefinitionEmpty;
     //definition.getProperty = &Global_getProperty;
     Global_ = JSClassCreate(&definition);


@@ -1585,12 +1651,15 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) {
     return reinterpret_cast<Context *>(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_;
 }
 
     return reinterpret_cast<Context *>(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_;
 }
 

-void CYSetupContext(JSGlobalContextRef context) {
+extern "C" void CYSetupContext(JSGlobalContextRef context) {
+    CYInitialize();
+

     JSObjectRef global(CYGetGlobalObject(context));
 
     JSObjectRef cy(JSObjectMake(context, Context_, new Context(context)));
     CYSetProperty(context, global, cy_s, cy, kJSPropertyAttributeDontEnum);
 
     JSObjectRef global(CYGetGlobalObject(context));
 
     JSObjectRef cy(JSObjectMake(context, Context_, new Context(context)));
     CYSetProperty(context, global, cy_s, cy, kJSPropertyAttributeDontEnum);
 

+/* Cache Globals {{{ */

     JSObjectRef Array(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array"))));
     CYSetProperty(context, cy, CYJSString("Array"), Array);
 
     JSObjectRef Array(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array"))));
     CYSetProperty(context, cy, CYJSString("Array"), Array);
 


@@ -1614,21 +1683,36 @@ void CYSetupContext(JSGlobalContextRef context) {
 
     JSObjectRef String(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String"))));
     CYSetProperty(context, cy, CYJSString("String"), String);
 
     JSObjectRef String(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String"))));
     CYSetProperty(context, cy, CYJSString("String"), String);

-
-    JSObjectSetPrototype(context, global, JSObjectMake(context, Runtime_, NULL));
+/* }}} */

 
     CYSetProperty(context, Array_prototype, toCYON_s, &Array_callAsFunction_toCYON, kJSPropertyAttributeDontEnum);
 
 
     CYSetProperty(context, Array_prototype, toCYON_s, &Array_callAsFunction_toCYON, kJSPropertyAttributeDontEnum);
 

+    JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
+    CYSetProperty(context, global, CYJSString("Cycript"), cycript);
+    CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
+

     JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
     JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);
     JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
     JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);

-    CYSetProperty(context, global, CYJSString("Functor"), Functor);
+    CYSetProperty(context, cycript, CYJSString("Functor"), Functor);

 
 

-    CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
-    CYSetProperty(context, global, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));
+    CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
+    CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));

 
 

-    JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
-    CYSetProperty(context, global, CYJSString("Cycript"), cycript);
-    CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
+    JSObjectRef all(JSObjectMake(context, All_, NULL));
+    CYSetProperty(context, cycript, CYJSString("all"), all);
+
+    JSObjectRef last(NULL), curr(global);
+
+    goto next; for (JSValueRef next;;) {
+        if (JSValueIsNull(context, next))
+            break;
+        last = curr;
+        curr = CYCastJSObject(context, next);
+      next:
+        next = JSObjectGetPrototype(context, curr);
+    }
+
+    JSObjectSetPrototype(context, last, all);

 
     CYSetProperty(context, global, CYJSString("$cyq"), &$cyq);
 
 
     CYSetProperty(context, global, CYJSString("$cyq"), &$cyq);