Use variadic templates to better organize Classes.

[cycript.git] / Execute.cpp

diff --git a/Execute.cpp b/Execute.cpp
index b0c8aac84940e4ba20d81e7afffd77381f6205b7..dfc015835c958979b4586bc5e843d9b116a6a5aa 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -1,56 +1,73 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * Cycript is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "Internal.hpp"
+#include "cycript.hpp"
+
+#include <iostream>
+#include <set>
+#include <map>
+#include <iomanip>
+#include <sstream>
+#include <cmath>

 
 #include <dlfcn.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 
 #include <dlfcn.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
 

-#include "cycript.hpp"
-
-#include "sig/parse.hpp"
-#include "sig/ffi_type.hpp"
-
-#include "Pooling.hpp"
-#include "Execute.hpp"
-

 #include <sys/mman.h>
 #include <sys/stat.h>
 
 #include <sys/mman.h>
 #include <sys/stat.h>
 

-#include <iostream>
-#include <set>
-#include <map>
-#include <iomanip>
-#include <sstream>
-#include <cmath>
+#include <sqlite3.h>
+
+#include "sig/parse.hpp"
+#include "sig/ffi_type.hpp"

 
 #include "Code.hpp"
 #include "Decode.hpp"
 #include "Error.hpp"
 
 #include "Code.hpp"
 #include "Decode.hpp"
 #include "Error.hpp"

+#include "Execute.hpp"
+#include "Internal.hpp"

 #include "JavaScript.hpp"
 #include "JavaScript.hpp"

+#include "Pooling.hpp"

 #include "String.hpp"
 
 #include "String.hpp"
 

-struct CYHooks *hooks_;
+const char *sqlite3_column_string(sqlite3_stmt *stmt, int n) {
+    return reinterpret_cast<const char *>(sqlite3_column_text(stmt, n));
+}
+
+char *sqlite3_column_pooled(CYPool &pool, sqlite3_stmt *stmt, int n) {
+    if (const char *value = sqlite3_column_string(stmt, n))
+        return pool.strdup(value);
+    else return NULL;
+}
+
+static std::vector<CYHook *> &GetHooks() {
+    static std::vector<CYHook *> hooks;
+    return hooks;
+}
+
+CYRegisterHook::CYRegisterHook(CYHook *hook) {
+    GetHooks().push_back(hook);
+}

 
 /* JavaScript Properties {{{ */
 bool CYHasProperty(JSContextRef context, JSObjectRef object, JSStringRef name) {
 
 /* JavaScript Properties {{{ */
 bool CYHasProperty(JSContextRef context, JSObjectRef object, JSStringRef name) {


@@ -76,6 +93,11 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J
 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);
 }
 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);
 }

+
+void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef value) {
+    JSObjectSetPrototype(context, object, value);
+    _assert(CYIsStrictEqual(context, JSObjectGetPrototype(context, object), value));
+}

 /* }}} */
 /* JavaScript Strings {{{ */
 JSStringRef CYCopyJSString(const char *value) {
 /* }}} */
 /* JavaScript Strings {{{ */
 JSStringRef CYCopyJSString(const char *value) {


@@ -87,8 +109,19 @@ JSStringRef CYCopyJSString(JSStringRef value) {
 }
 
 JSStringRef CYCopyJSString(CYUTF8String value) {
 }
 
 JSStringRef CYCopyJSString(CYUTF8String value) {

-    // XXX: this is very wrong; it needs to convert to UTF16 and then create from there
-    return CYCopyJSString(value.data);
+    if (memchr(value.data, '\0', value.size) != NULL) {
+        CYPool pool;
+        return CYCopyJSString(CYPoolUTF16String(pool, value));
+    } else if (value.data[value.size] != '\0') {
+        CYPool pool;
+        return CYCopyJSString(pool.strmemdup(value.data, value.size));
+    } else {
+        return CYCopyJSString(value.data);
+    }
+}
+
+JSStringRef CYCopyJSString(CYUTF16String value) {
+    return JSStringCreateWithCharacters(value.data, value.size);

 }
 
 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
 }
 
 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {


@@ -121,16 +154,27 @@ size_t CYGetIndex(CYPool &pool, JSContextRef context, JSStringRef value) {
 }
 /* }}} */
 
 }
 /* }}} */
 

+static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
+
+static JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) {
+    if (JSObjectMakeArray$ != NULL)
+        return _jsccall(*JSObjectMakeArray$, context, length, values);
+    else {
+        JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
+        JSValueRef value(CYCallAsFunction(context, Array, NULL, length, values));
+        return CYCastJSObject(context, value);
+    }
+}
+

 static JSClassRef All_;
 static JSClassRef Context_;
 JSClassRef Functor_;
 static JSClassRef Global_;
 static JSClassRef All_;
 static JSClassRef Context_;
 JSClassRef Functor_;
 static JSClassRef Global_;

-static JSClassRef Pointer_;
-static JSClassRef Struct_;

 
 JSStringRef Array_s;
 JSStringRef cy_s;
 JSStringRef cyi_s;
 
 JSStringRef Array_s;
 JSStringRef cy_s;
 JSStringRef cyi_s;

+JSStringRef cyt_s;

 JSStringRef length_s;
 JSStringRef message_s;
 JSStringRef name_s;
 JSStringRef length_s;
 JSStringRef message_s;
 JSStringRef name_s;


@@ -142,6 +186,9 @@ JSStringRef toCYON_s;
 JSStringRef toJSON_s;
 JSStringRef toPointer_s;
 JSStringRef toString_s;
 JSStringRef toJSON_s;
 JSStringRef toPointer_s;
 JSStringRef toString_s;

+JSStringRef weak_s;
+
+static sqlite3 *database_;

 
 static JSStringRef Result_;
 
 
 static JSStringRef Result_;
 


@@ -152,43 +199,9 @@ void CYFinalize(JSObjectRef object) {
         delete internal;
 }
 
         delete internal;
 }
 

-void Structor_(CYPool &pool, sig::Type *&type) {
-    if (
-        type->primitive == sig::pointer_P &&
-        type->data.data.type->primitive == sig::struct_P &&
-        type->data.data.type->name != NULL &&
-        strcmp(type->data.data.type->name, "_objc_class") == 0
-    ) {
-        type->primitive = sig::typename_P;
-        type->data.data.type = NULL;
-        return;
-    }
-
-    if (type->primitive != sig::struct_P || type->name == NULL)
-        return;
-
-    size_t length(strlen(type->name));
-    char keyed[length + 2];
-    memcpy(keyed + 1, type->name, length + 1);
-
-    static const char *modes = "34";
-    for (size_t i(0); i != 2; ++i) {
-        char mode(modes[i]);
-        keyed[0] = mode;
-
-        if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
-            switch (mode) {
-                case '3':
-                    sig::Parse(pool, &type->data.signature, entry->value_, &Structor_);
-                break;
-
-                case '4': {
-                    sig::Signature signature;
-                    sig::Parse(pool, &signature, entry->value_, &Structor_);
-                    type = signature.elements[0].type;
-                } break;
-            }
-    }
+sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate) {
+    //_assert(false);
+    return aggregate;

 }
 
 JSClassRef Type_privateData::Class_;
 }
 
 JSClassRef Type_privateData::Class_;


@@ -204,53 +217,88 @@ struct Context :
     }
 };
 
     }
 };
 

-struct Pointer :
-    CYOwned
+struct CArray :
+    CYValue_<CArray, void *>

 {
 {

+    CYProtect owner_;

     Type_privateData *type_;
     size_t length_;
 
     Type_privateData *type_;
     size_t length_;
 

-    Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, sig::Type *type) :
-        CYOwned(value, context, owner),
-        type_(new(*pool_) Type_privateData(type)),
+    CArray(void *value, size_t length, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :
+        CYValue_(value),
+        owner_(context, owner),
+        type_(new(*pool_) Type_privateData(type, ffi)),

         length_(length)
     {
         length_(length)
     {

+        if (owner == NULL) {
+            size_t size(ffi->size * length);
+            void *copy(pool_->malloc<void>(size, ffi->alignment));
+            memcpy(copy, GetValue(), size);
+            value_ = copy;
+        }

     }
 };
 
     }
 };
 

-struct Struct_privateData :
-    CYOwned
+struct CString :
+    CYValue_<CString, char *>

 {
 {

-    Type_privateData *type_;
+    CYProtect owner_;

 
 

-    Struct_privateData(JSContextRef context, JSObjectRef owner) :
-        CYOwned(NULL, context, owner)
+    CString(char *value, JSContextRef context, JSObjectRef owner) :
+        CYValue_(value),
+        owner_(context, owner)

     {
     {

+        if (owner == NULL)
+            value_ = pool_->strdup(GetValue());

     }
 };
 
     }
 };
 

-typedef std::map<const char *, Type_privateData *, CYCStringLess> TypeMap;
-static TypeMap Types_;
+struct Pointer :
+    CYValue_<Pointer, void *>
+{
+    CYProtect owner_;
+    Type_privateData *type_;

 
 

-JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
-    Struct_privateData *internal(new Struct_privateData(context, owner));
-    CYPool &pool(*internal->pool_);
-    Type_privateData *typical(new(pool) Type_privateData(type, ffi));
-    internal->type_ = typical;
+    Pointer(void *value, const sig::Type &type, JSContextRef context, JSObjectRef owner) :
+        CYValue_(value),
+        owner_(context, owner),
+        type_(new(*pool_) Type_privateData(type))
+    {
+    }

 
 

-    if (owner != NULL)
-        internal->value_ = data;
-    else {
-        size_t size(typical->GetFFI()->size);
-        void *copy(internal->pool_->malloc<void>(size));
-        memcpy(copy, data, size);
-        internal->value_ = copy;
+    Pointer(void *value, const char *encoding, JSContextRef context, JSObjectRef owner) :
+        CYValue_(value),
+        owner_(context, owner),
+        type_(new(*pool_) Type_privateData(encoding))
+    {

     }
     }

+};

 
 

-    return JSObjectMake(context, Struct_, internal);
-}
+struct Struct_privateData :
+    CYValue_<Struct_privateData, void *>
+{
+    CYProtect owner_;
+    Type_privateData *type_;
+
+    Struct_privateData(void *value, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :
+        CYValue_(value),
+        owner_(context, owner),
+        type_(new(*pool_) Type_privateData(type, ffi))
+    {
+        if (owner == NULL) {
+            size_t size(ffi->size);
+            void *copy(pool_->malloc<void>(size, ffi->alignment));
+            memcpy(copy, GetValue(), size);
+            value_ = copy;
+        }
+    }
+};

 
 static void *CYCastSymbol(const char *name) {
 
 static void *CYCastSymbol(const char *name) {

+    for (CYHook *hook : GetHooks())
+        if (hook->CastSymbol != NULL)
+            if (void *value = (*hook->CastSymbol)(name))
+                return value;

     return dlsym(RTLD_DEFAULT, name);
 }
 
     return dlsym(RTLD_DEFAULT, name);
 }
 


@@ -264,15 +312,18 @@ JSValueRef CYCastJSValue(JSContextRef context, double value) {
 
 #define CYCastJSValue_(Type_) \
     JSValueRef CYCastJSValue(JSContextRef context, Type_ value) { \
 
 #define CYCastJSValue_(Type_) \
     JSValueRef CYCastJSValue(JSContextRef context, Type_ value) { \

+        _assert(static_cast<Type_>(static_cast<double>(value)) == value); \

         return JSValueMakeNumber(context, static_cast<double>(value)); \
     }
 
         return JSValueMakeNumber(context, static_cast<double>(value)); \
     }
 

-CYCastJSValue_(int)
+CYCastJSValue_(signed short int)
+CYCastJSValue_(unsigned short int)
+CYCastJSValue_(signed int)

 CYCastJSValue_(unsigned int)
 CYCastJSValue_(unsigned int)

-CYCastJSValue_(long int)
-CYCastJSValue_(long unsigned int)
-CYCastJSValue_(long long int)
-CYCastJSValue_(long long unsigned int)
+CYCastJSValue_(signed long int)
+CYCastJSValue_(unsigned long int)
+CYCastJSValue_(signed long long int)
+CYCastJSValue_(unsigned long long int)

 
 JSValueRef CYJSUndefined(JSContextRef context) {
     return JSValueMakeUndefined(context);
 
 JSValueRef CYJSUndefined(JSContextRef context) {
     return JSValueMakeUndefined(context);


@@ -310,6 +361,14 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
     return value != NULL && JSValueIsObject(context, value) && JSObjectIsFunction(context, (JSObjectRef) value);
 }
 
     return value != NULL && JSValueIsObject(context, value) && JSObjectIsFunction(context, (JSObjectRef) value);
 }
 

+bool CYIsEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs) {
+    return _jsccall(JSValueIsEqual, context, lhs, rhs);
+}
+
+bool CYIsStrictEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs) {
+    return JSValueIsStrictEqual(context, lhs, rhs);
+}
+

 size_t CYArrayLength(JSContextRef context, JSObjectRef array) {
     return CYCastDouble(context, CYGetProperty(context, array, length_s));
 }
 size_t CYArrayLength(JSContextRef context, JSObjectRef array) {
     return CYCastDouble(context, CYGetProperty(context, array, length_s));
 }


@@ -318,44 +377,87 @@ JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index) {
     return _jsccall(JSObjectGetPropertyAtIndex, context, array, index);
 }
 
     return _jsccall(JSObjectGetPropertyAtIndex, context, array, index);
 }
 

