Allow a * on a CString to get the first character.

[cycript.git] / Execute.cpp

diff --git a/Execute.cpp b/Execute.cpp
index a17cd553ce9ca292b9b26605a29042512f912ff2..78aaf1bace741dd49ff61a5504e5a8a2618be46d 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

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


@@ -41,6 +41,7 @@
 #include "sig/parse.hpp"
 #include "sig/ffi_type.hpp"
 
 #include "sig/parse.hpp"
 #include "sig/ffi_type.hpp"
 

+#include "Bridge.hpp"

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


@@ -94,7 +95,12 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J
     CYSetProperty(context, object, name, JSObjectMakeFunctionWithCallback(context, name, callback), attributes);
 }
 
     CYSetProperty(context, object, name, JSObjectMakeFunctionWithCallback(context, name, callback), attributes);
 }
 

+JSObjectRef CYGetPrototype(JSContextRef context, JSObjectRef object) {
+    return CYCastJSObject(context, JSObjectGetPrototype(context, object));
+}
+

 void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef value) {
 void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef value) {

+    _assert(!JSValueIsUndefined(context, value));

     JSObjectSetPrototype(context, object, value);
     _assert(CYIsStrictEqual(context, JSObjectGetPrototype(context, object), value));
 }
     JSObjectSetPrototype(context, object, value);
     _assert(CYIsStrictEqual(context, JSObjectGetPrototype(context, object), value));
 }


@@ -120,6 +126,10 @@ JSStringRef CYCopyJSString(CYUTF8String value) {
     }
 }
 
     }
 }
 

+JSStringRef CYCopyJSString(const std::string &value) {
+    return CYCopyJSString(CYUTF8String(value.c_str(), value.size()));
+}
+

 JSStringRef CYCopyJSString(CYUTF16String value) {
     return JSStringCreateWithCharacters(value.data, value.size);
 }
 JSStringRef CYCopyJSString(CYUTF16String value) {
     return JSStringCreateWithCharacters(value.data, value.size);
 }


@@ -130,10 +140,22 @@ JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
     return _jsccall(JSValueToStringCopy, context, value);
 }
 
     return _jsccall(JSValueToStringCopy, context, value);
 }
 

-static CYUTF16String CYCastUTF16String(JSStringRef value) {
+CYUTF16String CYCastUTF16String(JSStringRef value) {

     return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value));
 }
 
     return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value));
 }
 

+const char *CYPoolCString(CYPool &pool, CYUTF8String utf8) {
+    return pool.strndup(utf8.data, utf8.size);
+}
+
+CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF8String utf8) {
+    return {pool.strndup(utf8.data, utf8.size), utf8.size};
+}
+
+_visible CYUTF8String CYPoolUTF8String(CYPool &pool, const std::string &value) {
+    return {pool.strndup(value.data(), value.size()), value.size()};
+}
+

 CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value) {
     return CYPoolUTF8String(pool, CYCastUTF16String(value));
 }
 CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value) {
     return CYPoolUTF8String(pool, CYCastUTF16String(value));
 }


@@ -156,7 +178,7 @@ size_t CYGetIndex(CYPool &pool, JSContextRef context, JSStringRef value) {
 
 static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
 
 
 static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
 

-static JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) {
+JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) {

     if (JSObjectMakeArray$ != NULL)
         return _jsccall(*JSObjectMakeArray$, context, length, values);
     else {
     if (JSObjectMakeArray$ != NULL)
         return _jsccall(*JSObjectMakeArray$, context, length, values);
     else {


@@ -167,17 +189,14 @@ static JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const
 }
 
 static JSClassRef All_;
 }
 
 static JSClassRef All_;

-static JSClassRef Context_;
-static JSClassRef CArray_;
-static JSClassRef CString_;

 JSClassRef Functor_;
 static JSClassRef Global_;
 JSClassRef Functor_;
 static JSClassRef Global_;

-static JSClassRef Pointer_;
-static JSClassRef Struct_;

 
 JSStringRef Array_s;
 
 JSStringRef Array_s;

+JSStringRef constructor_s;

 JSStringRef cy_s;
 JSStringRef cyi_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;


@@ -207,10 +226,8 @@ sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate) {
     return aggregate;
 }
 
     return aggregate;
 }
 

-JSClassRef Type_privateData::Class_;
-

 struct Context :
 struct Context :

-    CYData
+    CYPrivate<Context>

 {
     JSGlobalContextRef context_;
 
 {
     JSGlobalContextRef context_;
 


@@ -221,91 +238,82 @@ struct Context :
 };
 
 struct CArray :
 };
 
 struct CArray :

-    CYOwned
+    CYValue<CArray, void *>

 {
 {

+    CYProtect owner_;

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

-    CArray(void *value, JSContextRef context, JSObjectRef owner, size_t length, const sig::Type &type, ffi_type *ffi) :
-        CYOwned(value, context, owner),
+    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)
     {
         type_(new(*pool_) Type_privateData(type, ffi)),
         length_(length)
     {

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

     }
 };
 
 struct CString :
     }
 };
 
 struct CString :

-    CYOwned
+    CYValue<CString, char *>

 {
 {

+    CYProtect owner_;
+

     CString(char *value, JSContextRef context, JSObjectRef owner) :
     CString(char *value, JSContextRef context, JSObjectRef owner) :

-        CYOwned(value, context, owner)
+        CYValue(value),
+        owner_(context, owner)

     {
     {

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

     }
 };
 
 struct Pointer :
     }
 };
 
 struct Pointer :

