X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/a0a889ede9c85b8d7b6155a0ce19bcee45c4c654..d6848e7305f443c0d55fc83ad93beccdb8a572ea:/Execute.cpp

diff --git a/Execute.cpp b/Execute.cpp
index 7875d88..dfc0158 100644
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -168,16 +168,13 @@ static JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const
 
 static JSClassRef All_;
 static JSClassRef Context_;
-static JSClassRef CArray_;
-static JSClassRef CString_;
 JSClassRef Functor_;
 static JSClassRef Global_;
-static JSClassRef Pointer_;
-static JSClassRef Struct_;
 
 JSStringRef Array_s;
 JSStringRef cy_s;
 JSStringRef cyi_s;
+JSStringRef cyt_s;
 JSStringRef length_s;
 JSStringRef message_s;
 JSStringRef name_s;
@@ -221,91 +218,82 @@ struct Context :
 };
 
 struct CArray :
-    CYOwned
+    CYValue_<CArray, void *>
 {
+    CYProtect owner_;
     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)
     {
+        if (owner == NULL) {
+            size_t size(ffi->size * length);
+            void *copy(pool_->malloc<void>(size, ffi->alignment));
+            memcpy(copy, GetValue(), size);
+            value_ = copy;
+        }
     }
 };
 
 struct CString :
-    CYOwned
+    CYValue_<CString, char *>
 {
+    CYProtect owner_;
+
     CString(char *value, JSContextRef context, JSObjectRef owner) :
-        CYOwned(value, context, owner)
+        CYValue_(value),
+        owner_(context, owner)
     {
+        if (owner == NULL)
+            value_ = pool_->strdup(GetValue());
     }
 };
 
 struct Pointer :
-    CYOwned
+    CYValue_<Pointer, void *>
 {
+    CYProtect owner_;
     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))
     {
     }
 
-    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 :
-    CYOwned
+    CYValue_<Struct_privateData, void *>
 {
+    CYProtect owner_;
     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))
     {
+        if (owner == NULL) {
+            size_t size(ffi->size);
+            void *copy(pool_->malloc<void>(size, ffi->alignment));
+            memcpy(copy, GetValue(), 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)
@@ -640,17 +628,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) {
-    Pointer *internal(new Pointer(pointer, context, owner, type));
-    return JSObjectMake(context, Pointer_, internal);
-}
-
-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const char *encoding, JSObjectRef owner) {
-    Pointer *internal(new Pointer(pointer, context, owner, encoding));
-    return JSObjectMake(context, Pointer_, internal);
+    return Pointer::Make(context, pointer, type, context, owner);
 }
 
-static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const sig::Signature &signature) {
-    return JSObjectMake(context, Functor_, new cy::Functor(signature, function));
+static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) {
+    return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature));
 }
 
 static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) {
@@ -658,7 +640,7 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const
     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);
 }
@@ -675,7 +657,7 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) {
             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_;
             }
@@ -792,6 +774,7 @@ void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *dat
 void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
     _assert(!overlap);
 
+    size_t offset(0);
     uint8_t *base(reinterpret_cast<uint8_t *>(data));
     JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
     for (size_t index(0); index != signature.count; ++index) {
@@ -813,8 +796,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);
     }
 }
 
@@ -853,7 +837,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))
-        return CYMakeCString(context, value, owner);
+        return CString::Make(context, value, context, owner);
     return CYJSNull(context);
 }
 
@@ -868,15 +852,15 @@ 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 {
-    return CYMakeCArray(context, data, size, type, ffi->elements[0], owner);
+    return CArray::Make(context, data, size, type, ffi->elements[0], context, owner);
 }
 
 JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
-    return CYMakeStruct(context, data, *this, ffi, owner);
+    return Struct_privateData::Make(context, data, *this, ffi, context, owner);
 }
 
 JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
-    return CYMakeFunctor(context, reinterpret_cast<void (*)()>(data), signature);
+    return CYMakeFunctor(context, reinterpret_cast<void (*)()>(data), variadic, signature);
 }
 
 }
@@ -959,7 +943,7 @@ JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef 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));
@@ -968,33 +952,31 @@ 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);
+        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)));
-    char *string(static_cast<char *>(internal->value_));
 
     ssize_t offset;
     if (!CYGetOffset(pool, context, property, offset))
         return NULL;
 
-    return CYCastJSValue(context, CYJSString(CYUTF8String(&string[offset], 1)));
+    return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->GetValue()[offset], 1)));
 } CYCatch(NULL) }
 
 static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     CYPool pool;
     CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
-    char *string(static_cast<char *>(internal->value_));
 
     ssize_t offset;
     if (!CYGetOffset(pool, context, property, offset))
         return false;
 
     const char *data(CYPoolCString(pool, context, value));
-    string[offset] = *data;
+    internal->GetValue()[offset] = *data;
     return true;
 } CYCatch(false) }
 
@@ -1077,7 +1059,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_);
-    JSObjectRef owner(internal->GetOwner() ?: object);
+    JSObjectRef owner(internal->owner_ ?: object);
     return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
 } CYCatch(NULL) }
 
@@ -1097,10 +1079,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;
-        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) }
 
@@ -1117,7 +1099,7 @@ static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef o
     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) }
@@ -1134,7 +1116,7 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J
     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) }
@@ -1181,23 +1163,62 @@ 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);
 }
 
-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");
 