-void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
-    JSValueRef arguments[1];
-    arguments[0] = value;
+void CYArrayPush(JSContextRef context, JSObjectRef array, size_t length, const JSValueRef arguments[]) {

     JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
     JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));

-    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments);
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, length, arguments);

 }
 
 }
 

+void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
+    return CYArrayPush(context, array, 1, &value);
+}
+
+template <size_t Size_>
+class CYArrayBuilder {
+  private:
+    JSContextRef context_;
+    JSObjectRef &array_;
+    size_t size_;
+    JSValueRef values_[Size_];
+
+    void flush() {
+        if (array_ == NULL)
+            array_ = CYObjectMakeArray(context_, size_, values_);
+        else
+            CYArrayPush(context_, array_, size_, values_);
+    }
+
+  public:
+    CYArrayBuilder(JSContextRef context, JSObjectRef &array) :
+        context_(context),
+        array_(array),
+        size_(0)
+    {
+    }
+
+    ~CYArrayBuilder() {
+        flush();
+    }
+
+    void operator ()(JSValueRef value) {
+        if (size_ == Size_) {
+            flush();
+            size_ = 0;
+        }
+
+        values_[size_++] = value;
+    }
+};
+

 static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

+    FILE *file(stdout);
+

     if (count == 0)
     if (count == 0)

-        printf("\n");
+        fputc('\n', file);

     else {
         CYPool pool;
     else {
         CYPool pool;

-        printf("%s\n", CYPoolCString(pool, context, arguments[0]));
+        CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+        fwrite(string.data, string.size, 1, file);

     }
 
     }
 

+    fflush(file);

     return CYJSUndefined(context);
 } CYCatch(NULL) }
 
     return CYJSUndefined(context);
 } CYCatch(NULL) }
 

-static size_t Nonce_(0);
-
-static JSValueRef $cyq(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    CYPool pool;
-    const char *name(pool.strcat(CYPoolCString(pool, context, arguments[0]), pool.itoa(Nonce_++), NULL));
-    return CYCastJSValue(context, name);
-} CYCatch(NULL) }
-

 static void (*JSSynchronousGarbageCollectForDebugging$)(JSContextRef);
 
 static void (*JSSynchronousGarbageCollectForDebugging$)(JSContextRef);
 

-void CYGarbageCollect(JSContextRef context) {
+_visible void CYGarbageCollect(JSContextRef context) {

     (JSSynchronousGarbageCollectForDebugging$ ?: &JSGarbageCollect)(context);
 }
 
     (JSSynchronousGarbageCollectForDebugging$ ?: &JSGarbageCollect)(context);
 }
 

+static JSValueRef Cycript_compile_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    CYPool pool;
+    CYUTF8String before(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+    std::stringbuf value(std::string(before.data, before.size));
+    CYUTF8String after(CYPoolCode(pool, value));
+    return CYCastJSValue(context, CYJSString(after));
+} CYCatch_(NULL, "SyntaxError") }
+

 static JSValueRef Cycript_gc_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYGarbageCollect(context);
     return CYJSUndefined(context);
 } CYCatch(NULL) }
 
 static JSValueRef Cycript_gc_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYGarbageCollect(context);
     return CYJSUndefined(context);
 } CYCatch(NULL) }
 

-const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, JSValueRef *exception) { CYTry {
+const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, std::set<void *> &objects, JSValueRef *exception) { CYTry {

     switch (JSType type = JSValueGetType(context, value)) {
         case kJSTypeUndefined:
             return "undefined";
     switch (JSType type = JSValueGetType(context, value)) {
         case kJSTypeUndefined:
             return "undefined";


@@ -380,20 +482,31 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, JS
         } break;
 
         case kJSTypeObject:
         } break;
 
         case kJSTypeObject:

-            return CYPoolCCYON(pool, context, (JSObjectRef) value);
+            return CYPoolCCYON(pool, context, (JSObjectRef) value, objects);

         default:
             throw CYJSError(context, "JSValueGetType() == 0x%x", type);
     }
 } CYCatch(NULL) }
 
         default:
             throw CYJSError(context, "JSValueGetType() == 0x%x", type);
     }
 } CYCatch(NULL) }
 

-const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value) {
-    return _jsccall(CYPoolCCYON, pool, context, value);
+const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, std::set<void *> &objects) {
+    return _jsccall(CYPoolCCYON, pool, context, value, objects);
+}
+
+const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, std::set<void *> *objects) {
+    if (objects != NULL)
+        return CYPoolCCYON(pool, context, value, *objects);
+    else {
+        std::set<void *> objects;
+        return CYPoolCCYON(pool, context, value, objects);
+    }

 }
 
 }
 

-const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object) {
+const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object, std::set<void *> &objects) {

     JSValueRef toCYON(CYGetProperty(context, object, toCYON_s));
     if (CYIsCallable(context, toCYON)) {
     JSValueRef toCYON(CYGetProperty(context, object, toCYON_s));
     if (CYIsCallable(context, toCYON)) {

-        JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toCYON, object, 0, NULL));
+        // XXX: this needs to be abstracted behind some kind of function
+        JSValueRef arguments[1] = {CYCastJSValue(context, reinterpret_cast<uintptr_t>(&objects))};
+        JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toCYON, object, 1, arguments));

         _assert(value != NULL);
         return CYPoolCString(pool, context, value);
     }
         _assert(value != NULL);
         return CYPoolCString(pool, context, value);
     }


@@ -401,7 +514,7 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object)
     JSValueRef toJSON(CYGetProperty(context, object, toJSON_s));
     if (CYIsCallable(context, toJSON)) {
         JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))};
     JSValueRef toJSON(CYGetProperty(context, object, toJSON_s));
     if (CYIsCallable(context, toJSON)) {
         JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))};

-        return _jsccall(CYPoolCCYON, pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments));
+        return _jsccall(CYPoolCCYON, pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments), objects);

     }
 
     if (JSObjectIsFunction(context, object)) {
     }
 
     if (JSObjectIsFunction(context, object)) {


@@ -414,6 +527,8 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object)
         }
     }
 
         }
     }
 

+    _assert(objects.insert(object).second);
+

     std::ostringstream str;
 
     str << '{';
     std::ostringstream str;
 
     str << '{';


@@ -441,7 +556,7 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object)
 
         try {
             JSValueRef value(CYGetProperty(context, object, name));
 
         try {
             JSValueRef value(CYGetProperty(context, object, name));

-            str << CYPoolCCYON(pool, context, value);
+            str << CYPoolCCYON(pool, context, value, objects);

         } catch (const CYException &error) {
             str << "@error";
         }
         } catch (const CYException &error) {
             str << "@error";
         }


@@ -455,7 +570,19 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object)
     return pool.strmemdup(string.c_str(), string.size());
 }
 
     return pool.strmemdup(string.c_str(), string.size());
 }
 

+std::set<void *> *CYCastObjects(JSContextRef context, JSObjectRef _this, size_t count, const JSValueRef arguments[]) {
+    if (count == 0)
+        return NULL;
+    return CYCastPointer<std::set<void *> *>(context, arguments[0]);
+}
+

 static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

+    std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
+    // XXX: this is horribly inefficient
+    std::set<void *> backup;
+    if (objects == NULL)
+        objects = &backup;
+

     CYPool pool;
     std::ostringstream str;
 
     CYPool pool;
     std::ostringstream str;
 


@@ -473,7 +600,7 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef
         try {
             JSValueRef value(CYGetProperty(context, _this, index));
             if (!JSValueIsUndefined(context, value))
         try {
             JSValueRef value(CYGetProperty(context, _this, index));
             if (!JSValueIsUndefined(context, value))

-                str << CYPoolCCYON(pool, context, value);
+                str << CYPoolCCYON(pool, context, value, *objects);

             else {
                 str << ',';
                 comma = false;
             else {
                 str << ',';
                 comma = false;


@@ -500,28 +627,20 @@ static JSValueRef String_callAsFunction_toCYON(JSContextRef context, JSObjectRef
     return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
 } CYCatch(NULL) }
 
     return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
 } CYCatch(NULL) }
 

-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
-    Pointer *internal(new Pointer(pointer, context, owner, length, type));
-    return JSObjectMake(context, Pointer_, internal);
+JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
+    return Pointer::Make(context, pointer, type, context, owner);

 }
 
 }
 

-static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const sig::Signature &signature) {
-    return JSObjectMake(context, Functor_, new cy::Functor(signature, function));
+static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) {
+    return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature));

 }
 
 }
 

-static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding, void **cache) {
-    cy::Functor *internal;
-    if (*cache != NULL)
-        internal = reinterpret_cast<cy::Functor *>(*cache);
-    else {
-        void (*function)()(reinterpret_cast<void (*)()>(CYCastSymbol(symbol)));
-        if (function == NULL)
-            return NULL;
-
-        internal = new cy::Functor(encoding, function);
-        *cache = internal;
-    }
+static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) {
+    void (*function)()(reinterpret_cast<void (*)()>(CYCastSymbol(symbol)));
+    if (function == NULL)
+        return NULL;

 
 

+    cy::Functor *internal(new cy::Functor(function, encoding));

     ++internal->count_;
     return JSObjectMake(context, Functor_, internal);
 }
     ++internal->count_;
     return JSObjectMake(context, Functor_, internal);
 }


@@ -530,13 +649,15 @@ static bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, s
     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 
     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 

-void *CYCastPointer_(JSContextRef context, JSValueRef value) {
-    switch (JSValueGetType(context, value)) {
+void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) {
+    if (value == NULL)
+        return NULL;
+    else switch (JSValueGetType(context, value)) {

         case kJSTypeNull:
             return NULL;
         case kJSTypeObject: {
             JSObjectRef object((JSObjectRef) value);
         case kJSTypeNull:
             return NULL;
         case kJSTypeObject: {
             JSObjectRef object((JSObjectRef) value);

-            if (JSValueIsObjectOfClass(context, value, Pointer_)) {
+            if (JSValueIsObjectOfClass(context, value, Pointer::Class_)) {

                 Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
                 return internal->value_;
             }
                 Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
                 return internal->value_;
             }


@@ -544,164 +665,207 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value) {
             if (CYIsCallable(context, toPointer)) {
                 JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL));
                 _assert(value != NULL);
             if (CYIsCallable(context, toPointer)) {
                 JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL));
                 _assert(value != NULL);

-                return CYCastPointer_(context, value);
+                return CYCastPointer_(context, value, guess);

             }
         } default:
             }
         } default:

+            if (guess != NULL)
+                *guess = true;
+        case kJSTypeNumber:

             double number(CYCastDouble(context, value));
             double number(CYCastDouble(context, value));

-            if (std::isnan(number))
+            if (!std::isnan(number))
+                return reinterpret_cast<void *>(static_cast<uintptr_t>(static_cast<long long>(number)));
+            if (guess == NULL)

                 throw CYJSError(context, "cannot convert value to pointer");
                 throw CYJSError(context, "cannot convert value to pointer");

-            return reinterpret_cast<void *>(static_cast<uintptr_t>(static_cast<long long>(number)));
+            else {
+                *guess = true;
+                return NULL;
+            }

     }
 }
 
     }
 }
 

