X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/37dadc219da7f34c243c5c76c2eff2d3fa1f1051..35494a52844a5855eb590e83342c91e7fa83b90f:/Execute.cpp

diff --git a/Execute.cpp b/Execute.cpp
index ac2fac1..81bd6ec 100644
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -181,15 +181,16 @@ static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[
 JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) {
     if (JSObjectMakeArray$ != NULL)
         return _jsccall(*JSObjectMakeArray$, context, length, values);
-    else {
-        JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
-        JSValueRef value(CYCallAsFunction(context, Array, NULL, length, values));
-        return CYCastJSObject(context, value);
-    }
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
+    bool wat(length == 1 && JSValueGetType(context, values[0]) == kJSTypeNumber);
+    JSValueRef value(CYCallAsFunction(context, Array, NULL, wat ? 0 : length, values));
+    JSObjectRef object(CYCastJSObject(context, value));
+    if (wat) CYArrayPush(context, object, 1, values);
+    return object;
 }
 
 static JSClassRef All_;
-JSClassRef Functor_;
+JSClassRef cy::Functor::Class_;
 static JSClassRef Global_;
 
 JSStringRef Array_s;
@@ -216,6 +217,8 @@ static JSStringRef Result_;
 
 void CYFinalize(JSObjectRef object) {
     CYData *internal(reinterpret_cast<CYData *>(JSObjectGetPrivate(object)));
+    if (internal == NULL)
+        return;
     _assert(internal->count_ != _not(unsigned));
     if (--internal->count_ == 0)
         delete internal;
@@ -251,12 +254,6 @@ struct CArray :
         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;
-        }
     }
 };
 
@@ -270,8 +267,6 @@ struct CString :
         value_(value),
         owner_(context, owner)
     {
-        if (owner == NULL)
-            value_ = pool_->strdup(value_);
     }
 };
 
@@ -340,6 +335,7 @@ JSValueRef CYCastJSValue(JSContextRef context, double value) {
         return JSValueMakeNumber(context, static_cast<double>(value)); \
     }
 
+CYCastJSValue_(long double)
 CYCastJSValue_(signed short int)
 CYCastJSValue_(unsigned short int)
 CYCastJSValue_(signed int)
@@ -657,7 +653,7 @@ JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &
 static JSValueRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) {
     if (function == NULL)
         return CYJSNull(context);
-    return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature));
+    return JSObjectMake(context, cy::Functor::Class_, new cy::Functor(function, variadic, signature));
 }
 
 // XXX: remove this, as it is really stupid
@@ -668,7 +664,7 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const
 
     cy::Functor *internal(new cy::Functor(function, encoding));
     ++internal->count_;
-    return JSObjectMake(context, Functor_, internal);
+    return JSObjectMake(context, cy::Functor::Class_, internal);
 }
 
 bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index) {
@@ -709,6 +705,8 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) {
     }
 }
 
+static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function);
+
 namespace sig {
 
 // XXX: this is somehow not quite a template :/
@@ -724,14 +722,17 @@ void Primitive<Type_>::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi
     *reinterpret_cast<Type_ *>(data) = CYCastDouble(context, value); \
 }
 
-CYPoolFFI_(char)
-CYPoolFFI_(double)
+CYPoolFFI_(wchar_t)
 CYPoolFFI_(float)
+CYPoolFFI_(double)
+CYPoolFFI_(long double)
+
 CYPoolFFI_(signed char)
 CYPoolFFI_(signed int)
 CYPoolFFI_(signed long int)
 CYPoolFFI_(signed long long int)
 CYPoolFFI_(signed short int)
+
 CYPoolFFI_(unsigned char)
 CYPoolFFI_(unsigned int)
 CYPoolFFI_(unsigned long int)
@@ -743,8 +744,21 @@ CYPoolFFI_(signed __int128)
 CYPoolFFI_(unsigned __int128)
 #endif
 
+template <>
+void Primitive<char>::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    if (JSValueGetType(context, value) != kJSTypeString)
+        *reinterpret_cast<char *>(data) = CYCastDouble(context, value);
+    else {
+        CYJSString script(context, value);
+        auto string(CYCastUTF16String(script));
+        _assert(string.size == 1);
+        _assert((string.data[0] & 0xff) == string.data[0]);
+        *reinterpret_cast<char *>(data) = string.data[0];
+    }
+}
+
 void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
-    _assert(false);
+    _assert(JSValueIsUndefined(context, value));
 }
 
 void Unknown::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
@@ -762,17 +776,11 @@ void Bits::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data
     _assert(false);
 }
 