-    size_t size(setups + count);
-    void *values[size];
+    ffi_cif corrected;
+    sig::Element *elements(signature.elements);
+
+    if (have > need) {
+        if (!variadic)
+            throw CYJSError(context, "exorbitant number of arguments to ffi function");
+
+        elements = new (pool) sig::Element[have + 1];
+        memcpy(elements, signature.elements, sizeof(sig::Element) * (need + 1));
+
+        for (size_t index(need); index != have; ++index) {
+            sig::Element &element(elements[index + 1]);
+            element.name = NULL;
+            element.offset = _not(size_t);
+            element.type = CYGetType(pool, context, arguments[index - setups]);
+        }
+
+        sig::Signature extended;
+        extended.elements = elements;
+        extended.count = have + 1;
+        sig::sig_ffi_cif(pool, signature.count, extended, &corrected);
+        cif = &corrected;
+    }
+
+    void *values[have];
     memcpy(values, setup, sizeof(void *) * setups);
 
-    for (size_t index(setups); index != 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);
-        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];
@@ -1209,13 +1230,13 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi
             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)));
-    return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue());
+    return CYCallFunction(pool, context, 0, NULL, count, arguments, false, internal->variadic_, internal->signature_, &internal->cif_, internal->GetValue());
 } CYCatch(NULL) }
 
 static JSValueRef Pointer_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
@@ -1231,13 +1252,6 @@ JSObjectRef CYMakeType(JSContextRef context, const sig::Type &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);
-}
-
 extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) {
     sqlite3_stmt *statement;
 
@@ -1499,8 +1513,9 @@ static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef
 } CYCatch(NULL) }
 
 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 {
@@ -1529,14 +1544,23 @@ 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_))
-        return CYMakeFunctor(context, arguments[0], function->signature);
+        return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
 
     CYPool pool;
     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 {
@@ -1559,18 +1583,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_);
-    return CYMakeFunctor(context, arguments[0], signature);
+    return CYMakeFunctor(context, arguments[0], false, signature);
 } CYCatch(NULL) }
 
 static JSValueRef CArray_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(_this)));
-    JSObjectRef owner(internal->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)));
-    JSObjectRef owner(internal->GetOwner() ?: object);
+    JSObjectRef owner(internal->owner_ ?: object);
     return CYMakePointer(context, internal->value_, sig::Primitive<char>(), NULL, owner);
 } CYCatch(NULL) }
 
@@ -1578,7 +1602,7 @@ static JSValueRef Functor_callAsFunction_$cya(JSContextRef context, JSObjectRef
     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_);
 
     return CYMakePointer(context, internal->value_, type, NULL, NULL);
@@ -1646,29 +1670,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)));
-    char *string(static_cast<char *>(internal->value_));
-    return CYCastJSValue(context, strlen(string));
+    return CYCastJSValue(context, strlen(internal->GetValue()));
 } 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) }
 
-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) }
 
-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(_this)));
-    const char *string(static_cast<const char *>(internal->value_));
+    CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
+    const char *string(internal->GetValue());
     std::ostringstream str;
     if (string == NULL)
         str << "NULL";
@@ -1681,14 +1704,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 {
-    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->GetValue());
 } 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)));
-    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 {
@@ -1740,7 +1765,7 @@ static JSStaticFunction CArray_staticFunctions[4] = {
 };
 
 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}
 };
 
@@ -1755,7 +1780,7 @@ static JSStaticFunction CString_staticFunctions[6] = {
 
 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}
 };
 
@@ -1768,7 +1793,7 @@ static JSStaticFunction Pointer_staticFunctions[5] = {
 };
 
 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}
 };
 
@@ -1778,7 +1803,7 @@ static JSStaticFunction Struct_staticFunctions[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}
 };
 
@@ -1795,7 +1820,7 @@ namespace cy {
 }
 
 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}
 };
 
@@ -1937,7 +1962,7 @@ void CYInitializeDynamic() {
     definition.getProperty = &CArray_getProperty;
     definition.setProperty = &CArray_setProperty;
     definition.finalize = &CYFinalize;
-    CArray_ = JSClassCreate(&definition);
+    CArray::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "CString";
@@ -1946,7 +1971,7 @@ void CYInitializeDynamic() {
     definition.getProperty = &CString_getProperty;
     definition.setProperty = &CString_setProperty;
     definition.finalize = &CYFinalize;
-    CString_ = JSClassCreate(&definition);
+    CString::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Functor";
@@ -1964,7 +1989,7 @@ void CYInitializeDynamic() {
     definition.getProperty = &Pointer_getProperty;
     definition.setProperty = &Pointer_setProperty;
     definition.finalize = &CYFinalize;
-    Pointer_ = JSClassCreate(&definition);
+    Pointer::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Struct";
@@ -1974,7 +1999,7 @@ void CYInitializeDynamic() {
     definition.setProperty = &Struct_setProperty;
     definition.getPropertyNames = &Struct_getPropertyNames;
     definition.finalize = &CYFinalize;
-    Struct_ = JSClassCreate(&definition);
+    Struct_privateData::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Type";
@@ -1993,6 +2018,7 @@ void CYInitializeDynamic() {
     Array_s = JSStringCreateWithUTF8CString("Array");
     cy_s = JSStringCreateWithUTF8CString("$cy");
     cyi_s = JSStringCreateWithUTF8CString("$cyi");
+    cyt_s = JSStringCreateWithUTF8CString("$cyt");
     length_s = JSStringCreateWithUTF8CString("length");
     message_s = JSStringCreateWithUTF8CString("message");
     name_s = JSStringCreateWithUTF8CString("name");
@@ -2208,11 +2234,11 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     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);
 
-    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);
 
@@ -2220,7 +2246,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     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));
@@ -2269,6 +2295,8 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     }
 #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);