-    CYOwned
+    CYValue<Pointer, void *>

 {
 {

+    CYProtect owner_;

     Type_privateData *type_;
 
     Type_privateData *type_;
 

-    Pointer(void *value, JSContextRef context, JSObjectRef owner, const sig::Type &type) :
-        CYOwned(value, context, owner),
+    Pointer(void *value, const sig::Type &type, JSContextRef context, JSObjectRef owner) :
+        CYValue(value),
+        owner_(context, owner),

         type_(new(*pool_) Type_privateData(type))
     {
     }
 
         type_(new(*pool_) Type_privateData(type))
     {
     }
 

-    Pointer(void *value, JSContextRef context, JSObjectRef owner, const char *encoding) :
-        CYOwned(value, context, owner),
+    Pointer(void *value, const char *encoding, JSContextRef context, JSObjectRef owner) :
+        CYValue(value),
+        owner_(context, owner),

         type_(new(*pool_) Type_privateData(encoding))
     {
     }
 };
 
 struct Struct_privateData :
         type_(new(*pool_) Type_privateData(encoding))
     {
     }
 };
 
 struct Struct_privateData :

-    CYOwned
+    CYValue<Struct_privateData, void *>

 {
 {

+    CYProtect owner_;

     Type_privateData *type_;
 
     Type_privateData *type_;
 

-    Struct_privateData(void *value, JSContextRef context, JSObjectRef owner, const sig::Type &type, ffi_type *ffi) :
-        CYOwned(value, context, owner),
+    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))
     {
         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, value_, size);
+            value_ = copy;
+        }

     }
 };
 
     }
 };
 

-JSObjectRef CYMakeCArray(JSContextRef context, void *data, size_t length, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
-    CArray *internal(new CArray(data, context, owner, length, type, ffi));
-
-    if (owner == NULL) {
-        size_t size(ffi->size * length);
-        void *copy(internal->pool_->malloc<void>(size, ffi->alignment));
-        memcpy(copy, internal->value_, size);
-        internal->value_ = copy;
-    }
-
-    return JSObjectMake(context, CArray_, internal);
-}
-
-JSObjectRef CYMakeCString(JSContextRef context, char *pointer, JSObjectRef owner) {
-    CString *internal(new CString(pointer, context, owner));
-    if (owner == NULL)
-        internal->value_ = internal->pool_->strdup(static_cast<const char *>(internal->value_));
-    return JSObjectMake(context, CString_, internal);
-}
-
-JSObjectRef CYMakeStruct(JSContextRef context, void *data, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
-    Struct_privateData *internal(new Struct_privateData(data, context, owner, type, ffi));
-
-    if (owner == NULL) {
-        size_t size(ffi->size);
-        void *copy(internal->pool_->malloc<void>(size, ffi->alignment));
-        memcpy(copy, internal->value_, size);
-        internal->value_ = copy;
-    }
-
-    return JSObjectMake(context, Struct_, internal);
-}
-

 static void *CYCastSymbol(const char *name) {
     for (CYHook *hook : GetHooks())
         if (hook->CastSymbol != NULL)
 static void *CYCastSymbol(const char *name) {
     for (CYHook *hook : GetHooks())
         if (hook->CastSymbol != NULL)


@@ -328,12 +336,19 @@ JSValueRef CYCastJSValue(JSContextRef context, double 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)
+
+#ifdef __SIZEOF_INT128__
+CYCastJSValue_(signed __int128)
+CYCastJSValue_(unsigned __int128)
+#endif

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


@@ -396,43 +411,6 @@ void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
     return CYArrayPush(context, array, 1, &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 {
     FILE *file(stdout);
 
 static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     FILE *file(stdout);
 


@@ -457,8 +435,7 @@ _visible void CYGarbageCollect(JSContextRef 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])));
 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));
+    CYUTF8String after(CYPoolCode(pool, before));

     return CYCastJSValue(context, CYJSString(after));
 } CYCatch_(NULL, "SyntaxError") }
 
     return CYCastJSValue(context, CYJSString(after));
 } CYCatch_(NULL, "SyntaxError") }
 


@@ -541,6 +518,22 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object,
 
     std::ostringstream str;
 
 
     std::ostringstream str;
 

+    JSValueRef value(CYGetProperty(context, object, constructor_s));
+    if (JSValueIsObject(context, value)) {
+        JSObjectRef constructor(CYCastJSObject(context, value));
+        JSValueRef theory(CYGetProperty(context, constructor, prototype_s));
+        JSValueRef practice(JSObjectGetPrototype(context, object));
+
+        if (CYIsStrictEqual(context, theory, practice)) {
+            JSValueRef name(CYGetProperty(context, constructor, name_s));
+            if (!JSValueIsUndefined(context, name)) {
+                auto utf8(CYPoolUTF8String(pool, context, CYJSString(context, name)));
+                if (utf8 != "Object")
+                    str << "new" << ' ' << utf8;
+            }
+        }
+    }
+

     str << '{';
 
     // XXX: this is, sadly, going to leak
     str << '{';
 
     // XXX: this is, sadly, going to leak


@@ -638,17 +631,11 @@ static JSValueRef String_callAsFunction_toCYON(JSContextRef context, JSObjectRef
 } CYCatch(NULL) }
 
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
 } CYCatch(NULL) }
 
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {

-    Pointer *internal(new Pointer(pointer, context, owner, type));
-    return JSObjectMake(context, Pointer_, internal);
+    return Pointer::Make(context, pointer, type, context, owner);

 }
 
 }
 

-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const char *encoding, JSObjectRef owner) {
-    Pointer *internal(new Pointer(pointer, context, owner, encoding));
-    return JSObjectMake(context, Pointer_, internal);
-}
-
-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) {
 }
 
 static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) {


@@ -656,12 +643,12 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const
     if (function == NULL)
         return NULL;
 
     if (function == NULL)
         return NULL;
 

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

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

-static bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index) {
+bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index) {

     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 
     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 


@@ -673,7 +660,7 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) {
             return NULL;
         case kJSTypeObject: {
             JSObjectRef object((JSObjectRef) value);
             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_;
             }


@@ -728,6 +715,11 @@ CYPoolFFI_(unsigned long int)
 CYPoolFFI_(unsigned long long int)
 CYPoolFFI_(unsigned short int)
 
 CYPoolFFI_(unsigned long long int)
 CYPoolFFI_(unsigned short int)
 

+#ifdef __SIZEOF_INT128__
+CYPoolFFI_(signed __int128)
+CYPoolFFI_(unsigned __int128)
+#endif
+

 void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
     _assert(false);
 }
 void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
     _assert(false);
 }