-static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSValueRef value, JSObjectRef object) {
+static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSObjectRef object) {
     for (size_t index(0); index != length; ++index) {
-        JSValueRef rhs;
-        if (object == NULL)
-            rhs = value;
-        else {
-            rhs = CYGetProperty(context, object, index);
-            if (JSValueIsUndefined(context, rhs))
-                throw CYJSError(context, "unable to extract array value");
-        }
-
+        JSValueRef rhs(CYGetProperty(context, object, index));
+        if (JSValueIsUndefined(context, rhs))
+            throw CYJSError(context, "unable to extract array value");
         type.PoolFFI(pool, context, ffi, base, rhs);
         base += ffi->size;
     }
@@ -783,13 +791,20 @@ void Pointer::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *d
     *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)) {
+
+    if (sig::Function *function = dynamic_cast<sig::Function *>(&type)) {
+        _assert(!function->variadic);
+        auto internal(CYMakeFunctor_(context, object, function->signature, &FunctionAdapter_));
+        // XXX: see notes in Library.cpp about needing to leak
+        *reinterpret_cast<void (**)()>(data) = internal->value_;
+    } else 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);
+        CYArrayCopy(pool, context, base, length, type, element, object);
         *reinterpret_cast<void **>(data) = base;
     }
 }
@@ -798,8 +813,7 @@ void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *dat
     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);
+    CYArrayCopy(pool, context, base, size, type, ffi->elements[0], CYCastJSObject(context, value));
 }
 
 void Enum::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
@@ -845,18 +859,23 @@ void Function::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *
 #define CYFromFFI_(Type_) \
 template <> \
 JSValueRef Primitive<Type_>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \
-    return CYCastJSValue(context, *reinterpret_cast<Type_ *>(data)); \
+    JSValueRef value(CYCastJSValue(context, *reinterpret_cast<Type_ *>(data))); \
+    JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value)); \
+    CYSetProperty(context, typed, cyt_s, CYMakeType(context, *this), kJSPropertyAttributeDontEnum); \
+    return typed; \
 }
 
-CYFromFFI_(bool)
-CYFromFFI_(char)
-CYFromFFI_(double)
+CYFromFFI_(wchar_t)
 CYFromFFI_(float)
+CYFromFFI_(double)
+CYFromFFI_(long double)
+
 CYFromFFI_(signed char)
 CYFromFFI_(signed int)
 CYFromFFI_(signed long int)
 CYFromFFI_(signed long long int)
 CYFromFFI_(signed short int)
+
 CYFromFFI_(unsigned char)
 CYFromFFI_(unsigned int)
 CYFromFFI_(unsigned long int)
@@ -868,6 +887,21 @@ CYFromFFI_(signed __int128)
 CYFromFFI_(unsigned __int128)
 #endif
 
+template <>
+JSValueRef Primitive<bool>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return CYCastJSValue(context, *reinterpret_cast<bool *>(data));
+}
+
+template <>
+JSValueRef Primitive<char>::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    uint16_t string(uint8_t(*reinterpret_cast<char *>(data)));
+    JSValueRef value(CYCastJSValue(context, CYJSString(CYUTF16String(&string, 1))));
+    JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("String")), 1, &value));
+    CYSetProperty(context, typed, cyt_s, CYMakeType(context, sig::Primitive<char>()), kJSPropertyAttributeDontEnum);
+    CYSetPrototype(context, typed, CYGetCachedValue(context, CYJSString("Character_prototype")));
+    return typed;
+}
+
 JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
     return CYJSUndefined(context);
 }
@@ -924,8 +958,7 @@ void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) {
         values[index] = internal->signature_.elements[1 + index].type->FromFFI(context, internal->cif_.arg_types[index], arguments[index]);
 
     JSValueRef value(internal->adapter_(context, count, values, internal->function_));
-    if (internal->cif_.rtype != &ffi_type_void)
-        internal->signature_.elements[0].type->PoolFFI(NULL, context, internal->cif_.rtype, result, value);
+    internal->signature_.elements[0].type->PoolFFI(NULL, context, internal->cif_.rtype, result, value);
 }
 
 static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
@@ -976,7 +1009,7 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
 
 static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) {
     Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionAdapter_));
-    JSObjectRef object(JSObjectMake(context, Functor_, internal));
+    JSObjectRef object(JSObjectMake(context, cy::Functor::Class_, internal));
     // XXX: see above notes about needing to leak
     JSValueProtect(CYGetJSContext(context), object);
     return object;
@@ -1013,7 +1046,8 @@ static JSValueRef CString_getProperty(JSContextRef context, JSObjectRef object,
     else if (!CYGetOffset(pool, context, property, offset))
         return NULL;
 
-    return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->value_[offset], 1)));
+    sig::Primitive<char> type;
+    return type.FromFFI(context, type.GetFFI(pool), internal->value_ + offset, false, NULL);
 } CYCatch(NULL) }
 
 static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