-void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) {
-    switch (type->primitive) {
-        case sig::boolean_P:
-            *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
-        break;
-
-#define CYPoolFFI_(primitive, native) \
-        case sig::primitive ## _P: \
-            *reinterpret_cast<native *>(data) = CYCastDouble(context, value); \
-        break;
-
-        CYPoolFFI_(uchar, unsigned char)
-        CYPoolFFI_(char, char)
-        CYPoolFFI_(ushort, unsigned short)
-        CYPoolFFI_(short, short)
-        CYPoolFFI_(ulong, unsigned long)
-        CYPoolFFI_(long, long)
-        CYPoolFFI_(uint, unsigned int)
-        CYPoolFFI_(int, int)
-        CYPoolFFI_(ulonglong, unsigned long long)
-        CYPoolFFI_(longlong, long long)
-        CYPoolFFI_(float, float)
-        CYPoolFFI_(double, double)
-
-        case sig::array_P: {
-            uint8_t *base(reinterpret_cast<uint8_t *>(data));
-            JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
-            for (size_t index(0); index != type->data.data.size; ++index) {
-                ffi_type *field(ffi->elements[index]);
-
-                JSValueRef rhs;
-                if (aggregate == NULL)
-                    rhs = value;
-                else {
-                    rhs = CYGetProperty(context, aggregate, index);
-                    if (JSValueIsUndefined(context, rhs))
-                        throw CYJSError(context, "unable to extract array value");
-                }
-
-                CYPoolFFI(pool, context, type->data.data.type, field, base, rhs);
-                // XXX: alignment?
-                base += field->size;
-            }
-        } break;
+namespace sig {

 
 

-        case sig::pointer_P:
-            *reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value);
-        break;
-
-        case sig::string_P:
-            _assert(pool != NULL);
-            *reinterpret_cast<const char **>(data) = CYPoolCString(*pool, context, value);
-        break;
-
-        case sig::struct_P: {
-            uint8_t *base(reinterpret_cast<uint8_t *>(data));
-            JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
-            for (size_t index(0); index != type->data.signature.count; ++index) {
-                sig::Element *element(&type->data.signature.elements[index]);
-                ffi_type *field(ffi->elements[index]);
-
-                JSValueRef rhs;
-                if (aggregate == NULL)
-                    rhs = value;
-                else {
-                    rhs = CYGetProperty(context, aggregate, index);
-                    if (JSValueIsUndefined(context, rhs)) {
-                        if (element->name != NULL)
-                            rhs = CYGetProperty(context, aggregate, CYJSString(element->name));
-                        else
-                            goto undefined;
-                        if (JSValueIsUndefined(context, rhs)) undefined:
-                            throw CYJSError(context, "unable to extract structure value");
-                    }
-                }
-
-                CYPoolFFI(pool, context, element->type, field, base, rhs);
-                // XXX: alignment?
-                base += field->size;
-            }
-        } break;
+// XXX: this is somehow not quite a template :/

 
 

-        case sig::void_P:
-        break;
+template <>
+void Primitive<bool>::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
+}

 
 

-        default:
-            if (hooks_ != NULL && hooks_->PoolFFI != NULL)
-                if ((*hooks_->PoolFFI)(pool, context, type, ffi, data, value))
-                    return;
+#define CYPoolFFI_(Type_) \
+template <> \
+void Primitive<Type_>::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { \
+    *reinterpret_cast<Type_ *>(data) = CYCastDouble(context, value); \
+}

 
 

-            CYThrow("unimplemented signature code: '%c''\n", type->primitive);
+CYPoolFFI_(char)
+CYPoolFFI_(double)
+CYPoolFFI_(float)
+CYPoolFFI_(signed char)
+CYPoolFFI_(signed int)
+CYPoolFFI_(signed long int)
+CYPoolFFI_(signed long long int)
+CYPoolFFI_(signed short int)
+CYPoolFFI_(unsigned char)
+CYPoolFFI_(unsigned int)
+CYPoolFFI_(unsigned long int)
+CYPoolFFI_(unsigned long long int)
+CYPoolFFI_(unsigned short int)
+
+void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    _assert(false);
+}
+
+void Unknown::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    _assert(false);
+}
+
+void String::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    bool guess(false);
+    *reinterpret_cast<const char **>(data) = CYCastPointer<const char *>(context, value, &guess);
+    if (guess && pool != NULL)
+        *reinterpret_cast<const char **>(data) = CYPoolCString(*pool, context, value);
+}
+
+void Bits::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    _assert(false);
+}
+
+static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSValueRef value, JSObjectRef object) {
+    for (size_t index(0); index != length; ++index) {
+        JSValueRef rhs;
+        if (object == NULL)
+            rhs = value;
+        else {
+            rhs = CYGetProperty(context, object, index);
+            if (JSValueIsUndefined(context, rhs))
+                throw CYJSError(context, "unable to extract array value");
+        }
+
+        type.PoolFFI(pool, context, ffi, base, rhs);
+        base += ffi->size;

     }
 }
 
     }
 }
 

-JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) {
-    switch (type->primitive) {
-        case sig::boolean_P:
-            return CYCastJSValue(context, *reinterpret_cast<bool *>(data));
-
-#define CYFromFFI_(primitive, native) \
-        case sig::primitive ## _P: \
-            return CYCastJSValue(context, *reinterpret_cast<native *>(data)); \
-
-        CYFromFFI_(uchar, unsigned char)
-        CYFromFFI_(char, char)
-        CYFromFFI_(ushort, unsigned short)
-        CYFromFFI_(short, short)
-        CYFromFFI_(ulong, unsigned long)
-        CYFromFFI_(long, long)
-        CYFromFFI_(uint, unsigned int)
-        CYFromFFI_(int, int)
-        CYFromFFI_(ulonglong, unsigned long long)
-        CYFromFFI_(longlong, long long)
-        CYFromFFI_(float, float)
-        CYFromFFI_(double, double)
-
-        case sig::array_P:
-            if (void *pointer = data)
-                return CYMakePointer(context, pointer, type->data.data.size, type->data.data.type, NULL, owner);
-            else goto null;
-
-        case sig::pointer_P:
-            if (void *pointer = *reinterpret_cast<void **>(data))
-                return CYMakePointer(context, pointer, _not(size_t), type->data.data.type, NULL, owner);
-            else goto null;
-
-        case sig::string_P:
-            if (char *utf8 = *reinterpret_cast<char **>(data))
-                return CYCastJSValue(context, utf8);
-            else goto null;
-
-        case sig::struct_P:
-            return CYMakeStruct(context, data, type, ffi, owner);
-        case sig::void_P:
-            return CYJSUndefined(context);
-
-        null:
-            return CYJSNull(context);
-        default:
-            if (hooks_ != NULL && hooks_->FromFFI != NULL)
-                if (JSValueRef value = (*hooks_->FromFFI)(context, type, ffi, data, initialize, owner))
-                    return value;
+void Pointer::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    bool guess(false);
+    *reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value, &guess);
+    if (!guess || pool == NULL || !JSValueIsObject(context, value))
+        return;
+    JSObjectRef object(CYCastJSObject(context, value));
+    if (CYHasProperty(context, object, length_s)) {
+        size_t length(CYArrayLength(context, object));
+        ffi_type *element(type.GetFFI(*pool));
+        size_t size(element->size * length);
+        uint8_t *base(pool->malloc<uint8_t>(size, element->alignment));
+        CYArrayCopy(pool, context, base, length, type, element, value, object);
+        *reinterpret_cast<void **>(data) = base;
+    }
+}

 
 

-            CYThrow("unimplemented signature code: '%c''\n", type->primitive);
+void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    if (size == 0)
+        return;
+    uint8_t *base(reinterpret_cast<uint8_t *>(data));
+    JSObjectRef object(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
+    CYArrayCopy(pool, context, base, size, type, ffi->elements[0], value, object);
+}
+
+void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    _assert(!overlap);
+
+    size_t offset(0);
+    uint8_t *base(reinterpret_cast<uint8_t *>(data));
+    JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
+    for (size_t index(0); index != signature.count; ++index) {
+        sig::Element *element(&signature.elements[index]);
+        ffi_type *field(ffi->elements[index]);
+
+        JSValueRef rhs;
+        if (aggregate == NULL)
+            rhs = value;
+        else {
+            rhs = CYGetProperty(context, aggregate, index);
+            if (JSValueIsUndefined(context, rhs)) {
+                if (element->name != NULL)
+                    rhs = CYGetProperty(context, aggregate, CYJSString(element->name));
+                else
+                    goto undefined;
+                if (JSValueIsUndefined(context, rhs)) undefined:
+                    throw CYJSError(context, "unable to extract structure value");
+            }
+        }
+
+        element->type->PoolFFI(pool, context, field, base + offset, rhs);
+        offset += field->size;
+        CYAlign(offset, field->alignment);

     }
 }
 
     }
 }
 

-void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) {
+void Function::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    _assert(false);
+}
+
+#define CYFromFFI_(Type_) \
+template <> \
+JSValueRef Primitive<Type_>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \
+    return CYCastJSValue(context, *reinterpret_cast<Type_ *>(data)); \
+}
+
+CYFromFFI_(bool)
+CYFromFFI_(char)
+CYFromFFI_(double)
+CYFromFFI_(float)
+CYFromFFI_(signed char)
+CYFromFFI_(signed int)
+CYFromFFI_(signed long int)
+CYFromFFI_(signed long long int)
+CYFromFFI_(signed short int)
+CYFromFFI_(unsigned char)
+CYFromFFI_(unsigned int)
+CYFromFFI_(unsigned long int)
+CYFromFFI_(unsigned long long int)
+CYFromFFI_(unsigned short int)
+
+JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return CYJSUndefined(context);
+}
+
+JSValueRef Unknown::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    _assert(false);
+}
+
+JSValueRef String::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    if (char *value = *reinterpret_cast<char **>(data))
+        return CString::Make(context, value, context, owner);
+    return CYJSNull(context);
+}
+
+JSValueRef Bits::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    _assert(false);
+}
+
+JSValueRef Pointer::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    if (void *value = *reinterpret_cast<void **>(data))
+        return CYMakePointer(context, value, type, NULL, owner);
+    return CYJSNull(context);
+}
+
+JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return CArray::Make(context, data, size, type, ffi->elements[0], context, owner);
+}
+
+JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return Struct_privateData::Make(context, data, *this, ffi, context, owner);
+}
+
+JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return CYMakeFunctor(context, reinterpret_cast<void (*)()>(data), variadic, signature);
+}
+
+}
+
+void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) {

     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
     JSContextRef context(internal->context_);
     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
     JSContextRef context(internal->context_);


@@ -710,32 +874,39 @@ void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, J
     JSValueRef values[count];
 
     for (size_t index(0); index != count; ++index)
     JSValueRef values[count];
 
     for (size_t index(0); index != count; ++index)

-        values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]);
+        values[index] = internal->signature_.elements[1 + index].type->FromFFI(context, internal->cif_.arg_types[index], arguments[index]);

 
 

-    JSValueRef value(adapter(context, count, values, internal->function_));
-    CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
+    JSValueRef value(internal->adapter_(context, count, values, internal->function_));
+    if (internal->cif_.rtype != &ffi_type_void)
+        internal->signature_.elements[0].type->PoolFFI(NULL, context, internal->cif_.rtype, result, value);

 }
 
 static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
     return CYCallAsFunction(context, function, NULL, count, values);
 }
 
 }
 
 static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
     return CYCallAsFunction(context, function, NULL, count, values);
 }
 

-static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
-    CYExecuteClosure(cif, result, arguments, arg, &FunctionAdapter_);
+#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
+static void CYFreeFunctor(void *data) {
+    ffi_closure_free(data);
+}
+#else
+static void CYFreeFunctor(void *data) {
+    _syscall(munmap(data, sizeof(ffi_closure)));

 }
 }

+#endif

 
 

-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, void (*callback)(ffi_cif *, void *, void **, void *)) {
+Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) {

     // XXX: in case of exceptions this will leak
     // XXX: in case of exceptions this will leak

-    // XXX: in point of fact, this may /need/ to leak :(
-    Closure_privateData *internal(new Closure_privateData(context, function, signature));
+    Closure_privateData *internal(new Closure_privateData(context, function, adapter, signature));

 
 #if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
     void *executable;
     ffi_closure *writable(reinterpret_cast<ffi_closure *>(ffi_closure_alloc(sizeof(ffi_closure), &executable)));
 
 
 #if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
     void *executable;
     ffi_closure *writable(reinterpret_cast<ffi_closure *>(ffi_closure_alloc(sizeof(ffi_closure), &executable)));
 

-    ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, callback, internal, executable));
+    ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, &CYExecuteClosure, internal, executable));

     _assert(status == FFI_OK);
 
     _assert(status == FFI_OK);
 

+    internal->pool_->atexit(&CYFreeFunctor, writable);

     internal->value_ = executable;
 #else
     ffi_closure *closure((ffi_closure *) _syscall(mmap(
     internal->value_ = executable;
 #else
     ffi_closure *closure((ffi_closure *) _syscall(mmap(


@@ -744,11 +915,12 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
         -1, 0
     )));
 
         -1, 0
     )));
 

-    ffi_status status(ffi_prep_closure(closure, &internal->cif_, callback, internal));
+    ffi_status status(ffi_prep_closure(closure, &internal->cif_, &CYExecuteClosure, internal));

     _assert(status == FFI_OK);
 
     _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
 
     _assert(status == FFI_OK);
 
     _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
 

+    internal->pool_->atexit(&CYFreeFunctor, closure);

     internal->value_ = closure;
 #endif
 
     internal->value_ = closure;
 #endif
 


@@ -756,18 +928,22 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
 }
 
 static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) {
 }
 
 static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) {

-    Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionClosure_));
+    Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionAdapter_));

     JSObjectRef object(JSObjectMake(context, Functor_, internal));
     // XXX: see above notes about needing to leak
     JSValueProtect(CYGetJSContext(context), object);
     return object;
 }
 
     JSObjectRef object(JSObjectMake(context, Functor_, internal));
     // XXX: see above notes about needing to leak
     JSValueProtect(CYGetJSContext(context), object);
     return object;
 }
 

+JSValueRef CYGetCachedValue(JSContextRef context, JSStringRef name) {
+    return CYGetProperty(context, CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s)), name);
+}
+

 JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) {
 JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) {

-    return CYCastJSObject(context, CYGetProperty(context, CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s)), name));
+    return CYCastJSObject(context, CYGetCachedValue(context, name));

 }
 
 }
 

-static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const sig::Signature &signature) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, bool variadic, const sig::Signature &signature) {

     JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function")));
 
     bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function));
     JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function")));
 
     bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function));


@@ -776,13 +952,37 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const s
         return CYMakeFunctor(context, function, signature);
     } else {
         void (*function)()(CYCastPointer<void (*)()>(context, value));
         return CYMakeFunctor(context, function, signature);
     } else {
         void (*function)()(CYCastPointer<void (*)()>(context, value));

-        return CYMakeFunctor(context, function, signature);
+        return CYMakeFunctor(context, function, variadic, signature);

     }
 }
 
     }
 }
 

+static JSValueRef CString_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    CYPool pool;
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
+
+    ssize_t offset;
+    if (!CYGetOffset(pool, context, property, offset))
+        return NULL;
+
+    return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->GetValue()[offset], 1)));
+} CYCatch(NULL) }
+
+static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
+    CYPool pool;
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
+
+    ssize_t offset;
+    if (!CYGetOffset(pool, context, property, offset))
+        return false;
+
+    const char *data(CYPoolCString(pool, context, value));
+    internal->GetValue()[offset] = *data;
+    return true;
+} CYCatch(false) }
+

 static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {
     Type_privateData *typical(internal->type_);
 static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {
     Type_privateData *typical(internal->type_);

-    sig::Type *type(typical->type_);
+    sig::Aggregate *type(static_cast<sig::Aggregate *>(typical->type_));

     if (type == NULL)
         return false;
 
     if (type == NULL)
         return false;
 


@@ -790,13 +990,13 @@ static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *inter
     size_t length(strlen(name));
     double number(CYCastDouble(name, length));
 
     size_t length(strlen(name));
     double number(CYCastDouble(name, length));
 

-    size_t count(type->data.signature.count);
+    size_t count(type->signature.count);

 
     if (std::isnan(number)) {
         if (property == NULL)
             return false;
 
 
     if (std::isnan(number)) {
         if (property == NULL)
             return false;
 

-        sig::Element *elements(type->data.signature.elements);
+        sig::Element *elements(type->signature.elements);

 
         for (size_t local(0); local != count; ++local) {
             sig::Element *element(&elements[local]);
 
         for (size_t local(0); local != count; ++local) {
             sig::Element *element(&elements[local]);


@@ -816,76 +1016,99 @@ static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *inter
   base:
     ffi_type **elements(typical->GetFFI()->elements);
 
   base:
     ffi_type **elements(typical->GetFFI()->elements);
 

-    base = reinterpret_cast<uint8_t *>(internal->value_);
-    for (ssize_t local(0); local != index; ++local)
-        base += elements[local]->size;
+    size_t offset(0);
+    for (ssize_t local(0); local != index; ++local) {
+        offset += elements[local]->size;
+        CYAlign(offset, elements[local + 1]->alignment);
+    }

 
 

+    base = reinterpret_cast<uint8_t *>(internal->value_) + offset;

     return true;
 }
 
     return true;
 }
 

-static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYPool pool;
-    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
-
-    if (JSStringIsEqual(property, length_s))
-        return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_);
-
-    Type_privateData *typical(internal->type_);
-    if (typical->type_ == NULL)
-        return NULL;
-    sig::Type &type(*typical->type_);
-
+static void *Offset_(CYPool &pool, JSContextRef context, JSStringRef property, void *data, ffi_type *ffi) {

     ssize_t offset;
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))
         offset = 0;
     else if (!CYGetOffset(pool, context, property, offset))
         return NULL;
     ssize_t offset;
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))
         offset = 0;
     else if (!CYGetOffset(pool, context, property, offset))
         return NULL;

+    return reinterpret_cast<uint8_t *>(data) + ffi->size * offset;
+}

 
 

-    if (type.primitive == sig::function_P)
-        return CYMakeFunctor(context, reinterpret_cast<void (*)()>(internal->value_), type.data.signature);
+static JSValueRef Offset_getProperty(CYPool &pool, JSContextRef context, JSStringRef property, void *data, Type_privateData *typical, JSObjectRef owner) {
+    ffi_type *ffi(typical->GetFFI());
+    void *base(Offset_(pool, context, property, data, ffi));
+    if (base == NULL)
+        return NULL;
+    return typical->type_->FromFFI(context, ffi, base, false, owner);
+}

 
 

+static bool Offset_setProperty(CYPool &pool, JSContextRef context, JSStringRef property, void *data, Type_privateData *typical, JSValueRef value) {

     ffi_type *ffi(typical->GetFFI());
     ffi_type *ffi(typical->GetFFI());

+    void *base(Offset_(pool, context, property, data, ffi));
+    if (base == NULL)
+        return false;

 
 

-    uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
-    base += ffi->size * offset;
+    typical->type_->PoolFFI(NULL, context, ffi, base, value);
+    return true;
+}

 
 

-    JSObjectRef owner(internal->GetOwner() ?: object);
-    return CYFromFFI(context, &type, ffi, base, false, owner);
+static JSValueRef CArray_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    CYPool pool;
+    CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(object)));
+    if (JSStringIsEqual(property, length_s))
+        return CYCastJSValue(context, internal->length_);
+    Type_privateData *typical(internal->type_);
+    JSObjectRef owner(internal->owner_ ?: object);
+    return Offset_getProperty(pool, context, property, internal->value_, typical, owner);

 } CYCatch(NULL) }
 
 } CYCatch(NULL) }
 

-static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
+static bool CArray_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {

     CYPool pool;
     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
     Type_privateData *typical(internal->type_);
     CYPool pool;
     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
     Type_privateData *typical(internal->type_);

+    return Offset_setProperty(pool, context, property, internal->value_, typical, value);
+} CYCatch(false) }

 
 

-    if (typical->type_ == NULL)
-        return false;
+static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    CYPool pool;
+    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));

 
 

-    ssize_t offset;
-    if (JSStringIsEqualToUTF8CString(property, "$cyi"))
-        offset = 0;
-    else if (!CYGetOffset(pool, context, property, offset))
-        return false;
+    Type_privateData *typical(internal->type_);

 
 

-    ffi_type *ffi(typical->GetFFI());
+    if (sig::Function *function = dynamic_cast<sig::Function *>(typical->type_)) {
+        if (!JSStringIsEqualToUTF8CString(property, "$cyi"))
+            return NULL;
+        return CYMakeFunctor(context, reinterpret_cast<void (*)()>(internal->value_), function->variadic, function->signature);
+    }

 
 

-    uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
-    base += ffi->size * offset;
+    JSObjectRef owner(internal->owner_ ?: object);
+    return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
+} CYCatch(NULL) }

 
 

-    CYPoolFFI(NULL, context, typical->type_, ffi, base, value);
-    return true;
+static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
+    CYPool pool;
+    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
+    Type_privateData *typical(internal->type_);
+    return Offset_setProperty(pool, context, property, internal->value_, typical, value);

 } CYCatch(false) }
 
 static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(_this)));
     Type_privateData *typical(internal->type_);
 } CYCatch(false) }
 
 static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(_this)));
     Type_privateData *typical(internal->type_);

-    return CYMakePointer(context, internal->value_, _not(size_t), typical->type_, typical->ffi_, _this);
+    return CYMakePointer(context, internal->value_, *typical->type_, typical->ffi_, _this);
+} CYCatch(NULL) }
+
+static JSValueRef Struct_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
+    return CYMakeType(context, *internal->type_->type_);

 } CYCatch(NULL) }
 
 static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
     Type_privateData *typical(internal->type_);
 } CYCatch(NULL) }
 
 static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
     Type_privateData *typical(internal->type_);

+    sig::Aggregate *type(static_cast<sig::Aggregate *>(typical->type_));

 
     ssize_t index;
     uint8_t *base;
 
     ssize_t index;
     uint8_t *base;


@@ -893,15 +1116,16 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J
     if (!Index_(pool, context, internal, property, index, base))
         return NULL;
 
     if (!Index_(pool, context, internal, property, index, base))
         return NULL;
 

-    JSObjectRef owner(internal->GetOwner() ?: object);
+    JSObjectRef owner(internal->owner_ ?: object);

 
 

-    return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner);
+    return type->signature.elements[index].type->FromFFI(context, typical->GetFFI()->elements[index], base, false, owner);

 } CYCatch(NULL) }
 
 static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     CYPool pool;
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
     Type_privateData *typical(internal->type_);
 } CYCatch(NULL) }
 
 static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     CYPool pool;
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
     Type_privateData *typical(internal->type_);

+    sig::Aggregate *type(static_cast<sig::Aggregate *>(typical->type_));

 
     ssize_t index;
     uint8_t *base;
 
     ssize_t index;
     uint8_t *base;


@@ -909,20 +1133,20 @@ static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStrin
     if (!Index_(pool, context, internal, property, index, base))
         return false;
 
     if (!Index_(pool, context, internal, property, index, base))
         return false;
 

-    CYPoolFFI(NULL, context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, value);
+    type->signature.elements[index].type->PoolFFI(NULL, context, typical->GetFFI()->elements[index], base, value);

     return true;
 } CYCatch(false) }
 
 static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
     Type_privateData *typical(internal->type_);
     return true;
 } CYCatch(false) }
 
 static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
     Type_privateData *typical(internal->type_);

-    sig::Type *type(typical->type_);
+    sig::Aggregate *type(static_cast<sig::Aggregate *>(typical->type_));

 
     if (type == NULL)
         return;
 
 
     if (type == NULL)
         return;
 

-    size_t count(type->data.signature.count);
-    sig::Element *elements(type->data.signature.elements);
+    size_t count(type->signature.count);
+    sig::Element *elements(type->signature.elements);

 
     char number[32];
 
 
     char number[32];
 


@@ -939,62 +1163,128 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS
     }
 }
 
     }
 }
 

-JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)()) {
-    if (setups + count != signature->count - 1)
-        throw CYJSError(context, "incorrect number of arguments to ffi function");
-
-    size_t size(setups + count);
-    void *values[size];
-    memcpy(values, setup, sizeof(void *) * setups);
+static sig::Void Void_;
+static sig::Pointer PointerToVoid_(Void_);

 
 

-    for (size_t index(setups); index != size; ++index) {
-        sig::Element *element(&signature->elements[index + 1]);
+static sig::Type *CYGetType(CYPool &pool, JSContextRef context, JSValueRef value) {
+    if (JSValueIsNull(context, value))
+        return &PointerToVoid_;
+    JSObjectRef object(CYCastJSObject(context, value));
+    JSObjectRef type(CYCastJSObject(context, CYGetProperty(context, object, cyt_s)));
+    _assert(JSValueIsObjectOfClass(context, type, Type_privateData::Class_));
+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(type)));
+    return internal->type_;
+}
+
+void CYCallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values) {
+    ffi_call(cif, function, value, values);
+}
+
+JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, bool variadic, const sig::Signature &signature, ffi_cif *cif, void (*function)()) {
+    size_t have(setups + count);
+    size_t need(signature.count - 1);
+
+    if (have < need)
+        throw CYJSError(context, "insufficient number of arguments to ffi function");
+
+    ffi_cif corrected;
+    sig::Element *elements(signature.elements);
+
+    if (have > need) {
+        if (!variadic)
+            throw CYJSError(context, "exorbitant number of arguments to ffi function");
+
+        elements = new (pool) sig::Element[have + 1];
+        memcpy(elements, signature.elements, sizeof(sig::Element) * (need + 1));
+
+        for (size_t index(need); index != have; ++index) {
+            sig::Element &element(elements[index + 1]);
+            element.name = NULL;
+            element.offset = _not(size_t);
+            element.type = CYGetType(pool, context, arguments[index - setups]);
+        }
+
+        sig::Signature extended;
+        extended.elements = elements;
+        extended.count = have + 1;
+        sig::sig_ffi_cif(pool, signature.count, extended, &corrected);
+        cif = &corrected;
+    }
+
+    void *values[have];
+    memcpy(values, setup, sizeof(void *) * setups);
+
+    for (size_t index(setups); index != have; ++index) {
+        sig::Element &element(elements[index + 1]);

         ffi_type *ffi(cif->arg_types[index]);
         ffi_type *ffi(cif->arg_types[index]);

-        // XXX: alignment?
-        values[index] = new(pool) uint8_t[ffi->size];
-        CYPoolFFI(&pool, context, element->type, ffi, values[index], arguments[index - setups]);
+        values[index] = pool.malloc<uint8_t>(ffi->size, ffi->alignment);
+        element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);

     }
 
     uint8_t value[cif->rtype->size];
 
     }
 
     uint8_t value[cif->rtype->size];
 

-    if (hooks_ != NULL && hooks_->CallFunction != NULL)
-        (*hooks_->CallFunction)(context, cif, function, value, values);
-    else
-        ffi_call(cif, function, value, values);
+    void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
+    // XXX: this only supports one hook, but it is a bad idea anyway
+    for (CYHook *hook : GetHooks())
+        if (hook->CallFunction != NULL)
+            call = hook->CallFunction;

 
 

-    return CYFromFFI(context, signature->elements[0].type, cif->rtype, value, initialize);
+    call(pool, context, cif, function, value, values);
+    return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize);

 }
 
 static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYPool pool;
     cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
 }
 
 static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYPool pool;
     cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));

-    return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue());
+    return CYCallFunction(pool, context, 0, NULL, count, arguments, false, internal->variadic_, internal->signature_, &internal->cif_, internal->GetValue());

 } CYCatch(NULL) }
 
 } CYCatch(NULL) }
 

-JSObjectRef CYMakeType(JSContextRef context, const char *encoding) {
-    Type_privateData *internal(new Type_privateData(encoding));
-    return JSObjectMake(context, Type_privateData::Class_, internal);
-}
+static JSValueRef Pointer_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
+    if (dynamic_cast<sig::Function *>(internal->type_->type_) == NULL)
+        throw CYJSError(context, "cannot call a pointer to non-function");
+    JSObjectRef functor(CYCastJSObject(context, CYGetProperty(context, object, cyi_s)));
+    return CYCallAsFunction(context, functor, _this, count, arguments);
+} CYCatch(NULL) }

 
 

-JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) {
+JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type) {

     Type_privateData *internal(new Type_privateData(type));
     return JSObjectMake(context, Type_privateData::Class_, internal);
 }
 
     Type_privateData *internal(new Type_privateData(type));
     return JSObjectMake(context, Type_privateData::Class_, internal);
 }
 

-JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature) {
-    CYPool pool;
+extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) {
+    sqlite3_stmt *statement;

 
 

-    sig::Type type;
-    type.name = NULL;
-    type.flags = 0;
+    _sqlcall(sqlite3_prepare(database_,
+        "select "
+            "\"cache\".\"code\", "
+            "\"cache\".\"flags\" "
+        "from \"cache\" "
+        "where"
+            " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM " and"
+            " \"cache\".\"name\" = ?"
+        " limit 1"
+    , -1, &statement, NULL));

 
 

-    type.primitive = sig::function_P;
-    sig::Copy(pool, type.data.signature, *signature);
+    _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC));

 
 

-    return CYMakeType(context, &type);
+    bool success;
+    if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE)
+        success = false;
+    else {
+        success = true;
+        code = sqlite3_column_pooled(pool, statement, 0);
+        flags = sqlite3_column_int(statement, 1);
+    }
+
+    _sqlcall(sqlite3_finalize(statement));
+    return success;

 }
 
 static bool All_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
 }
 
 static bool All_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {

+    if (JSStringIsEqualToUTF8CString(property, "errno"))
+        return true;
+

     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
     JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
     JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));


@@ -1005,23 +1295,18 @@ static bool All_hasProperty(JSContextRef context, JSObjectRef object, JSStringRe
                 return true;
 
     CYPool pool;
                 return true;
 
     CYPool pool;

-    CYUTF8String name(CYPoolUTF8String(pool, context, property));
-
-    size_t length(name.size);
-    char keyed[length + 2];
-    memcpy(keyed + 1, name.data, length + 1);
-
-    static const char *modes = "0124";
-    for (size_t i(0); i != 4; ++i) {
-        keyed[0] = modes[i];
-        if (CYBridgeHash(keyed, length + 1) != NULL)
-            return true;
-    }
+    const char *code;
+    unsigned flags;
+    if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags))
+        return true;

 
     return false;
 }
 
 static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
 
     return false;
 }
 
 static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

+    if (JSStringIsEqualToUTF8CString(property, "errno"))
+        return CYCastJSValue(context, errno);
+

     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
     JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
     JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));


@@ -1033,44 +1318,76 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt
                     return value;
 
     CYPool pool;
                     return value;
 
     CYPool pool;

-    CYUTF8String name(CYPoolUTF8String(pool, context, property));
-
-    size_t length(name.size);
-    char keyed[length + 2];
-    memcpy(keyed + 1, name.data, length + 1);
-
-    static const char *modes = "0124";
-    for (size_t i(0); i != 4; ++i) {
-        char mode(modes[i]);
-        keyed[0] = mode;
-
-        if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
-            switch (mode) {
-                case '0':
-                    return JSEvaluateScript(CYGetJSContext(context), CYJSString(entry->value_), NULL, NULL, 0, NULL);
-
-                case '1':
-                    return CYMakeFunctor(context, name.data, entry->value_, &entry->cache_);
-
-                case '2':
-                    if (void *symbol = CYCastSymbol(name.data)) {
-                        // XXX: this is horrendously inefficient
-                        sig::Signature signature;
-                        sig::Parse(pool, &signature, entry->value_, &Structor_);
-                        ffi_cif cif;
-                        sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
-                        return CYFromFFI(context, signature.elements[0].type, cif.rtype, symbol);
-                    } else return NULL;
-
-                // XXX: implement case 3
-                case '4':
-                    return CYMakeType(context, entry->value_);
-            }
+    const char *code;
+    unsigned flags;
+    if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags)) {
+        CYUTF8String parsed;
+
+        try {
+            parsed = CYPoolCode(pool, code);
+        } catch (const CYException &error) {
+            CYThrow("%s", pool.strcat("error caching ", CYPoolCString(pool, context, property), ": ", error.PoolCString(pool), NULL));
+        }
+
+        JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(parsed), NULL, NULL, 0));
+
+        if (flags == 0) {
+            JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache")));
+            CYSetProperty(context, cache, property, result);
+        }
+
+        return result;

     }
 
     return NULL;
 } CYCatch(NULL) }
 
     }
 
     return NULL;
 } CYCatch(NULL) }
 

+static JSValueRef All_complete_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    _assert(count == 1);
+    CYPool pool;
+    CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+
+    JSObjectRef array(NULL);
+
+    {
+    CYArrayBuilder<1024> values(context, array);
+
+    sqlite3_stmt *statement;
+
+    if (prefix.size == 0)
+        _sqlcall(sqlite3_prepare(database_,
+            "select "
+                "\"cache\".\"name\" "
+            "from \"cache\" "
+            "where"
+                " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM
+        , -1, &statement, NULL));
+    else {
+        _sqlcall(sqlite3_prepare(database_,
+            "select "
+                "\"cache\".\"name\" "
+            "from \"cache\" "
+            "where"
+                " \"cache\".\"name\" >= ? and \"cache\".\"name\" < ? and "
+                " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM
+        , -1, &statement, NULL));
+
+        _sqlcall(sqlite3_bind_text(statement, 1, prefix.data, prefix.size, SQLITE_STATIC));
+
+        char *after(pool.strndup(prefix.data, prefix.size));
+        ++after[prefix.size - 1];
+        _sqlcall(sqlite3_bind_text(statement, 2, after, prefix.size, SQLITE_STATIC));
+    }
+
+    while (_sqlcall(sqlite3_step(statement)) != SQLITE_DONE)
+        values(CYCastJSValue(context, CYJSString(sqlite3_column_string(statement, 0))));
+
+    _sqlcall(sqlite3_finalize(statement));
+    }
+
+    return array;
+} CYCatch(NULL) }
+

 static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
 static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));


@@ -1085,48 +1402,73 @@ static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPro
         }
 }
 
         }
 }
 

-static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count != 2)
-        throw CYJSError(context, "incorrect number of arguments to Pointer constructor");
-
-    CYPool pool;
-
-    void *value(CYCastPointer<void *>(context, arguments[0]));
-    const char *type(CYPoolCString(pool, context, arguments[1]));
+static JSObjectRef CArray_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    _assert(false);
+} CYCatch(NULL) }

 
 

-    sig::Signature signature;
-    sig::Parse(pool, &signature, type, &Structor_);
+static JSObjectRef CString_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    _assert(false);
+} CYCatch(NULL) }

 
 

-    return CYMakePointer(context, value, _not(size_t), signature.elements[0].type, NULL, NULL);
+static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    _assert(false);

 } CYCatch(NULL) }
 
 static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

-    if (count != 1)
-        throw CYJSError(context, "incorrect number of arguments to Type constructor");

     CYPool pool;
     CYPool pool;

-    const char *type(CYPoolCString(pool, context, arguments[0]));
-    return CYMakeType(context, type);
+
+    if (false) {
+    } else if (count == 1) {
+        const char *encoding(CYPoolCString(pool, context, arguments[0]));
+        sig::Signature signature;
+        sig::Parse(pool, &signature, encoding, &Structor_);
+        return CYMakeType(context, *signature.elements[0].type);
+    } else if (count == 2) {
+        JSObjectRef types(CYCastJSObject(context, arguments[0]));
+        size_t count(CYArrayLength(context, types));
+
+        JSObjectRef names(CYCastJSObject(context, arguments[1]));
+
+        sig::Aggregate type(false);
+        type.signature.elements = new(pool) sig::Element[count];
+        type.signature.count = count;
+
+        for (size_t i(0); i != count; ++i) {
+            sig::Element &element(type.signature.elements[i]);
+            element.offset = _not(size_t);
+
+            JSValueRef name(CYArrayGet(context, names, i));
+            if (JSValueIsUndefined(context, name))
+                element.name = NULL;
+            else
+                element.name = CYPoolCString(pool, context, name);
+
+            JSObjectRef object(CYCastJSObject(context, CYArrayGet(context, types, i)));
+            _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_));
+            Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+            element.type = internal->type_;
+        }
+
+        return CYMakeType(context, type);
+    } else {
+        throw CYJSError(context, "incorrect number of arguments to Type constructor");
+    }

 } CYCatch(NULL) }
 
 } CYCatch(NULL) }
 

-static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Primitive primitive, JSValueRef *exception) { CYTry {
+static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Callable &type, JSValueRef *exception) { CYTry {

     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 
     CYPool pool;
 
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 
     CYPool pool;
 

-    sig::Type type;
-    type.name = NULL;
-    type.flags = 0;
-
-    type.primitive = primitive;
-    type.data.signature.elements = new(pool) sig::Element[1 + count];
-    type.data.signature.count = 1 + count;
+    type.signature.elements = new(pool) sig::Element[1 + count];
+    type.signature.count = 1 + count;

 
 

-    type.data.signature.elements[0].name = NULL;
-    type.data.signature.elements[0].type = internal->type_;
-    type.data.signature.elements[0].offset = _not(size_t);
+    type.signature.elements[0].name = NULL;
+    type.signature.elements[0].type = internal->type_;
+    type.signature.elements[0].offset = _not(size_t);

 
     for (size_t i(0); i != count; ++i) {
 
     for (size_t i(0); i != count; ++i) {

-        sig::Element &element(type.data.signature.elements[i + 1]);
+        sig::Element &element(type.signature.elements[i + 1]);

         element.name = NULL;
         element.offset = _not(size_t);
 
         element.name = NULL;
         element.offset = _not(size_t);
 


@@ -1137,7 +1479,7 @@ static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef ob
         element.type = internal->type_;
     }
 
         element.type = internal->type_;
     }
 

-    return CYMakeType(context, &type);
+    return CYMakeType(context, type);

 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1150,19 +1492,13 @@ static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef
     if (index == _not(size_t))
         throw CYJSError(context, "invalid array size used with Type.arrayOf");
 
     if (index == _not(size_t))
         throw CYJSError(context, "invalid array size used with Type.arrayOf");
 

-    sig::Type type;
-    type.name = NULL;
-    type.flags = 0;
-
-    type.primitive = sig::array_P;
-    type.data.data.type = internal->type_;
-    type.data.data.size = index;
-
-    return CYMakeType(context, &type);
+    sig::Array type(*internal->type_, index);
+    return CYMakeType(context, type);

 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_blockWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_blockWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

-    return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::block_P, exception);
+    sig::Block type;
+    return Type_callAsFunction_$With(context, object, _this, count, arguments, type, exception);

 }
 
 static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 }
 
 static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1170,85 +1506,16 @@ static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef
         throw CYJSError(context, "incorrect number of arguments to Type.constant");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 
         throw CYJSError(context, "incorrect number of arguments to Type.constant");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 

-    sig::Type type(*internal->type_);
-    type.flags |= JOC_TYPE_CONST;
-    return CYMakeType(context, &type);
-} CYCatch(NULL) }
-
-static JSValueRef Type_callAsFunction_long(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count != 0)
-        throw CYJSError(context, "incorrect number of arguments to Type.long");
-    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-
-    sig::Type type(*internal->type_);
-
-    switch (type.primitive) {
-        case sig::short_P: type.primitive = sig::int_P; break;
-        case sig::int_P: type.primitive = sig::long_P; break;
-        case sig::long_P: type.primitive = sig::longlong_P; break;
-        default: throw CYJSError(context, "invalid type argument to Type.long");
-    }
-
-    return CYMakeType(context, &type);
-} CYCatch(NULL) }
-
-static JSValueRef Type_callAsFunction_short(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count != 0)
-        throw CYJSError(context, "incorrect number of arguments to Type.short");
-    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-
-    sig::Type type(*internal->type_);
-
-    switch (type.primitive) {
-        case sig::int_P: type.primitive = sig::short_P; break;
-        case sig::long_P: type.primitive = sig::int_P; break;
-        case sig::longlong_P: type.primitive = sig::long_P; break;
-        default: throw CYJSError(context, "invalid type argument to Type.short");
-    }
-
-    return CYMakeType(context, &type);
-} CYCatch(NULL) }
-
-static JSValueRef Type_callAsFunction_signed(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count != 0)
-        throw CYJSError(context, "incorrect number of arguments to Type.signed");
-    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-
-    sig::Type type(*internal->type_);
-
-    switch (type.primitive) {
-        case sig::char_P: case sig::uchar_P: type.primitive = sig::char_P; break;
-        case sig::short_P: case sig::ushort_P: type.primitive = sig::short_P; break;
-        case sig::int_P: case sig::uint_P: type.primitive = sig::int_P; break;
-        case sig::long_P: case sig::ulong_P: type.primitive = sig::long_P; break;
-        case sig::longlong_P: case sig::ulonglong_P: type.primitive = sig::longlong_P; break;
-        default: throw CYJSError(context, "invalid type argument to Type.signed");
-    }
-
-    return CYMakeType(context, &type);
-} CYCatch(NULL) }
-
-static JSValueRef Type_callAsFunction_unsigned(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count != 0)
-        throw CYJSError(context, "incorrect number of arguments to Type.unsigned");
-    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-
-    sig::Type type(*internal->type_);
-
-    switch (type.primitive) {
-        case sig::char_P: case sig::uchar_P: type.primitive = sig::uchar_P; break;
-        case sig::short_P: case sig::ushort_P: type.primitive = sig::ushort_P; break;
-        case sig::int_P: case sig::uint_P: type.primitive = sig::uint_P; break;
-        case sig::long_P: case sig::ulong_P: type.primitive = sig::ulong_P; break;
-        case sig::longlong_P: case sig::ulonglong_P: type.primitive = sig::ulonglong_P; break;
-        default: throw CYJSError(context, "invalid type argument to Type.unsigned");
-    }
-
-    return CYMakeType(context, &type);
+    CYPool pool;
+    sig::Type *type(internal->type_->Copy(pool));
+    type->flags |= JOC_TYPE_CONST;
+    return CYMakeType(context, *type);

 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

-    return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::function_P, exception);
+    bool variadic(count != 0 && JSValueIsNull(context, arguments[count - 1]));
+    sig::Function type(variadic);
+    return Type_callAsFunction_$With(context, object, _this, variadic ? count - 1 : count, arguments, type, exception);

 }
 
 static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 }
 
 static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1256,22 +1523,10 @@ static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRe
         throw CYJSError(context, "incorrect number of arguments to Type.pointerTo");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 
         throw CYJSError(context, "incorrect number of arguments to Type.pointerTo");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 

-    sig::Type type;
-    type.name = NULL;
-
-    if (internal->type_->primitive == sig::char_P) {
-        type.flags = internal->type_->flags;
-        type.primitive = sig::string_P;
-        type.data.data.type = NULL;
-        type.data.data.size = 0;
-    } else {
-        type.flags = 0;
-        type.primitive = sig::pointer_P;
-        type.data.data.type = internal->type_;
-        type.data.data.size = 0;
-    }
-
-    return CYMakeType(context, &type);
+    if (dynamic_cast<sig::Primitive<char> *>(internal->type_) != NULL)
+        return CYMakeType(context, sig::String());
+    else
+        return CYMakeType(context, sig::Pointer(*internal->type_));

 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_withName(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_withName(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1280,11 +1535,7 @@ static JSValueRef Type_callAsFunction_withName(JSContextRef context, JSObjectRef
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 
     CYPool pool;
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 
     CYPool pool;

-    const char *name(CYPoolCString(pool, context, arguments[0]));
-
-    sig::Type type(*internal->type_);
-    type.name = name;
-    return CYMakeType(context, &type);
+    return CYMakeType(context, *internal->type_->Copy(pool, CYPoolCString(pool, context, arguments[0])));

 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1292,16 +1543,24 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
         throw CYJSError(context, "incorrect number of arguments to type cast function");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
         throw CYJSError(context, "incorrect number of arguments to type cast function");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 

-    if (internal->type_->primitive == sig::function_P)
-        return CYMakeFunctor(context, arguments[0], internal->type_->data.signature);
+    if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
+        return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);

 
 

+    CYPool pool;

     sig::Type *type(internal->type_);
     ffi_type *ffi(internal->GetFFI());
     sig::Type *type(internal->type_);
     ffi_type *ffi(internal->GetFFI());

-    // XXX: alignment?
-    uint8_t value[ffi->size];
-    CYPool pool;
-    CYPoolFFI(&pool, context, type, ffi, value, arguments[0]);
-    return CYFromFFI(context, type, ffi, value);
+
+    void *data(pool.malloc<void>(ffi->size, ffi->alignment));
+    type->PoolFFI(&pool, context, ffi, data, arguments[0]);
+    JSValueRef value(type->FromFFI(context, ffi, data));
+
+    if (JSValueGetType(context, value) == kJSTypeNumber) {
+        JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value));
+        CYSetProperty(context, typed, cyt_s, object, kJSPropertyAttributeDontEnum);
+        value = typed;
+    }
+
+    return value;

 } CYCatch(NULL) }
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1309,18 +1568,12 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje
         throw CYJSError(context, "incorrect number of arguments to Type allocator");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
         throw CYJSError(context, "incorrect number of arguments to Type allocator");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 

-    sig::Type *type(internal->type_);
-    size_t length;
-
-    if (type->primitive != sig::array_P)
-        length = _not(size_t);
-    else {
-        length = type->data.data.size;
-        type = type->data.data.type;
-    }
-
-    void *value(calloc(1, internal->GetFFI()->size));
-    return CYMakePointer(context, value, length, type, NULL, NULL);
+    JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL));
+    Pointer *value(reinterpret_cast<Pointer *>(JSObjectGetPrivate(pointer)));
+    ffi_type *ffi(internal->GetFFI());
+    value->value_ = value->pool_->malloc<void>(ffi->size, ffi->alignment);
+    memset(value->value_, 0, ffi->size);
+    return pointer;

 } CYCatch(NULL) }
 
 static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1330,7 +1583,33 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t
     const char *encoding(CYPoolCString(pool, context, arguments[1]));
     sig::Signature signature;
     sig::Parse(pool, &signature, encoding, &Structor_);
     const char *encoding(CYPoolCString(pool, context, arguments[1]));
     sig::Signature signature;
     sig::Parse(pool, &signature, encoding, &Structor_);

-    return CYMakeFunctor(context, arguments[0], signature);
+    return CYMakeFunctor(context, arguments[0], false, signature);
+} CYCatch(NULL) }
+
+static JSValueRef CArray_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(_this)));
+    JSObjectRef owner(internal->owner_ ?: object);
+    return CYMakePointer(context, internal->value_, *internal->type_->type_, NULL, owner);
+} CYCatch(NULL) }
+
+static JSValueRef CString_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
+    JSObjectRef owner(internal->owner_ ?: object);
+    return CYMakePointer(context, internal->value_, sig::Primitive<char>(), NULL, owner);
+} CYCatch(NULL) }
+
+static JSValueRef Functor_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    CYPool pool;
+    cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(_this)));
+
+    sig::Function type(internal->variadic_);
+    sig::Copy(pool, type.signature, internal->signature_);
+
+    return CYMakePointer(context, internal->value_, type, NULL, NULL);
+} CYCatch(NULL) }
+
+static JSValueRef Pointer_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    return _this;

 } CYCatch(NULL) }
 
 static JSValueRef CYValue_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSValueRef CYValue_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1344,40 +1623,97 @@ static JSValueRef CYValue_callAsFunction_toJSON(JSContextRef context, JSObjectRe
 
 static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
 
 static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));

-    char string[32];
-    sprintf(string, "%p", internal->value_);
-    return CYCastJSValue(context, string);
+    std::ostringstream str;
+    Dl_info info;
+    if (internal->value_ == NULL)
+        str << "NULL";
+    else if (dladdr(internal->value_, &info) == 0)
+        str << internal->value_;
+    else {
+        str << info.dli_sname;
+        off_t offset(static_cast<char *>(internal->value_) - static_cast<char *>(info.dli_saddr));
+        if (offset != 0)
+            str << "+0x" << std::hex << offset;
+    }
+    std::string value(str.str());
+    return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));

 } CYCatch(NULL) }
 
 static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

+    std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
+

     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));

-    if (internal->length_ != _not(size_t)) {
-        JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
-        JSObjectRef toCYON(CYCastJSObject(context, CYGetProperty(context, Array, toCYON_s)));
-        return CYCallAsFunction(context, toCYON, _this, count, arguments);
-    } else if (internal->type_->type_ == NULL) pointer: {
-        char string[32];
-        sprintf(string, "%p", internal->value_);
-        return CYCastJSValue(context, string);
-    } try {
+
+    try {

         JSValueRef value(CYGetProperty(context, _this, cyi_s));
         JSValueRef value(CYGetProperty(context, _this, cyi_s));

-        if (JSValueIsUndefined(context, value))
-            goto pointer;
-        CYPool pool;
-        return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value), NULL));
+        if (!JSValueIsUndefined(context, value)) {
+            CYPool pool;
+            return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value, objects), NULL));
+        }

     } catch (const CYException &e) {
     } catch (const CYException &e) {

-        goto pointer;
+        // XXX: it might be interesting to include this error

     }
     }

+
+    CYLocalPool pool;
+    std::ostringstream str;
+
+    sig::Pointer type(*internal->type_->type_);
+
+    CYOptions options;
+    CYOutput output(*str.rdbuf(), options);
+    (new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->Output(output, CYNoFlags);
+
+    str << "(" << internal->value_ << ")";
+    std::string value(str.str());
+    return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));

 } CYCatch(NULL) }
 
 } CYCatch(NULL) }
 

-static JSValueRef Pointer_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
+    return CYCastJSValue(context, strlen(internal->GetValue()));
+} CYCatch(NULL) }
+
+static JSValueRef CString_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    return CYMakeType(context, sig::String());
+} CYCatch(NULL) }
+
+static JSValueRef CArray_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(object)));
+    sig::Array type(*internal->type_->type_, internal->length_);
+    return CYMakeType(context, type);
+} CYCatch(NULL) }
+
+static JSValueRef Pointer_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));

-    return CYMakeType(context, internal->type_->type_);
+    sig::Pointer type(*internal->type_->type_);
+    return CYMakeType(context, type);

 } CYCatch(NULL) }
 
 } CYCatch(NULL) }
 

-static JSValueRef Functor_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef CString_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
+    const char *string(internal->GetValue());
+    std::ostringstream str;
+    if (string == NULL)
+        str << "NULL";
+    else {
+        str << "&";
+        CYStringify(str, string, strlen(string), true);
+    }
+    std::string value(str.str());
+    return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
+} CYCatch(NULL) }
+
+static JSValueRef CString_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
+    return CYCastJSValue(context, internal->GetValue());
+} CYCatch(NULL) }
+
+static JSValueRef Functor_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

     cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
     cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));

-    return CYMakeType(context, &internal->signature_);
+    CYPool pool;
+    sig::Function type(internal->variadic_);
+    sig::Copy(pool, type.signature, internal->signature_);
+    return CYMakeType(context, type);

 } CYCatch(NULL) }
 
 static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {


@@ -1387,7 +1723,7 @@ static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef o
 
 static JSValueRef Type_getProperty_name(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
 static JSValueRef Type_getProperty_name(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));

-    return CYCastJSValue(context, internal->type_->name);
+    return CYCastJSValue(context, internal->type_->GetName());

 } CYCatch(NULL) }
 
 static JSValueRef Type_getProperty_size(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSValueRef Type_getProperty_size(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {


@@ -1405,10 +1741,10 @@ static JSValueRef Type_callAsFunction_toString(JSContextRef context, JSObjectRef
 static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
     CYLocalPool pool;
 static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
     CYLocalPool pool;

-    std::ostringstream out;
+    std::stringbuf out;

     CYOptions options;
     CYOutput output(out, options);
     CYOptions options;
     CYOutput output(out, options);

-    (new(pool) CYEncodedType(Decode(pool, internal->type_)))->Output(output, CYNoFlags);
+    (new(pool) CYTypeExpression(CYDecodeType(pool, internal->type_)))->Output(output, CYNoFlags);

     return CYCastJSValue(context, CYJSString(out.str().c_str()));
 } CYCatch(NULL) }
 
     return CYCastJSValue(context, CYJSString(out.str().c_str()));
 } CYCatch(NULL) }
 


@@ -1416,15 +1752,48 @@ static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef o
     return Type_callAsFunction_toString(context, object, _this, count, arguments, exception);
 }
 
     return Type_callAsFunction_toString(context, object, _this, count, arguments, exception);
 }
 

-static JSStaticFunction Pointer_staticFunctions[4] = {
+static JSStaticFunction All_staticFunctions[2] = {
+    {"cy$complete", &All_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, 0}
+};
+
+static JSStaticFunction CArray_staticFunctions[4] = {
+    {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"toPointer", &CArray_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, 0}
+};
+
+static JSStaticValue CArray_staticValues[2] = {
+    {"$cyt", &CArray_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, NULL, 0}
+};
+
+static JSStaticFunction CString_staticFunctions[6] = {
+    {"toCYON", &CString_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"toPointer", &CString_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"toString", &CString_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"valueOf", &CString_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, 0}
+};
+
+static JSStaticValue CString_staticValues[3] = {
+    {"length", &CString_getProperty_length, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"$cyt", &CString_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, NULL, 0}
+};
+
+static JSStaticFunction Pointer_staticFunctions[5] = {

     {"toCYON", &Pointer_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Pointer_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

+    {"toPointer", &Pointer_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
 static JSStaticValue Pointer_staticValues[2] = {
     {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
 static JSStaticValue Pointer_staticValues[2] = {

-    {"type", &Pointer_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"$cyt", &Pointer_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {NULL, NULL, NULL, 0}
 };
 
     {NULL, NULL, NULL, 0}
 };
 


@@ -1433,7 +1802,13 @@ static JSStaticFunction Struct_staticFunctions[2] = {
     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

-static JSStaticFunction Functor_staticFunctions[4] = {
+static JSStaticValue Struct_staticValues[2] = {
+    {"$cyt", &Struct_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, NULL, 0}
+};
+
+static JSStaticFunction Functor_staticFunctions[5] = {
+    {"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},


@@ -1445,7 +1820,7 @@ namespace cy {
 }
 
 static JSStaticValue Functor_staticValues[2] = {
 }
 
 static JSStaticValue Functor_staticValues[2] = {

-    {"type", &Functor_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"$cyt", &Functor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {NULL, NULL, NULL, 0}
 };
 
     {NULL, NULL, NULL, 0}
 };
 


@@ -1460,40 +1835,26 @@ static JSStaticValue Type_staticValues[4] = {
     {NULL, NULL, NULL, 0}
 };
 
     {NULL, NULL, NULL, 0}
 };
 

-static JSStaticFunction Type_staticFunctions[14] = {
+static JSStaticFunction Type_staticFunctions[10] = {

     {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    {"long", &Type_callAsFunction_long, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    {"short", &Type_callAsFunction_short, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {"signed", &Type_callAsFunction_signed, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {"withName", &Type_callAsFunction_withName, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Type_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toString", &Type_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"withName", &Type_callAsFunction_withName, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Type_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toString", &Type_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    {"unsigned", &Type_callAsFunction_unsigned, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

-static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
-
-void CYSetArgs(int argc, const char *argv[]) {
+_visible void CYSetArgs(int argc, const char *argv[]) {

     JSContextRef context(CYGetJSContext());
     JSValueRef args[argc];
     for (int i(0); i != argc; ++i)
         args[i] = CYCastJSValue(context, argv[i]);
 
     JSContextRef context(CYGetJSContext());
     JSValueRef args[argc];
     for (int i(0); i != argc; ++i)
         args[i] = CYCastJSValue(context, argv[i]);
 

-    JSObjectRef array;
-    if (JSObjectMakeArray$ != NULL)
-        array = _jsccall(*JSObjectMakeArray$, context, argc, args);
-    else {
-        JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
-        JSValueRef value(CYCallAsFunction(context, Array, NULL, argc, args));
-        array = CYCastJSObject(context, value);
-    }
-
+    JSObjectRef array(CYObjectMakeArray(context, argc, args));

     JSObjectRef System(CYGetCachedObject(context, CYJSString("System")));
     CYSetProperty(context, System, CYJSString("args"), array);
 }
     JSObjectRef System(CYGetCachedObject(context, CYJSString("System")));
     CYSetProperty(context, System, CYJSString("args"), array);
 }


@@ -1502,58 +1863,69 @@ JSObjectRef CYGetGlobalObject(JSContextRef context) {
     return JSContextGetGlobalObject(context);
 }
 
     return JSContextGetGlobalObject(context);
 }
 

+// XXX: this is neither exceptin safe nor even terribly sane

 class ExecutionHandle {
   private:
     JSContextRef context_;
 class ExecutionHandle {
   private:
     JSContextRef context_;

-    void *handle_;
+    std::vector<void *> handles_;

 
   public:
     ExecutionHandle(JSContextRef context) :
         context_(context)
     {
 
   public:
     ExecutionHandle(JSContextRef context) :
         context_(context)
     {

-        if (hooks_ != NULL && hooks_->ExecuteStart != NULL)
-            handle_ = (*hooks_->ExecuteStart)(context_);
-        else
-            handle_ = NULL;
+        handles_.resize(GetHooks().size());
+        for (size_t i(0); i != GetHooks().size(); ++i) {
+            CYHook *hook(GetHooks()[i]);
+            if (hook->ExecuteStart != NULL)
+                handles_[i] = (*hook->ExecuteStart)(context_);
+            else
+                handles_[i] = NULL;
+        }

     }
 
     ~ExecutionHandle() {
     }
 
     ~ExecutionHandle() {

-        if (hooks_ != NULL && hooks_->ExecuteEnd != NULL)
-            (*hooks_->ExecuteEnd)(context_, handle_);
+        for (size_t i(GetHooks().size()); i != 0; --i) {
+            CYHook *hook(GetHooks()[i-1]);
+            if (hook->ExecuteEnd != NULL)
+                (*hook->ExecuteEnd)(context_, handles_[i-1]);
+        }

     }
 };
 
     }
 };
 

-const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) {
-    JSValueRef exception(NULL);
+static volatile bool cancel_;

 
 

+static bool CYShouldTerminate(JSContextRef context, void *arg) {
+    return cancel_;
+}
+
+_visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) {

     ExecutionHandle handle(context);
 
     ExecutionHandle handle(context);
 

-    JSValueRef result; try {
-        result = JSEvaluateScript(context, CYJSString(code), NULL, NULL, 0, &exception);
-    } catch (const char *error) {
-        return error;
-    }
+    cancel_ = false;
+    if (&JSContextGroupSetExecutionTimeLimit != NULL)
+        JSContextGroupSetExecutionTimeLimit(JSContextGetGroup(context), 0.5, &CYShouldTerminate, NULL);

 
 

-    if (exception != NULL) error:
-        return CYPoolCString(pool, context, CYJSString(context, exception));
+    try {
+        JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0));
+        if (JSValueIsUndefined(context, result))
+            return NULL;

 
 

-    if (JSValueIsUndefined(context, result))
-        return NULL;
+        std::set<void *> objects;
+        const char *json(_jsccall(CYPoolCCYON, pool, context, result, objects));
+        CYSetProperty(context, CYGetGlobalObject(context), Result_, result);

 
 

-    const char *json; try {
-        json = CYPoolCCYON(pool, context, result, &exception);
-    } catch (const char *error) {
-        return error;
+        return json;
+    } catch (const CYException &error) {
+        return pool.strcat("throw ", error.PoolCString(pool), NULL);

     }
     }

+}

 
 

-    if (exception != NULL)
-        goto error;
-
-    CYSetProperty(context, CYGetGlobalObject(context), Result_, result);
-
-    return json;
+_visible void CYCancel() {
+    cancel_ = true;

 }
 
 }
 

+static const char *CYPoolLibraryPath(CYPool &pool);
+

 static bool initialized_ = false;
 
 void CYInitializeDynamic() {
 static bool initialized_ = false;
 
 void CYInitializeDynamic() {


@@ -1561,6 +1933,10 @@ void CYInitializeDynamic() {
         initialized_ = true;
     else return;
 
         initialized_ = true;
     else return;
 

+    CYPool pool;
+    const char *db(pool.strcat(CYPoolLibraryPath(pool), "/libcycript.db", NULL));
+    _sqlcall(sqlite3_open_v2(db, &database_, SQLITE_OPEN_READONLY, NULL));
+

     JSObjectMakeArray$ = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));
     JSSynchronousGarbageCollectForDebugging$ = reinterpret_cast<void (*)(JSContextRef)>(dlsym(RTLD_DEFAULT, "JSSynchronousGarbageCollectForDebugging"));
 
     JSObjectMakeArray$ = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));
     JSSynchronousGarbageCollectForDebugging$ = reinterpret_cast<void (*)(JSContextRef)>(dlsym(RTLD_DEFAULT, "JSSynchronousGarbageCollectForDebugging"));
 


@@ -1568,6 +1944,7 @@ void CYInitializeDynamic() {
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "All";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "All";

+    definition.staticFunctions = All_staticFunctions;

     definition.hasProperty = &All_hasProperty;
     definition.getProperty = &All_getProperty;
     definition.getPropertyNames = &All_getPropertyNames;
     definition.hasProperty = &All_hasProperty;
     definition.getProperty = &All_getProperty;
     definition.getPropertyNames = &All_getPropertyNames;


@@ -1578,6 +1955,24 @@ void CYInitializeDynamic() {
     definition.finalize = &CYFinalize;
     Context_ = JSClassCreate(&definition);
 
     definition.finalize = &CYFinalize;
     Context_ = JSClassCreate(&definition);
 

+    definition = kJSClassDefinitionEmpty;
+    definition.className = "CArray";
+    definition.staticFunctions = CArray_staticFunctions;
+    definition.staticValues = CArray_staticValues;
+    definition.getProperty = &CArray_getProperty;
+    definition.setProperty = &CArray_setProperty;
+    definition.finalize = &CYFinalize;
+    CArray::Class_ = JSClassCreate(&definition);
+
+    definition = kJSClassDefinitionEmpty;
+    definition.className = "CString";
+    definition.staticFunctions = CString_staticFunctions;
+    definition.staticValues = CString_staticValues;
+    definition.getProperty = &CString_getProperty;
+    definition.setProperty = &CString_setProperty;
+    definition.finalize = &CYFinalize;
+    CString::Class_ = JSClassCreate(&definition);
+

     definition = kJSClassDefinitionEmpty;
     definition.className = "Functor";
     definition.staticFunctions = cy::Functor::StaticFunctions;
     definition = kJSClassDefinitionEmpty;
     definition.className = "Functor";
     definition.staticFunctions = cy::Functor::StaticFunctions;


@@ -1590,19 +1985,21 @@ void CYInitializeDynamic() {
     definition.className = "Pointer";
     definition.staticFunctions = Pointer_staticFunctions;
     definition.staticValues = Pointer_staticValues;
     definition.className = "Pointer";
     definition.staticFunctions = Pointer_staticFunctions;
     definition.staticValues = Pointer_staticValues;

+    definition.callAsFunction = &Pointer_callAsFunction;

     definition.getProperty = &Pointer_getProperty;
     definition.setProperty = &Pointer_setProperty;
     definition.finalize = &CYFinalize;
     definition.getProperty = &Pointer_getProperty;
     definition.setProperty = &Pointer_setProperty;
     definition.finalize = &CYFinalize;

-    Pointer_ = JSClassCreate(&definition);
+    Pointer::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Struct";
     definition.staticFunctions = Struct_staticFunctions;
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Struct";
     definition.staticFunctions = Struct_staticFunctions;

+    definition.staticValues = Struct_staticValues;

     definition.getProperty = &Struct_getProperty;
     definition.setProperty = &Struct_setProperty;
     definition.getPropertyNames = &Struct_getPropertyNames;
     definition.finalize = &CYFinalize;
     definition.getProperty = &Struct_getProperty;
     definition.setProperty = &Struct_setProperty;
     definition.getPropertyNames = &Struct_getPropertyNames;
     definition.finalize = &CYFinalize;

-    Struct_ = JSClassCreate(&definition);
+    Struct_privateData::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Type";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Type";


@@ -1621,6 +2018,7 @@ void CYInitializeDynamic() {
     Array_s = JSStringCreateWithUTF8CString("Array");
     cy_s = JSStringCreateWithUTF8CString("$cy");
     cyi_s = JSStringCreateWithUTF8CString("$cyi");
     Array_s = JSStringCreateWithUTF8CString("Array");
     cy_s = JSStringCreateWithUTF8CString("$cy");
     cyi_s = JSStringCreateWithUTF8CString("$cyi");

+    cyt_s = JSStringCreateWithUTF8CString("$cyt");

     length_s = JSStringCreateWithUTF8CString("length");
     message_s = JSStringCreateWithUTF8CString("message");
     name_s = JSStringCreateWithUTF8CString("name");
     length_s = JSStringCreateWithUTF8CString("length");
     message_s = JSStringCreateWithUTF8CString("message");
     name_s = JSStringCreateWithUTF8CString("name");


@@ -1632,11 +2030,13 @@ void CYInitializeDynamic() {
     toJSON_s = JSStringCreateWithUTF8CString("toJSON");
     toPointer_s = JSStringCreateWithUTF8CString("toPointer");
     toString_s = JSStringCreateWithUTF8CString("toString");
     toJSON_s = JSStringCreateWithUTF8CString("toJSON");
     toPointer_s = JSStringCreateWithUTF8CString("toPointer");
     toString_s = JSStringCreateWithUTF8CString("toString");

+    weak_s = JSStringCreateWithUTF8CString("weak");

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

-    if (hooks_ != NULL && hooks_->Initialize != NULL)
-        (*hooks_->Initialize)();
+    for (CYHook *hook : GetHooks())
+        if (hook->Initialize != NULL)
+            (*hook->Initialize)();

 }
 
 void CYThrow(JSContextRef context, JSValueRef value) {
 }
 
 void CYThrow(JSContextRef context, JSValueRef value) {


@@ -1645,23 +2045,24 @@ void CYThrow(JSContextRef context, JSValueRef value) {
 }
 
 const char *CYJSError::PoolCString(CYPool &pool) const {
 }
 
 const char *CYJSError::PoolCString(CYPool &pool) const {

+    std::set<void *> objects;

     // XXX: this used to be CYPoolCString
     // XXX: this used to be CYPoolCString

-    return CYPoolCCYON(pool, context_, value_);
+    return CYPoolCCYON(pool, context_, value_, objects);

 }
 
 }
 

-JSValueRef CYJSError::CastJSValue(JSContextRef context) const {
-    // XXX: what if the context is different?
+JSValueRef CYJSError::CastJSValue(JSContextRef context, const char *name) const {
+    // XXX: what if the context is different? or the name? I dunno. ("epic" :/)

     return value_;
 }
 
     return value_;
 }
 

-JSValueRef CYCastJSError(JSContextRef context, const char *message) {
-    JSObjectRef Error(CYGetCachedObject(context, CYJSString("Error")));
+JSValueRef CYCastJSError(JSContextRef context, const char *name, const char *message) {
+    JSObjectRef Error(CYGetCachedObject(context, CYJSString(name)));

     JSValueRef arguments[1] = {CYCastJSValue(context, message)};
     return _jsccall(JSObjectCallAsConstructor, context, Error, 1, arguments);
 }
 
     JSValueRef arguments[1] = {CYCastJSValue(context, message)};
     return _jsccall(JSObjectCallAsConstructor, context, Error, 1, arguments);
 }
 

-JSValueRef CYPoolError::CastJSValue(JSContextRef context) const {
-    return CYCastJSError(context, message_);
+JSValueRef CYPoolError::CastJSValue(JSContextRef context, const char *name) const {
+    return CYCastJSError(context, name, message_);

 }
 
 CYJSError::CYJSError(JSContextRef context, const char *format, ...) {
 }
 
 CYJSError::CYJSError(JSContextRef context, const char *format, ...) {


@@ -1675,77 +2076,100 @@ CYJSError::CYJSError(JSContextRef context, const char *format, ...) {
     const char *message(pool.vsprintf(64, format, args));
     va_end(args);
 
     const char *message(pool.vsprintf(64, format, args));
     va_end(args);
 

-    value_ = CYCastJSError(context, message);
+    value_ = CYCastJSError(context, "Error", message);

 }
 
 JSGlobalContextRef CYGetJSContext(JSContextRef context) {
     return reinterpret_cast<Context *>(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_;
 }
 
 }
 
 JSGlobalContextRef CYGetJSContext(JSContextRef context) {
     return reinterpret_cast<Context *>(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_;
 }
 

-extern "C" bool CydgetMemoryParse(const uint16_t **data, size_t *size);
-
-void *CYMapFile(const char *path, size_t *psize) {
-    int fd;
-    _syscall(fd = open(path, O_RDONLY));
-
-    struct stat stat;
-    _syscall(fstat(fd, &stat));
-    size_t size(stat.st_size);
+static const char *CYPoolLibraryPath(CYPool &pool) {
+    Dl_info addr;
+    _assert(dladdr(reinterpret_cast<void *>(&CYPoolLibraryPath), &addr) != 0);
+    char *lib(pool.strdup(addr.dli_fname));

 
 

-    *psize = size;
+    char *slash(strrchr(lib, '/'));
+    _assert(slash != NULL);
+    *slash = '\0';

 
 

-    void *base;
-    _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0));
+    slash = strrchr(lib, '/');
+    if (slash != NULL && strcmp(slash, "/.libs") == 0)
+        *slash = '\0';

 
 

-    _syscall(close(fd));
-    return base;
+    return lib;

 }
 
 }
 

-static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+static JSValueRef require_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

     _assert(count == 1);
     CYPool pool;
 
     _assert(count == 1);
     CYPool pool;
 

-    Dl_info addr;
-    _assert(dladdr(reinterpret_cast<void *>(&require), &addr) != 0);
-    char *lib(pool.strdup(addr.dli_fname));
+    const char *name(CYPoolCString(pool, context, arguments[0]));
+    if (strchr(name, '/') == NULL && (
+#ifdef __APPLE__
+        dlopen(pool.strcat("/System/Library/Frameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
+        dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
+#endif
+    false))
+        return CYJSUndefined(context);

 
 

-    char *slash(strrchr(lib, '/'));
-    _assert(slash != NULL);
-    *slash = '\0';
+    JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve"))));
+    CYJSString path(context, CYCallAsFunction(context, resolve, NULL, 1, arguments));

 
     CYJSString property("exports");
 
     CYJSString property("exports");

-    JSObjectRef module;

 
 

-    const char *path(pool.strcat(lib, "/cycript0.9/", CYPoolCString(pool, context, arguments[0]), ".cy", NULL));
-    CYJSString key(path);

     JSObjectRef modules(CYGetCachedObject(context, CYJSString("modules")));
     JSObjectRef modules(CYGetCachedObject(context, CYJSString("modules")));

-    JSValueRef cache(CYGetProperty(context, modules, key));
-
-    if (!JSValueIsUndefined(context, cache))
-        module = CYCastJSObject(context, cache);
-    else {
-        CYUTF8String code;
-        code.data = reinterpret_cast<char *>(CYMapFile(path, &code.size));
+    JSValueRef cache(CYGetProperty(context, modules, path));

 
 

-        module = JSObjectMake(context, NULL, NULL);
-        CYSetProperty(context, modules, key, module);
-
-        JSObjectRef exports(JSObjectMake(context, NULL, NULL));
-        CYSetProperty(context, module, property, exports);
+    JSValueRef result;
+    if (!JSValueIsUndefined(context, cache)) {
+        JSObjectRef module(CYCastJSObject(context, cache));
+        result = CYGetProperty(context, module, property);
+    } else {
+        CYUTF8String code(CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path)));
+        _assert(code.data != NULL);
+
+        size_t length(strlen(name));
+        if (length >= 5 && strcmp(name + length - 5, ".json") == 0) {
+            JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON")));
+            JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse"))));
+            JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) };
+            result = CYCallAsFunction(context, parse, JSON, 1, arguments);
+        } else {
+            JSObjectRef module(JSObjectMake(context, NULL, NULL));
+            CYSetProperty(context, modules, path, module);
+
+            JSObjectRef exports(JSObjectMake(context, NULL, NULL));
+            CYSetProperty(context, module, property, exports);
+
+            std::stringstream wrap;
+            wrap << "(function (exports, require, module, __filename) { " << code << "\n});";
+            code = CYPoolCode(pool, *wrap.rdbuf());
+
+            JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0));
+            JSObjectRef function(CYCastJSObject(context, value));
+
+            JSValueRef arguments[4] = { exports, object, module, CYCastJSValue(context, path) };
+            CYCallAsFunction(context, function, NULL, 4, arguments);
+            result = CYGetProperty(context, module, property);
+        }
+    }

 
 

-        std::stringstream wrap;
-        wrap << "(function (exports, require, module) { " << code << "\n});";
-        code = CYPoolCode(pool, wrap);
+    return result;
+} CYCatch(NULL) }

 
 

-        JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0));
-        JSObjectRef function(CYCastJSObject(context, value));
+static bool CYRunScript(JSGlobalContextRef context, const char *path) {
+    CYPool pool;
+    CYUTF8String code(CYPoolFileUTF8String(pool, pool.strcat(CYPoolLibraryPath(pool), path, NULL)));
+    if (code.data == NULL)
+        return false;

 
 

-        JSValueRef arguments[3] = { exports, JSObjectMakeFunctionWithCallback(context, CYJSString("require"), &require), module };
-        CYCallAsFunction(context, function, NULL, 3, arguments);
-    }
+    code = CYPoolCode(pool, code);
+    _jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0);
+    return true;
+}

 
 

-    return CYGetProperty(context, module, property);
-} CYCatch(NULL) }
+extern "C" void CYDestroyWeak(JSWeakObjectMapRef weak, void *data) {
+}

 
 extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYInitializeDynamic();
 
 extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYInitializeDynamic();


@@ -1777,6 +2201,9 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     JSObjectRef Function_prototype(CYCastJSObject(context, CYGetProperty(context, Function, prototype_s)));
     CYSetProperty(context, cy, CYJSString("Function_prototype"), Function_prototype);
 
     JSObjectRef Function_prototype(CYCastJSObject(context, CYGetProperty(context, Function, prototype_s)));
     CYSetProperty(context, cy, CYJSString("Function_prototype"), Function_prototype);
 

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

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


@@ -1794,6 +2221,9 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
 
     JSObjectRef String_prototype(CYCastJSObject(context, CYGetProperty(context, String, prototype_s)));
     CYSetProperty(context, cy, CYJSString("String_prototype"), String_prototype);
 
     JSObjectRef String_prototype(CYCastJSObject(context, CYGetProperty(context, String, prototype_s)));
     CYSetProperty(context, cy, CYJSString("String_prototype"), String_prototype);

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

 /* }}} */
 
     CYSetProperty(context, Array_prototype, toCYON_s, &Array_callAsFunction_toCYON, kJSPropertyAttributeDontEnum);
 /* }}} */
 
     CYSetProperty(context, Array_prototype, toCYON_s, &Array_callAsFunction_toCYON, kJSPropertyAttributeDontEnum);


@@ -1801,13 +2231,22 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
 
     JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, global, CYJSString("Cycript"), cycript);
 
     JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, global, CYJSString("Cycript"), cycript);

+    CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction);

     CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
 
     CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
 

+    JSObjectRef CArray(JSObjectMakeConstructor(context, CArray::Class_, &CArray_new));
+    CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CArray, prototype_s)), Array_prototype);
+    CYSetProperty(context, cycript, CYJSString("CArray"), CArray);
+
+    JSObjectRef CString(JSObjectMakeConstructor(context, CString::Class_, &CString_new));
+    CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype);
+    CYSetProperty(context, cycript, CYJSString("CString"), CString);
+

     JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
     JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));

-    JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);
+    CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);

     CYSetProperty(context, cycript, CYJSString("Functor"), Functor);
 
     CYSetProperty(context, cycript, CYJSString("Functor"), Functor);
 

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

     CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));
 
     JSObjectRef modules(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));
 
     JSObjectRef modules(JSObjectMake(context, NULL, NULL));


@@ -1816,6 +2255,10 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     JSObjectRef all(JSObjectMake(context, All_, NULL));
     CYSetProperty(context, cycript, CYJSString("all"), all);
 
     JSObjectRef all(JSObjectMake(context, All_, NULL));
     CYSetProperty(context, cycript, CYJSString("all"), all);
 

+    JSObjectRef cache(JSObjectMake(context, NULL, NULL));
+    CYSetProperty(context, cy, CYJSString("cache"), cache);
+    CYSetPrototype(context, cache, all);
+

     JSObjectRef alls(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL));
     CYSetProperty(context, cycript, CYJSString("alls"), alls);
 
     JSObjectRef alls(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL));
     CYSetProperty(context, cycript, CYJSString("alls"), alls);
 


@@ -1831,33 +2274,65 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
             next = JSObjectGetPrototype(context, curr);
         }
 
             next = JSObjectGetPrototype(context, curr);
         }
 

-        JSObjectSetPrototype(context, last, all);
+        CYSetPrototype(context, last, cache);

     }
 
     }
 

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

     JSObjectRef System(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, cy, CYJSString("System"), System);
 
     JSObjectRef System(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, cy, CYJSString("System"), System);
 

-    CYSetProperty(context, all, CYJSString("require"), &require, kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum);

 
     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));

-    //CYSetProperty(context, System, CYJSString("global"), global);

     CYSetProperty(context, System, CYJSString("print"), &System_print);
 
     CYSetProperty(context, System, CYJSString("print"), &System_print);
 

-    if (CYBridgeEntry *entry = CYBridgeHash("1dlerror", 8))
-        entry->cache_ = new cy::Functor(entry->value_, reinterpret_cast<void (*)()>(&dlerror));
+    CYSetProperty(context, global, CYJSString("global"), global);
+
+#ifdef __APPLE__
+    if (&JSWeakObjectMapCreate != NULL) {
+        JSWeakObjectMapRef weak(JSWeakObjectMapCreate(context, NULL, &CYDestroyWeak));
+        CYSetProperty(context, cy, weak_s, CYCastJSValue(context, reinterpret_cast<uintptr_t>(weak)));
+    }
+#endif
+
+    CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String()), kJSPropertyAttributeDontEnum);
+
+    CYSetProperty(context, cache, CYJSString("dlerror"), CYMakeFunctor(context, "dlerror", "*"), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("RTLD_DEFAULT"), CYCastJSValue(context, reinterpret_cast<intptr_t>(RTLD_DEFAULT)), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("dlsym"), CYMakeFunctor(context, "dlsym", "^v^v*"), kJSPropertyAttributeDontEnum);
+
+    CYSetProperty(context, cache, CYJSString("NULL"), CYJSNull(context), kJSPropertyAttributeDontEnum);
+
+    CYSetProperty(context, cache, CYJSString("bool"), CYMakeType(context, sig::Primitive<bool>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("char"), CYMakeType(context, sig::Primitive<char>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("schar"), CYMakeType(context, sig::Primitive<signed char>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("uchar"), CYMakeType(context, sig::Primitive<unsigned char>()), kJSPropertyAttributeDontEnum);

 
 

-    if (hooks_ != NULL && hooks_->SetupContext != NULL)
-        (*hooks_->SetupContext)(context);
+    CYSetProperty(context, cache, CYJSString("short"), CYMakeType(context, sig::Primitive<short>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("int"), CYMakeType(context, sig::Primitive<int>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("long"), CYMakeType(context, sig::Primitive<long>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("longlong"), CYMakeType(context, sig::Primitive<long long>()), kJSPropertyAttributeDontEnum);
+
+    CYSetProperty(context, cache, CYJSString("ushort"), CYMakeType(context, sig::Primitive<unsigned short>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("uint"), CYMakeType(context, sig::Primitive<unsigned int>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("ulong"), CYMakeType(context, sig::Primitive<unsigned long>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("ulonglong"), CYMakeType(context, sig::Primitive<unsigned long long>()), kJSPropertyAttributeDontEnum);
+
+    CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive<float>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive<double>()), kJSPropertyAttributeDontEnum);
+
+    for (CYHook *hook : GetHooks())
+        if (hook->SetupContext != NULL)
+            (*hook->SetupContext)(context);

 
     CYArrayPush(context, alls, cycript);
 
     CYArrayPush(context, alls, cycript);

+
+    CYRunScript(context, "/libcycript.cy");

 }
 
 static JSGlobalContextRef context_;
 
 }
 
 static JSGlobalContextRef context_;
 

-JSGlobalContextRef CYGetJSContext() {
+_visible JSGlobalContextRef CYGetJSContext() {

     CYInitializeDynamic();
 
     if (context_ == NULL) {
     CYInitializeDynamic();
 
     if (context_ == NULL) {


@@ -1868,7 +2343,7 @@ JSGlobalContextRef CYGetJSContext() {
     return context_;
 }
 
     return context_;
 }
 

-void CYDestroyContext() {
+_visible void CYDestroyContext() {

     if (context_ == NULL)
         return;
     JSGlobalContextRelease(context_);
     if (context_ == NULL)
         return;
     JSGlobalContextRelease(context_);