@@ -747,33 +739,55 @@ void Bits::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data
     _assert(false);
 }
 
     _assert(false);
 }
 

-void Pointer::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
-    *reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value);
-}
-
-void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
-    uint8_t *base(reinterpret_cast<uint8_t *>(data));
-    JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
-    for (size_t index(0); index != size; ++index) {
-        ffi_type *field(ffi->elements[index]);
-
+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;
         JSValueRef rhs;

-        if (aggregate == NULL)
+        if (object == NULL)

             rhs = value;
         else {
             rhs = value;
         else {

-            rhs = CYGetProperty(context, aggregate, index);
+            rhs = CYGetProperty(context, object, index);

             if (JSValueIsUndefined(context, rhs))
                 throw CYJSError(context, "unable to extract array value");
         }
 
             if (JSValueIsUndefined(context, rhs))
                 throw CYJSError(context, "unable to extract array value");
         }
 

-        type.PoolFFI(pool, context, field, base, rhs);
-        base += field->size;
+        type.PoolFFI(pool, context, ffi, base, rhs);
+        base += ffi->size;

     }
 }
 
     }
 }
 

+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;
+    }
+}
+
+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 Enum::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    return type.PoolFFI(pool, context, ffi, data, value);
+}
+

 void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
     _assert(!overlap);
 void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
     _assert(!overlap);

+    _assert(signature.count != _not(size_t));

 
 

+    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) {
     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) {


@@ -795,8 +809,9 @@ void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void
             }
         }
 
             }
         }
 

-        element->type->PoolFFI(pool, context, field, base, rhs);
-        base += field->size;
+        element->type->PoolFFI(pool, context, field, base + offset, rhs);
+        offset += field->size;
+        CYAlign(offset, field->alignment);

     }
 }
 
     }
 }
 


@@ -825,6 +840,11 @@ CYFromFFI_(unsigned long int)
 CYFromFFI_(unsigned long long int)
 CYFromFFI_(unsigned short int)
 
 CYFromFFI_(unsigned long long int)
 CYFromFFI_(unsigned short int)
 

+#ifdef __SIZEOF_INT128__
+CYFromFFI_(signed __int128)
+CYFromFFI_(unsigned __int128)
+#endif
+

 JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
     return CYJSUndefined(context);
 }
 JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
     return CYJSUndefined(context);
 }


@@ -835,7 +855,7 @@ JSValueRef Unknown::FromFFI(JSContextRef context, ffi_type *ffi, void *data, boo
 
 JSValueRef String::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
     if (char *value = *reinterpret_cast<char **>(data))
 
 JSValueRef String::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
     if (char *value = *reinterpret_cast<char **>(data))

-        return CYMakeCString(context, value, owner);
+        return CString::Make(context, value, context, owner);

     return CYJSNull(context);
 }
 
     return CYJSNull(context);
 }
 


@@ -850,15 +870,21 @@ JSValueRef Pointer::FromFFI(JSContextRef context, ffi_type *ffi, void *data, boo
 }
 
 JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
 }
 
 JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {

-    return CYMakeCArray(context, data, size, type, ffi->elements[0], owner);
+    return CArray::Make(context, data, size, type, ffi->elements[0], context, owner);
+}
+
+JSValueRef Enum::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return type.FromFFI(context, ffi, data, initialize, owner);

 }
 
 JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
 }
 
 JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {

-    return CYMakeStruct(context, data, *this, ffi, owner);
+    _assert(!overlap);
+    _assert(signature.count != _not(size_t));
+    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 {
 }
 
 JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {

-    return CYMakeFunctor(context, reinterpret_cast<void (*)()>(data), signature);
+    return CYMakeFunctor(context, reinterpret_cast<void (*)()>(data), variadic, signature);

 }
 
 }
 }
 
 }


@@ -866,7 +892,7 @@ JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bo
 void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) {
     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
 void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) {
     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 

-    JSContextRef context(internal->context_);
+    JSContextRef context(internal->function_);

 
     size_t count(internal->cif_.nargs);
     JSValueRef values[count];
 
     size_t count(internal->cif_.nargs);
     JSValueRef values[count];


@@ -883,9 +909,18 @@ static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRe
     return CYCallAsFunction(context, function, NULL, count, values);
 }
 
     return CYCallAsFunction(context, function, NULL, count, values);
 }
 

+#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, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) {
     // XXX: in case of exceptions this will leak
 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 point of fact, this may /need/ to leak :(

     Closure_privateData *internal(new Closure_privateData(context, function, adapter, signature));
 
 #if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
     Closure_privateData *internal(new Closure_privateData(context, function, adapter, signature));
 
 #if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))


@@ -895,7 +930,8 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
     ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, &CYExecuteClosure, internal, executable));
     _assert(status == FFI_OK);
 
     ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, &CYExecuteClosure, internal, executable));
     _assert(status == FFI_OK);
 

-    internal->value_ = executable;
+    internal->pool_->atexit(&CYFreeFunctor, writable);
+    internal->value_ = reinterpret_cast<void (*)()>(executable);

 #else
     ffi_closure *closure((ffi_closure *) _syscall(mmap(
         NULL, sizeof(ffi_closure),
 #else
     ffi_closure *closure((ffi_closure *) _syscall(mmap(
         NULL, sizeof(ffi_closure),


@@ -908,7 +944,8 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
 
     _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
 
 
     _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
 

-    internal->value_ = closure;
+    internal->pool_->atexit(&CYFreeFunctor, closure);
+    internal->value_ = reinterpret_cast<void (*)()>(closure);

 #endif
 
     return internal;
 #endif
 
     return internal;


@@ -930,7 +967,7 @@ JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) {
     return CYCastJSObject(context, CYGetCachedValue(context, 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));


@@ -939,33 +976,35 @@ 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)));
     }
 }
 
 static JSValueRef CString_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;
     CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));

-    char *string(static_cast<char *>(internal->value_));

 
     ssize_t offset;
 
     ssize_t offset;

-    if (!CYGetOffset(pool, context, property, offset))
+    if (JSStringIsEqualToUTF8CString(property, "$cyi"))
+        offset = 0;
+    else if (!CYGetOffset(pool, context, property, offset))

         return NULL;
 
         return NULL;
 

-    return CYCastJSValue(context, CYJSString(CYUTF8String(&string[offset], 1)));
+    return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->value_[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)));
 } 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)));

-    char *string(static_cast<char *>(internal->value_));

 
     ssize_t offset;
 
     ssize_t offset;

-    if (!CYGetOffset(pool, context, property, offset))
+    if (JSStringIsEqualToUTF8CString(property, "$cyi"))
+        offset = 0;
+    else if (!CYGetOffset(pool, context, property, offset))

         return false;
 
     const char *data(CYPoolCString(pool, context, value));
         return false;
 
     const char *data(CYPoolCString(pool, context, value));

-    string[offset] = *data;
+    internal->value_[offset] = *data;

     return true;
 } CYCatch(false) }
 
     return true;
 } CYCatch(false) }
 


@@ -1048,7 +1087,7 @@ static JSValueRef CArray_getProperty(JSContextRef context, JSObjectRef object, J
     if (JSStringIsEqual(property, length_s))
         return CYCastJSValue(context, internal->length_);
     Type_privateData *typical(internal->type_);
     if (JSStringIsEqual(property, length_s))
         return CYCastJSValue(context, internal->length_);
     Type_privateData *typical(internal->type_);

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

     return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
 } CYCatch(NULL) }
 
     return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
 } CYCatch(NULL) }
 


@@ -1068,10 +1107,10 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object,
     if (sig::Function *function = dynamic_cast<sig::Function *>(typical->type_)) {
         if (!JSStringIsEqualToUTF8CString(property, "$cyi"))
             return NULL;
     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->signature);
+        return CYMakeFunctor(context, reinterpret_cast<void (*)()>(internal->value_), function->variadic, function->signature);

     }
 
     }
 

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

     return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
 } CYCatch(NULL) }
 
     return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
 } CYCatch(NULL) }
 


@@ -1088,7 +1127,7 @@ static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef o
     return CYMakePointer(context, internal->value_, *typical->type_, typical->ffi_, _this);
 } CYCatch(NULL) }
 
     return CYMakePointer(context, internal->value_, *typical->type_, typical->ffi_, _this);
 } CYCatch(NULL) }
 

-static JSValueRef Struct_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+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) }
     Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
     return CYMakeType(context, *internal->type_->type_);
 } CYCatch(NULL) }


@@ -1105,7 +1144,7 @@ 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 type->signature.elements[index].type->FromFFI(context, typical->GetFFI()->elements[index], base, false, owner);
 } CYCatch(NULL) }
 
     return type->signature.elements[index].type->FromFFI(context, typical->GetFFI()->elements[index], base, false, owner);
 } CYCatch(NULL) }


@@ -1152,26 +1191,65 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS
     }
 }
 
     }
 }
 

+static sig::Void Void_;
+static sig::Pointer PointerToVoid_(Void_);
+
+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);
 }
 
 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, sig::Signature *signature, ffi_cif *cif, void (*function)()) {
-    if (setups + count != signature->count - 1)
-        throw CYJSError(context, "incorrect number of arguments to ffi function");
+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);

 
 

-    size_t size(setups + count);
-    void *values[size];
+    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);
 
     memcpy(values, setup, sizeof(void *) * setups);
 

-    for (size_t index(setups); index != size; ++index) {
-        sig::Element *element(&signature->elements[index + 1]);
+    for (size_t index(setups); index != have; ++index) {
+        sig::Element &element(elements[index + 1]);

         ffi_type *ffi(cif->arg_types[index]);
         values[index] = pool.malloc<uint8_t>(ffi->size, ffi->alignment);
         ffi_type *ffi(cif->arg_types[index]);
         values[index] = pool.malloc<uint8_t>(ffi->size, ffi->alignment);

-        element->type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
+        element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);

     }
 
     }
 

-    uint8_t value[cif->rtype->size];
+    uint8_t *value(pool.malloc<uint8_t>(std::max<size_t>(cif->rtype->size, sizeof(ffi_arg)), std::max<size_t>(cif->rtype->alignment, alignof(ffi_arg))));

 
     void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
     // XXX: this only supports one hook, but it is a bad idea anyway
 
     void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
     // XXX: this only supports one hook, but it is a bad idea anyway


@@ -1180,13 +1258,13 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi
             call = hook->CallFunction;
 
     call(pool, context, cif, function, value, values);
             call = hook->CallFunction;
 
     call(pool, context, cif, function, value, values);

-    return signature->elements[0].type->FromFFI(context, cif->rtype, value, initialize);
+    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->value_);

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


@@ -1198,15 +1276,7 @@ static JSValueRef Pointer_callAsFunction(JSContextRef context, JSObjectRef objec
 } CYCatch(NULL) }
 
 JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type) {
 } CYCatch(NULL) }
 
 JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type) {

-    Type_privateData *internal(new Type_privateData(type));
-    return JSObjectMake(context, Type_privateData::Class_, internal);
-}
-
-JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature) {
-    CYPool pool;
-    sig::Function type;
-    sig::Copy(pool, type.signature, *signature);
-    return CYMakeType(context, type);
+    return Type_privateData::Make(context, type);

 }
 
 extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) {
 }
 
 extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) {


@@ -1286,14 +1356,37 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt
             CYThrow("%s", pool.strcat("error caching ", CYPoolCString(pool, context, property), ": ", error.PoolCString(pool), NULL));
         }
 
             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);
+        JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache")));
+
+        JSObjectRef stub;
+        if (flags == CYBridgeType) {
+            stub = CYMakeType(context, sig::Void());
+            CYSetProperty(context, cache, property, stub);
+        } else
+            stub = NULL;
+
+        JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(parsed), NULL, NULL, 0));
+
+        switch (flags) {
+            case CYBridgeVoid: {
+            } break;
+
+            case CYBridgeHold: {
+                CYSetProperty(context, cache, property, value);
+            } break;
+
+            case CYBridgeType: {
+                JSObjectRef swap(CYCastJSObject(context, value));
+                void *source(JSObjectGetPrivate(swap));
+                _assert(source != NULL);
+                void *target(JSObjectGetPrivate(stub));
+                _assert(JSObjectSetPrivate(swap, target));
+                _assert(JSObjectSetPrivate(stub, source));
+                value = stub;
+            } break;

         }
 
         }
 

-        return result;
+        return value;

     }
 
     return NULL;
     }
 
     return NULL;


@@ -1376,10 +1469,22 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou
 
     if (false) {
     } else if (count == 1) {
 
     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);
+        switch (JSValueGetType(context, arguments[0])) {
+            case kJSTypeString: {
+                const char *encoding(CYPoolCString(pool, context, arguments[0]));
+                sig::Signature signature;
+                sig::Parse(pool, &signature, encoding, &Structor_);
+                return CYMakeType(context, *signature.elements[0].type);
+            } break;
+
+            case kJSTypeObject: {
+                // XXX: accept a set of enum constants and /guess/ at their size
+                _assert(false);
+            } break;
+
+            default:
+                throw CYJSError(context, "incorrect kind of argument to new Type");
+        }

     } else if (count == 2) {
         JSObjectRef types(CYCastJSObject(context, arguments[0]));
         size_t count(CYArrayLength(context, types));
     } else if (count == 2) {
         JSObjectRef types(CYCastJSObject(context, arguments[0]));
         size_t count(CYArrayLength(context, types));


@@ -1404,6 +1509,7 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou
             _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_));
             Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
             element.type = internal->type_;
             _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_));
             Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
             element.type = internal->type_;

+            _assert(element.type != NULL);

         }
 
         return CYMakeType(context, type);
         }
 
         return CYMakeType(context, type);


@@ -1454,8 +1560,12 @@ static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef
 } 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) {

+#ifdef CY_OBJECTIVEC

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

+#else
+    _assert(false);
+#endif

 }
 
 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 {


@@ -1469,9 +1579,41 @@ static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef
     return CYMakeType(context, *type);
 } CYCatch(NULL) }
 
     return CYMakeType(context, *type);
 } CYCatch(NULL) }
 

+static JSValueRef Type_callAsFunction_enumFor(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (count != 1)
+        throw CYJSError(context, "incorrect number of arguments to Type.enumFor");
+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
+
+    CYPool pool;
+
+    JSObjectRef constants(CYCastJSObject(context, arguments[0]));
+
+    // XXX: this is, sadly, going to leak
+    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, constants));
+
+    size_t count(JSPropertyNameArrayGetCount(names));
+
+    sig::Enum type(*internal->type_, count);
+    type.constants = new(pool) sig::Constant[count];
+
+    for (size_t index(0); index != count; ++index) {
+        JSStringRef name(JSPropertyNameArrayGetNameAtIndex(names, index));
+        JSValueRef value(CYGetProperty(context, constants, name));
+        _assert(JSValueGetType(context, value) == kJSTypeNumber);
+        CYUTF8String string(CYPoolUTF8String(pool, context, name));
+        type.constants[index].name = string.data;
+        type.constants[index].value = CYCastDouble(context, value);
+    }
+
+    JSPropertyNameArrayRelease(names);
+
+    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) {
 static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

-    sig::Function type;
-    return Type_callAsFunction_$With(context, object, _this, count, arguments, type, 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 {


@@ -1500,26 +1642,43 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
     if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
     if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))

-        return CYMakeFunctor(context, arguments[0], function->signature);
+        return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);

 
     CYPool pool;
 
     CYPool pool;

+

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

-    void *value(pool.malloc<void>(ffi->size, ffi->alignment));
-    type->PoolFFI(&pool, context, ffi, value, arguments[0]);
-    return type->FromFFI(context, 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 {

-    if (count != 0)
+    if (count > 1)

         throw CYJSError(context, "incorrect number of arguments to Type allocator");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
     JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL));
     Pointer *value(reinterpret_cast<Pointer *>(JSObjectGetPrivate(pointer)));
         throw CYJSError(context, "incorrect number of arguments to Type allocator");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
     JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL));
     Pointer *value(reinterpret_cast<Pointer *>(JSObjectGetPrivate(pointer)));

+
+    sig::Type *type(internal->type_);

     ffi_type *ffi(internal->GetFFI());
     value->value_ = value->pool_->malloc<void>(ffi->size, ffi->alignment);
     ffi_type *ffi(internal->GetFFI());
     value->value_ = value->pool_->malloc<void>(ffi->size, ffi->alignment);

-    memset(value->value_, 0, ffi->size);
+
+    if (count == 0)
+        memset(value->value_, 0, ffi->size);
+    else
+        type->PoolFFI(value->pool_, context, ffi, value->value_, arguments[0]);
+

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


@@ -1530,18 +1689,18 @@ 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)));
 } 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->GetOwner() ?: object);
+    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)));
     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->GetOwner() ?: object);
+    JSObjectRef owner(internal->owner_ ?: object);

     return CYMakePointer(context, internal->value_, sig::Primitive<char>(), NULL, owner);
 } CYCatch(NULL) }
 
     return CYMakePointer(context, internal->value_, sig::Primitive<char>(), NULL, owner);
 } CYCatch(NULL) }
 


@@ -1549,41 +1708,65 @@ static JSValueRef Functor_callAsFunction_$cya(JSContextRef context, JSObjectRef
     CYPool pool;
     cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(_this)));
 
     CYPool pool;
     cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(_this)));
 

-    sig::Function type;
+    sig::Function type(internal->variadic_);

     sig::Copy(pool, type.signature, internal->signature_);
 
     sig::Copy(pool, type.signature, internal->signature_);
 

-    return CYMakePointer(context, internal->value_, type, NULL, NULL);
+    return CYMakePointer(context, reinterpret_cast<void *>(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) }
 
 } 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 {
-    CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
+static JSValueRef CArray_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(_this)));

     return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
 } CYCatch(NULL) }
 
     return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
 } CYCatch(NULL) }
 

-static JSValueRef CYValue_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
-    return CYValue_callAsFunction_valueOf(context, object, _this, count, arguments, exception);
-}
+static JSValueRef Pointer_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
+    return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
+} CYCatch(NULL) }

 
 

-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)));
-    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;
+static JSValueRef Functor_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(_this)));
+    return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
+} CYCatch(NULL) }
+
+static JSValueRef Functor_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(_this)));
+    uint8_t *value(reinterpret_cast<uint8_t *>(internal->value_));
+
+    CYLocalPool pool;
+
+    sig::Function function(internal->variadic_);
+    sig::Copy(pool, function.signature, internal->signature_);
+
+    CYString *name;
+
+    auto typed(CYDecodeType(pool, &function)); {
+        std::ostringstream str;
+        Dl_info info;
+        if (internal->value_ == NULL)
+            str << "NULL";
+        else if (dladdr(value, &info) == 0)
+            str << internal->value_;
+        else {
+            str << info.dli_sname;
+            off_t offset(value - reinterpret_cast<uint8_t *>(info.dli_saddr));
+            if (offset != 0)
+                str << "+0x" << std::hex << offset;
+        }
+
+        name = new(pool) CYString(pool.strdup(str.str().c_str()));

     }
     }

-    std::string value(str.str());
-    return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
+
+    std::ostringstream str;
+    CYOptions options;
+    CYOutput output(*str.rdbuf(), options);
+    output.pretty_ = true;
+    (new(pool) CYExternalExpression(new(pool) CYString("C"), typed, name))->Output(output, CYNoFlags);
+    return CYCastJSValue(context, CYJSString(str.str()));

 } 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 {


@@ -1617,29 +1800,28 @@ static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRe
 
 static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
 
 static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));

-    char *string(static_cast<char *>(internal->value_));
-    return CYCastJSValue(context, strlen(string));
+    return CYCastJSValue(context, strlen(internal->value_));

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

-static JSValueRef CString_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef CString_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

     return CYMakeType(context, sig::String());
 } CYCatch(NULL) }
 
     return CYMakeType(context, sig::String());
 } CYCatch(NULL) }
 

-static JSValueRef CArray_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+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) }
 
     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_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Pointer_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
     sig::Pointer type(*internal->type_->type_);
     return CYMakeType(context, type);
 } CYCatch(NULL) }
 
 static JSValueRef CString_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
     sig::Pointer type(*internal->type_->type_);
     return CYMakeType(context, type);
 } CYCatch(NULL) }
 
 static JSValueRef CString_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

-    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
-    const char *string(static_cast<const char *>(internal->value_));
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
+    const char *string(internal->value_);

     std::ostringstream str;
     if (string == NULL)
         str << "NULL";
     std::ostringstream str;
     if (string == NULL)
         str << "NULL";


@@ -1652,14 +1834,16 @@ static JSValueRef CString_callAsFunction_toCYON(JSContextRef context, JSObjectRe
 } CYCatch(NULL) }
 
 static JSValueRef CString_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSValueRef CString_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

-    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
-    const char *string(static_cast<const char *>(internal->value_));
-    return CYCastJSValue(context, string);
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
+    return CYCastJSValue(context, internal->value_);

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

-static JSValueRef Functor_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+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 {


@@ -1690,34 +1874,29 @@ static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef o
     std::stringbuf out;
     CYOptions options;
     CYOutput output(out, options);
     std::stringbuf out;
     CYOptions options;
     CYOutput output(out, options);

-    (new(pool) CYTypeExpression(CYDecodeType(pool, internal->type_)))->Output(output, CYNoFlags);
+    output.pretty_ = true;
+    (new(pool) CYTypeExpression(CYDecodeType(pool, internal->type_->Copy(pool, ""))))->Output(output, CYNoFlags);

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

-static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
-    return Type_callAsFunction_toString(context, object, _this, count, arguments, exception);
-}
-

 static JSStaticFunction All_staticFunctions[2] = {
     {"cy$complete", &All_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
 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},
+static JSStaticFunction CArray_staticFunctions[3] = {

     {"toPointer", &CArray_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toPointer", &CArray_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"valueOf", &CArray_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {NULL, NULL, 0}
 };
 
 static JSStaticValue CArray_staticValues[2] = {
     {NULL, NULL, 0}
 };
 
 static JSStaticValue CArray_staticValues[2] = {

-    {"type", &CArray_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"$cyt", &CArray_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

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

-static JSStaticFunction CString_staticFunctions[6] = {
+static JSStaticFunction CString_staticFunctions[5] = {

     {"toCYON", &CString_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"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},
     {"toPointer", &CString_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toString", &CString_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"valueOf", &CString_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},


@@ -1726,20 +1905,19 @@ static JSStaticFunction CString_staticFunctions[6] = {
 
 static JSStaticValue CString_staticValues[3] = {
     {"length", &CString_getProperty_length, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
 
 static JSStaticValue CString_staticValues[3] = {
     {"length", &CString_getProperty_length, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    {"type", &CString_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"$cyt", &CString_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

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

-static JSStaticFunction Pointer_staticFunctions[5] = {
+static JSStaticFunction Pointer_staticFunctions[4] = {

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

-    {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

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

-    {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"valueOf", &Pointer_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {NULL, NULL, 0}
 };
 
 static JSStaticValue Pointer_staticValues[2] = {
     {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}
 };
 


@@ -1749,15 +1927,14 @@ static JSStaticFunction Struct_staticFunctions[2] = {
 };
 
 static JSStaticValue Struct_staticValues[2] = {
 };
 
 static JSStaticValue Struct_staticValues[2] = {

-    {"type", &Struct_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"$cyt", &Struct_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

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

-static JSStaticFunction Functor_staticFunctions[5] = {
+static JSStaticFunction Functor_staticFunctions[4] = {

     {"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"$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", &Functor_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"valueOf", &Functor_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

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


@@ -1766,7 +1943,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}
 };
 


@@ -1785,11 +1962,11 @@ static JSStaticFunction Type_staticFunctions[10] = {
     {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

+    {"enumFor", &Type_callAsFunction_enumFor, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"withName", &Type_callAsFunction_withName, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"pointerTo", &Type_callAsFunction_pointerTo, 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},
     {NULL, NULL, 0}
 };
     {"toString", &Type_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };


@@ -1838,18 +2015,22 @@ class ExecutionHandle {
     }
 };
 
     }
 };
 

+#ifndef __ANDROID__

 static volatile bool cancel_;
 
 static bool CYShouldTerminate(JSContextRef context, void *arg) {
     return cancel_;
 }
 static volatile bool cancel_;
 
 static bool CYShouldTerminate(JSContextRef context, void *arg) {
     return cancel_;
 }

+#endif

 
 _visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) {
     ExecutionHandle handle(context);
 
 
 _visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) {
     ExecutionHandle handle(context);
 

+#ifndef __ANDROID__

     cancel_ = false;
     if (&JSContextGroupSetExecutionTimeLimit != NULL)
         JSContextGroupSetExecutionTimeLimit(JSContextGetGroup(context), 0.5, &CYShouldTerminate, NULL);
     cancel_ = false;
     if (&JSContextGroupSetExecutionTimeLimit != NULL)
         JSContextGroupSetExecutionTimeLimit(JSContextGetGroup(context), 0.5, &CYShouldTerminate, NULL);

+#endif

 
     try {
         JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0));
 
     try {
         JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0));


@@ -1866,11 +2047,13 @@ _visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String
     }
 }
 
     }
 }
 

+#ifndef __ANDROID__

 _visible void CYCancel() {
     cancel_ = true;
 }
 _visible void CYCancel() {
     cancel_ = true;
 }

+#endif

 
 

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

 
 static bool initialized_ = false;
 
 
 static bool initialized_ = false;
 


@@ -1899,7 +2082,7 @@ void CYInitializeDynamic() {
     definition = kJSClassDefinitionEmpty;
     definition.className = "Context";
     definition.finalize = &CYFinalize;
     definition = kJSClassDefinitionEmpty;
     definition.className = "Context";
     definition.finalize = &CYFinalize;

-    Context_ = JSClassCreate(&definition);
+    Context::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "CArray";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "CArray";


@@ -1908,7 +2091,7 @@ void CYInitializeDynamic() {
     definition.getProperty = &CArray_getProperty;
     definition.setProperty = &CArray_setProperty;
     definition.finalize = &CYFinalize;
     definition.getProperty = &CArray_getProperty;
     definition.setProperty = &CArray_setProperty;
     definition.finalize = &CYFinalize;

-    CArray_ = JSClassCreate(&definition);
+    CArray::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "CString";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "CString";


@@ -1917,7 +2100,7 @@ void CYInitializeDynamic() {
     definition.getProperty = &CString_getProperty;
     definition.setProperty = &CString_setProperty;
     definition.finalize = &CYFinalize;
     definition.getProperty = &CString_getProperty;
     definition.setProperty = &CString_setProperty;
     definition.finalize = &CYFinalize;

-    CString_ = JSClassCreate(&definition);
+    CString::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Functor";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Functor";


@@ -1935,7 +2118,7 @@ void CYInitializeDynamic() {
     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 = kJSClassDefinitionEmpty;
     definition.className = "Struct";


@@ -1945,7 +2128,7 @@ void CYInitializeDynamic() {
     definition.setProperty = &Struct_setProperty;
     definition.getPropertyNames = &Struct_getPropertyNames;
     definition.finalize = &CYFinalize;
     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";


@@ -1962,8 +2145,10 @@ void CYInitializeDynamic() {
     Global_ = JSClassCreate(&definition);
 
     Array_s = JSStringCreateWithUTF8CString("Array");
     Global_ = JSClassCreate(&definition);
 
     Array_s = JSStringCreateWithUTF8CString("Array");

+    constructor_s = JSStringCreateWithUTF8CString("constructor");

     cy_s = JSStringCreateWithUTF8CString("$cy");
     cyi_s = JSStringCreateWithUTF8CString("$cyi");
     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");


@@ -2028,18 +2213,47 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) {
     return reinterpret_cast<Context *>(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_;
 }
 
     return reinterpret_cast<Context *>(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_;
 }
 

-static const char *CYPoolLibraryPath(CYPool &pool) {
+#ifdef __ANDROID__
+char *CYPoolLibraryPath_(CYPool &pool) {
+    FILE *maps(fopen("/proc/self/maps", "r"));
+    struct F { FILE *f; F(FILE *f) : f(f) {}
+        ~F() { fclose(f); } } f(maps);
+
+    size_t function(reinterpret_cast<size_t>(&CYPoolLibraryPath));
+
+    for (;;) {
+        size_t start; size_t end; char flags[8]; unsigned long long offset;
+        int major; int minor; unsigned long long inode; char file[1024];
+        int count(fscanf(maps, "%zx-%zx %7s %llx %x:%x %llu%[ ]%1024[^\n]\n",
+            &start, &end, flags, &offset, &major, &minor, &inode, file, file));
+        if (count < 8) break; else if (start <= function && function < end)
+            return pool.strdup(file);
+    }
+
+    _assert(false);
+}
+#else
+char *CYPoolLibraryPath_(CYPool &pool) {

     Dl_info addr;
     _assert(dladdr(reinterpret_cast<void *>(&CYPoolLibraryPath), &addr) != 0);
     Dl_info addr;
     _assert(dladdr(reinterpret_cast<void *>(&CYPoolLibraryPath), &addr) != 0);

-    char *lib(pool.strdup(addr.dli_fname));
+    return pool.strdup(addr.dli_fname);
+}
+#endif
+
+const char *CYPoolLibraryPath(CYPool &pool) {
+    char *lib(CYPoolLibraryPath_(pool));

 
     char *slash(strrchr(lib, '/'));
 
     char *slash(strrchr(lib, '/'));

-    _assert(slash != NULL);
+    if (slash == NULL)
+        return ".";

     *slash = '\0';
 
     slash = strrchr(lib, '/');
     *slash = '\0';
 
     slash = strrchr(lib, '/');

-    if (slash != NULL && strcmp(slash, "/.libs") == 0)
-        *slash = '\0';
+    if (slash != NULL) {
+        if (strcmp(slash, "/.libs") == 0)
+            *slash = '\0';
+    } else if (strcmp(lib, ".libs") == 0)
+        return ".";

 
     return lib;
 }
 
     return lib;
 }


@@ -2048,17 +2262,43 @@ static JSValueRef require_callAsFunction(JSContextRef context, JSObjectRef objec
     _assert(count == 1);
     CYPool pool;
 
     _assert(count == 1);
     CYPool pool;
 

-    const char *name(CYPoolCString(pool, context, arguments[0]));
-    if (strchr(name, '/') == NULL && (
+    CYUTF8String name(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+    if (memchr(name.data, '/', name.size) == NULL && (

 #ifdef __APPLE__
 #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 ||
+        dlopen(pool.strcat("/System/Library/Frameworks/", name.data, ".framework/", name.data, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
+        dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name.data, ".framework/", name.data, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||

 #endif
     false))
         return CYJSUndefined(context);
 
 #endif
     false))
         return CYJSUndefined(context);
 

-    JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve"))));
-    CYJSString path(context, CYCallAsFunction(context, resolve, NULL, 1, arguments));
+    CYJSString path;
+    CYUTF8String code;
+
+    sqlite3_stmt *statement;
+
+    _sqlcall(sqlite3_prepare(database_,
+        "select "
+            "\"module\".\"code\", "
+            "\"module\".\"flags\" "
+        "from \"module\" "
+        "where"
+            " \"module\".\"name\" = ?"
+        " limit 1"
+    , -1, &statement, NULL));
+
+    _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC));
+
+    if (_sqlcall(sqlite3_step(statement)) != SQLITE_DONE) {
+        code.data = static_cast<const char *>(sqlite3_column_blob(statement, 0));
+        code.size = sqlite3_column_bytes(statement, 0);
+        path = CYJSString(name);
+        code = CYPoolUTF8String(pool, code);
+    } else {
+        JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve"))));
+        path = CYJSString(context, CYCallAsFunction(context, resolve, NULL, 1, arguments));
+    }
+
+    _sqlcall(sqlite3_finalize(statement));

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


@@ -2070,11 +2310,13 @@ static JSValueRef require_callAsFunction(JSContextRef context, JSObjectRef objec
         JSObjectRef module(CYCastJSObject(context, cache));
         result = CYGetProperty(context, module, property);
     } else {
         JSObjectRef module(CYCastJSObject(context, cache));
         result = CYGetProperty(context, module, property);
     } else {

-        CYUTF8String code(CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path)));
-        _assert(code.data != NULL);
+        if (code.data == NULL) {
+            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) {
+        size_t length(name.size);
+        if (length >= 5 && strncmp(name.data + length - 5, ".json", 5) == 0) {

             JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON")));
             JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse"))));
             JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) };
             JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON")));
             JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse"))));
             JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) };


@@ -2121,7 +2363,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
 
     JSObjectRef global(CYGetGlobalObject(context));
 
 
     JSObjectRef global(CYGetGlobalObject(context));
 

-    JSObjectRef cy(JSObjectMake(context, Context_, new Context(context)));
+    JSObjectRef cy(Context::Make(context, context));

     CYSetProperty(context, global, cy_s, cy, kJSPropertyAttributeDontEnum);
 
 /* Cache Globals {{{ */
     CYSetProperty(context, global, cy_s, cy, kJSPropertyAttributeDontEnum);
 
 /* Cache Globals {{{ */


@@ -2179,11 +2421,11 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction);
     CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
 
     CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction);
     CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
 

-    JSObjectRef CArray(JSObjectMakeConstructor(context, CArray_, &CArray_new));
+    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);
 
     CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CArray, prototype_s)), Array_prototype);
     CYSetProperty(context, cycript, CYJSString("CArray"), CArray);
 

-    JSObjectRef CString(JSObjectMakeConstructor(context, CString_, &CString_new));
+    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);
 
     CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype);
     CYSetProperty(context, cycript, CYJSString("CString"), CString);
 


@@ -2191,7 +2433,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);
     CYSetProperty(context, cycript, CYJSString("Functor"), Functor);
 
     CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);
     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));


@@ -2240,6 +2482,8 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     }
 #endif
 
     }
 #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("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);


@@ -2261,6 +2505,11 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     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("ulong"), CYMakeType(context, sig::Primitive<unsigned long>()), kJSPropertyAttributeDontEnum);
     CYSetProperty(context, cache, CYJSString("ulonglong"), CYMakeType(context, sig::Primitive<unsigned long long>()), kJSPropertyAttributeDontEnum);
 

+#ifdef __SIZEOF_INT128__
+    CYSetProperty(context, cache, CYJSString("int128"), CYMakeType(context, sig::Primitive<__int128>()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("uint128"), CYMakeType(context, sig::Primitive<unsigned __int128>()), kJSPropertyAttributeDontEnum);
+#endif
+

     CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive<float>()), kJSPropertyAttributeDontEnum);
     CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive<double>()), kJSPropertyAttributeDontEnum);
 
     CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive<float>()), kJSPropertyAttributeDontEnum);
     CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive<double>()), kJSPropertyAttributeDontEnum);