@@ -1026,8 +1060,8 @@ static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStri
     else if (!CYGetOffset(pool, context, property, offset))
         return false;
 
-    const char *data(CYPoolCString(pool, context, value));
-    internal->value_[offset] = *data;
+    sig::Primitive<char> type;
+    type.PoolFFI(NULL, context, type.GetFFI(pool), internal->value_ + offset, value);
     return true;
 } CYCatch(false) }
 
@@ -1272,7 +1306,8 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi
         element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
     }
 
-    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))));
+    CYBuffer buffer(context);
+    uint8_t *value(buffer->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
@@ -1281,7 +1316,7 @@ 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, buffer);
 }
 
 static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
@@ -1477,15 +1512,15 @@ static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPro
 
 static JSObjectRef CArray_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     _assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
 
 static JSObjectRef CString_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     _assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
 
 static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     _assert(false);
-} CYCatch(NULL) }
+} CYCatchObject() }
 
 static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYPool pool;
@@ -1539,7 +1574,7 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou
     } else {
         throw CYJSError(context, "incorrect number of arguments to Type constructor");
     }
-} CYCatch(NULL) }
+} CYCatchObject() }
 
 static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Callable &type, JSValueRef *exception) { CYTry {
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
@@ -1645,7 +1680,7 @@ static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRe
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
 
     if (dynamic_cast<sig::Primitive<char> *>(internal->type_) != NULL)
-        return CYMakeType(context, sig::String());
+        return CYMakeType(context, sig::String((internal->type_->flags & JOC_TYPE_CONST) != 0));
     else
         return CYMakeType(context, sig::Pointer(*internal->type_));
 } CYCatch(NULL) }
@@ -1667,21 +1702,21 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
     if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
         return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
 
-    CYPool pool;
+    CYBuffer buffer(context);
 
     sig::Type *type(internal->type_);
     ffi_type *ffi(internal->GetFFI());
-    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;
+    void *data;
+    if (_this == NULL || CYIsStrictEqual(context, _this, CYGetGlobalObject(context)))
+        data = buffer->malloc<void>(ffi->size, ffi->alignment);
+    else {
+        CYSetProperty(context, buffer, CYJSString("$cyo"), _this, kJSPropertyAttributeDontEnum);
+        data = CYCastPointer<void *>(context, _this);
     }
 
+    type->PoolFFI(buffer, context, ffi, data, arguments[0]);
+    JSValueRef value(type->FromFFI(context, ffi, data, false, buffer));
     return value;
 } CYCatch(NULL) }
 
@@ -1703,7 +1738,7 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje
         type->PoolFFI(value->pool_, context, ffi, value->value_, arguments[0]);
 
     return pointer;
-} CYCatch(NULL) }
+} CYCatchObject() }
 
 // XXX: I don't even think the user should be allowed to do this
 static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
@@ -1715,7 +1750,7 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t
     sig::Parse(pool, &signature, encoding, &Structor_);
     // XXX: this can try to return null, and I guess then it just fails
     return CYCastJSObject(context, CYMakeFunctor(context, arguments[0], false, signature));
-} CYCatch(NULL) }
+} CYCatchObject() }
 
 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)));
@@ -1768,22 +1803,8 @@ static JSValueRef Functor_callAsFunction_toCYON(JSContextRef context, JSObjectRe
     sig::Function function(internal->variadic_);
     sig::Copy(pool, function.signature, internal->signature_);
 
-    CYPropertyName *name;
-
-    auto typed(CYDecodeType(pool, &function)); {
-        std::ostringstream str;
-        Dl_info info;
-        if (dladdr(value, &info) == 0) {
-            str << (void *) value;
-            name = new(pool) CYNumber(reinterpret_cast<uintptr_t>(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()));
-        }
-    }
+    CYPropertyName *name(internal->GetName(pool));
+    auto typed(CYDecodeType(pool, &function));
 
     std::ostringstream str;
     CYOptions options;
@@ -1793,6 +1814,19 @@ static JSValueRef Functor_callAsFunction_toCYON(JSContextRef context, JSObjectRe
     return CYCastJSValue(context, CYJSString(str.str()));
 } CYCatch(NULL) }
 
+CYPropertyName *cy::Functor::GetName(CYPool &pool) const {
+    Dl_info info;
+    if (dladdr(reinterpret_cast<void *>(value_), &info) == 0 || strcmp(info.dli_sname, "<redacted>") == 0)
+        return new(pool) CYNumber(reinterpret_cast<uintptr_t>(value_));
+
+    std::ostringstream str;
+    str << info.dli_sname;
+    off_t offset(reinterpret_cast<uint8_t *>(value_) - reinterpret_cast<uint8_t *>(info.dli_saddr));
+    if (offset != 0)
+        str << "+0x" << std::hex << offset;
+    return new(pool) CYString(pool.strdup(str.str().c_str()));
+}
+
 static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
 
@@ -1828,7 +1862,7 @@ static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef o
 } CYCatch(NULL) }
 
 static JSValueRef CString_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    return CYMakeType(context, sig::String());
+    return CYMakeType(context, sig::String(true));
 } CYCatch(NULL) }
 
 static JSValueRef CArray_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
@@ -1955,26 +1989,19 @@ static JSStaticValue Struct_staticValues[2] = {
     {NULL, NULL, NULL, 0}
 };
 
-static JSStaticFunction Functor_staticFunctions[4] = {
+static JSStaticFunction Functor_staticFunctions[5] = {
     {"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Functor_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"toPointer", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"valueOf", &Functor_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
-namespace cy {
-    JSStaticFunction const * const Functor::StaticFunctions = Functor_staticFunctions;
-}
-
 static JSStaticValue Functor_staticValues[2] = {
     {"$cyt", &Functor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, NULL, 0}
 };
 
-namespace cy {
-    JSStaticValue const * const Functor::StaticValues = Functor_staticValues;
-}
-
 static JSStaticValue Type_staticValues[4] = {
     {"alignment", &Type_getProperty_alignment, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"name", &Type_getProperty_name, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
@@ -2137,11 +2164,11 @@ void CYInitializeDynamic() {
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Functor";
-    definition.staticFunctions = cy::Functor::StaticFunctions;
+    definition.staticFunctions = Functor_staticFunctions;
     definition.staticValues = Functor_staticValues;
     definition.callAsFunction = &Functor_callAsFunction;
     definition.finalize = &CYFinalize;
-    Functor_ = JSClassCreate(&definition);
+    cy::Functor::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Pointer";
@@ -2153,6 +2180,11 @@ void CYInitializeDynamic() {
     definition.finalize = &CYFinalize;
     CYPrivate<Pointer>::Class_ = JSClassCreate(&definition);
 
+    definition = kJSClassDefinitionEmpty;
+    definition.className = "Root";
+    definition.finalize = &CYFinalize;
+    CYPrivate<CYRoot>::Class_ = JSClassCreate(&definition);
+
     definition = kJSClassDefinitionEmpty;
     definition.className = "Struct";
     definition.staticFunctions = Struct_staticFunctions;
@@ -2462,12 +2494,24 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype);
     CYSetProperty(context, cycript, CYJSString("CString"), CString);
 
-    JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
-    CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype);
+    JSObjectRef Functor(JSObjectMakeConstructor(context, cy::Functor::Class_, &Functor_new));
+    JSObjectRef Functor_prototype(CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)));
+    CYSetPrototype(context, Functor_prototype, Function_prototype);
+    CYSetProperty(context, cy, CYJSString("Functor_prototype"), Functor_prototype);
     CYSetProperty(context, cycript, CYJSString("Functor"), Functor);
 
     CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, CYPrivate<Pointer>::Class_, &Pointer_new));
-    CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, CYPrivate<Type_privateData>::Class_, &Type_new));
+
+    JSObjectRef Type(JSObjectMakeConstructor(context, CYPrivate<Type_privateData>::Class_, &Type_new));
+    JSObjectRef Type_prototype(CYCastJSObject(context, CYGetProperty(context, Type, prototype_s)));
+    CYSetPrototype(context, Type_prototype, Function_prototype);
+    CYSetProperty(context, cy, CYJSString("Type_prototype"), Type_prototype);
+    CYSetProperty(context, cycript, CYJSString("Type"), Type);
+
+    JSObjectRef Character_prototype(JSObjectMake(context, NULL, NULL));
+    CYSetPrototype(context, Character_prototype, String_prototype);
+    CYSetProperty(context, cy, CYJSString("Character_prototype"), Character_prototype);
+    CYSetProperty(context, Character_prototype, CYJSString("valueOf"), _jsccall(JSEvaluateScript, context, CYJSString("(function(){return this.charCodeAt(0);})"), NULL, NULL, 0));
 
     JSObjectRef modules(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, cy, CYJSString("modules"), modules);
@@ -2504,7 +2548,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     }
 #endif
 
-    CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String(true)), 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);
@@ -2534,6 +2578,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
 
     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("longdouble"), CYMakeType(context, sig::Primitive<long double>()), kJSPropertyAttributeDontEnum);
 
     CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum);