Correct a simple typo in a thrown exception message.

[cycript.git] / Execute.cpp

diff --git a/Execute.cpp b/Execute.cpp
index 3f094191652c548ad502052322771ee7214a75a8..4f7358a68dd85ec077e7515b07ed2d192f57e326 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -1,44 +1,24 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * Cycript is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

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

-#include <sqlite3.h>
-

 #include "Internal.hpp"
 
 #include <dlfcn.h>
 #include "Internal.hpp"
 
 #include <dlfcn.h>


@@ -50,6 +30,7 @@
 #include "sig/ffi_type.hpp"
 
 #include "Pooling.hpp"
 #include "sig/ffi_type.hpp"
 
 #include "Pooling.hpp"

+#include "Execute.hpp"

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


@@ -68,12 +49,6 @@
 #include "JavaScript.hpp"
 #include "String.hpp"
 
 #include "JavaScript.hpp"
 #include "String.hpp"
 

-char *sqlite3_column_pooled(apr_pool_t *pool, sqlite3_stmt *stmt, int n) {
-    if (const unsigned char *value = sqlite3_column_text(stmt, n))
-        return apr_pstrdup(pool, (const char *) value);
-    else return NULL;
-}
-

 struct CYHooks *hooks_;
 
 /* JavaScript Properties {{{ */
 struct CYHooks *hooks_;
 
 /* JavaScript Properties {{{ */


@@ -172,13 +147,15 @@ JSStringRef push_s;
 JSStringRef splice_s;
 JSStringRef toCYON_s;
 JSStringRef toJSON_s;
 JSStringRef splice_s;
 JSStringRef toCYON_s;
 JSStringRef toJSON_s;

+JSStringRef toPointer_s;
+JSStringRef toString_s;

 
 static JSStringRef Result_;
 
 
 static JSStringRef Result_;
 

-sqlite3 *Bridge_;
-

 void CYFinalize(JSObjectRef object) {
 void CYFinalize(JSObjectRef object) {

-    delete reinterpret_cast<CYData *>(JSObjectGetPrivate(object));
+    CYData *internal(reinterpret_cast<CYData *>(JSObjectGetPrivate(object)));
+    if (--internal->count_ == 0)
+        delete internal;

 }
 
 void Structor_(apr_pool_t *pool, sig::Type *&type) {
 }
 
 void Structor_(apr_pool_t *pool, sig::Type *&type) {


@@ -186,6 +163,7 @@ void Structor_(apr_pool_t *pool, sig::Type *&type) {
         type->primitive == sig::pointer_P &&
         type->data.data.type != NULL &&
         type->data.data.type->primitive == sig::struct_P &&
         type->primitive == sig::pointer_P &&
         type->data.data.type != NULL &&
         type->data.data.type->primitive == sig::struct_P &&

+        type->data.data.type->name != NULL &&

         strcmp(type->data.data.type->name, "_objc_class") == 0
     ) {
         type->primitive = sig::typename_P;
         strcmp(type->data.data.type->name, "_objc_class") == 0
     ) {
         type->primitive = sig::typename_P;


@@ -196,49 +174,27 @@ void Structor_(apr_pool_t *pool, sig::Type *&type) {
     if (type->primitive != sig::struct_P || type->name == NULL)
         return;
 
     if (type->primitive != sig::struct_P || type->name == NULL)
         return;
 

-    sqlite3_stmt *statement;
-
-    _sqlcall(sqlite3_prepare(Bridge_,
-        "select "
-            "\"bridge\".\"mode\", "
-            "\"bridge\".\"value\" "
-        "from \"bridge\" "
-        "where"
-            " \"bridge\".\"mode\" in (3, 4) and"
-            " \"bridge\".\"name\" = ?"
-        " limit 1"
-    , -1, &statement, NULL));
-
-    _sqlcall(sqlite3_bind_text(statement, 1, type->name, -1, SQLITE_STATIC));
-
-    int mode;
-    const char *value;
-
-    if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) {
-        mode = -1;
-        value = NULL;
-    } else {
-        mode = sqlite3_column_int(statement, 0);
-        value = sqlite3_column_pooled(pool, statement, 1);
-    }
-
-    _sqlcall(sqlite3_finalize(statement));
-
-    switch (mode) {
-        default:
-            _assert(false);
-        case -1:
-            break;
-
-        case 3: {
-            sig::Parse(pool, &type->data.signature, value, &Structor_);
-        } break;
-
-        case 4: {
-            sig::Signature signature;
-            sig::Parse(pool, &signature, value, &Structor_);
-            type = signature.elements[0].type;
-        } break;
+    size_t length(strlen(type->name));
+    char keyed[length + 2];
+    memcpy(keyed + 1, type->name, length + 1);
+
+    static const char *modes = "34";
+    for (size_t i(0); i != 2; ++i) {
+        char mode(modes[i]);
+        keyed[0] = mode;
+
+        if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
+            switch (mode) {
+                case '3':
+                    sig::Parse(pool, &type->data.signature, entry->value_, &Structor_);
+                break;
+
+                case '4': {
+                    sig::Signature signature;
+                    sig::Parse(pool, &signature, entry->value_, &Structor_);
+                    type = signature.elements[0].type;
+                } break;
+            }

     }
 }
 
     }
 }
 


@@ -280,7 +236,7 @@ struct Struct_privateData :
     }
 };
 
     }
 };
 

-typedef std::map<const char *, Type_privateData *, CStringLess> TypeMap;
+typedef std::map<const char *, Type_privateData *, CYCStringLess> TypeMap;

 static TypeMap Types_;
 
 JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
 static TypeMap Types_;
 
 JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {


@@ -445,6 +401,16 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef obje
         return cyon;
     }
 
         return cyon;
     }
 

+    if (JSObjectIsFunction(context, object)) {
+        JSValueRef toString(CYGetProperty(context, object, toString_s));
+        if (CYIsCallable(context, toString)) {
+            JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))};
+            JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toString, object, 1, arguments));
+            _assert(value != NULL);
+            return CYPoolCString(pool, context, value);
+        }
+    }
+

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


@@ -511,13 +477,37 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef
     return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
 } CYCatch }
 
     return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
 } CYCatch }
 

+static JSValueRef String_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    CYPool pool;
+    std::ostringstream str;
+
+    CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, _this)));
+    CYStringify(str, string.data, string.size);
+
+    std::string value(str.str());
+    return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
+} CYCatch }
+

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

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

     return JSObjectMake(context, Functor_, internal);
 }
 
     return JSObjectMake(context, Functor_, internal);
 }
 


@@ -529,12 +519,19 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value) {
     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:
             return NULL;
     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:
             return NULL;

-        /*case kJSTypeObject:
+        case kJSTypeObject: {
+            JSObjectRef object((JSObjectRef) value);

             if (JSValueIsObjectOfClass(context, value, Pointer_)) {
             if (JSValueIsObjectOfClass(context, value, Pointer_)) {

-                Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate((JSObjectRef) value)));
+                Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));

                 return internal->value_;
                 return internal->value_;

-            }*/
-        default:
+            }
+            JSValueRef toPointer(CYGetProperty(context, object, toPointer_s));
+            if (CYIsCallable(context, toPointer)) {
+                JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL));
+                _assert(value != NULL);
+                return CYCastPointer_(context, value);
+            }
+        } default:

             double number(CYCastDouble(context, value));
             if (std::isnan(number))
                 throw CYJSError(context, "cannot convert value to pointer");
             double number(CYCastDouble(context, value));
             if (std::isnan(number))
                 throw CYJSError(context, "cannot convert value to pointer");


@@ -708,6 +705,15 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
     // XXX: in point of fact, this may /need/ to leak :(
     Closure_privateData *internal(new Closure_privateData(context, function, type));
 
     // XXX: in point of fact, this may /need/ to leak :(
     Closure_privateData *internal(new Closure_privateData(context, function, type));
 

+#if defined(__APPLE__) && defined(__arm__)
+    void *executable;
+    ffi_closure *writable(reinterpret_cast<ffi_closure *>(ffi_closure_alloc(sizeof(ffi_closure), &executable)));
+
+    ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, callback, internal, executable));
+    _assert(status == FFI_OK);
+
+    internal->value_ = executable;
+#else

     ffi_closure *closure((ffi_closure *) _syscall(mmap(
         NULL, sizeof(ffi_closure),
         PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,
     ffi_closure *closure((ffi_closure *) _syscall(mmap(
         NULL, sizeof(ffi_closure),
         PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,


@@ -720,6 +726,7 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
     _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
 
     internal->value_ = closure;
     _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
 
     internal->value_ = closure;

+#endif

 
     return internal;
 }
 
     return internal;
 }


@@ -940,12 +947,12 @@ static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef objec
     return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
 }
 
     return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
 }
 

-static JSObjectRef CYMakeType(JSContextRef context, const char *type) {
+JSObjectRef CYMakeType(JSContextRef context, const char *type) {

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

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

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


@@ -957,77 +964,72 @@ static void *CYCastSymbol(const char *name) {
 static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
 static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));

-    if (JSValueRef value = CYGetProperty(context, cycript, property))
-        if (!JSValueIsUndefined(context, value))
-            return value;
+    JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
+
+    for (size_t i(0), count(CYArrayLength(context, alls)); i != count; ++i)
+        if (JSObjectRef space = CYCastJSObject(context, CYArrayGet(context, alls, count - i - 1)))
+            if (JSValueRef value = CYGetProperty(context, space, property))
+                if (!JSValueIsUndefined(context, value))
+                    return value;

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

-    if (hooks_ != NULL && hooks_->RuntimeProperty != NULL)
-        if (JSValueRef value = (*hooks_->RuntimeProperty)(context, name))
-            return value;
-
-    sqlite3_stmt *statement;
-
-    _sqlcall(sqlite3_prepare(Bridge_,
-        "select "
-            "\"bridge\".\"mode\", "
-            "\"bridge\".\"value\" "
-        "from \"bridge\" "
-        "where"
-            " \"bridge\".\"name\" = ?"
-        " limit 1"
-    , -1, &statement, NULL));
-
-    _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC));
-
-    int mode;
-    const char *value;
-
-    if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) {
-        mode = -1;
-        value = NULL;
-    } else {
-        mode = sqlite3_column_int(statement, 0);
-        value = sqlite3_column_pooled(pool, statement, 1);
+    size_t length(name.size);
+    char keyed[length + 2];
+    memcpy(keyed + 1, name.data, length + 1);
+
+    static const char *modes = "0124";
+    for (size_t i(0); i != 4; ++i) {
+        char mode(modes[i]);
+        keyed[0] = mode;
+
+        if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
+            switch (mode) {
+                case '0':
+                    return JSEvaluateScript(CYGetJSContext(context), CYJSString(entry->value_), NULL, NULL, 0, NULL);
+
+                case '1':
+                    if (void (*symbol)() = reinterpret_cast<void (*)()>(CYCastSymbol(name.data)))
+                        return CYMakeFunctor(context, symbol, entry->value_, &entry->cache_);
+                    else return NULL;
+
+                case '2':
+                    if (void *symbol = CYCastSymbol(name.data)) {
+                        // XXX: this is horrendously inefficient
+                        sig::Signature signature;
+                        sig::Parse(pool, &signature, entry->value_, &Structor_);
+                        ffi_cif cif;
+                        sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+                        return CYFromFFI(context, signature.elements[0].type, cif.rtype, symbol);
+                    } else return NULL;
+
+                // XXX: implement case 3
+                case '4':
+                    return CYMakeType(context, entry->value_);
+            }

     }
 
     }
 

-    _sqlcall(sqlite3_finalize(statement));
-
-    switch (mode) {
-        default:
-            CYThrow("invalid mode from bridge table: %d", mode);
-        case -1:
-            return NULL;
-
-        case 0:
-            return JSEvaluateScript(CYGetJSContext(context), CYJSString(value), NULL, NULL, 0, NULL);
-
-        case 1:
-            if (void (*symbol)() = reinterpret_cast<void (*)()>(CYCastSymbol(name.data)))
-                return CYMakeFunctor(context, symbol, value);
-            else return NULL;
-
-        case 2:
-            if (void *symbol = CYCastSymbol(name.data)) {
-                // XXX: this is horrendously inefficient
-                sig::Signature signature;
-                sig::Parse(pool, &signature, value, &Structor_);
-                ffi_cif cif;
-                sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
-                return CYFromFFI(context, signature.elements[0].type, cif.rtype, symbol);
-            } else return NULL;
-
-        // XXX: implement case 3
-        case 4:
-            return CYMakeType(context, value);
-    }
+    return NULL;

 } CYCatch }
 
 } CYCatch }
 

+static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+    JSObjectRef global(CYGetGlobalObject(context));
+    JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
+    JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
+
+    for (size_t i(0), count(CYArrayLength(context, alls)); i != count; ++i)
+        if (JSObjectRef space = CYCastJSObject(context, CYArrayGet(context, alls, count - i - 1))) {
+            JSPropertyNameArrayRef subset(JSObjectCopyPropertyNames(context, space));
+            for (size_t index(0), count(JSPropertyNameArrayGetCount(subset)); index != count; ++index)
+                JSPropertyNameAccumulatorAddName(names, JSPropertyNameArrayGetNameAtIndex(subset, index));
+            JSPropertyNameArrayRelease(subset);
+        }
+}
+

 static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 2)
 static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 2)

-        throw CYJSError(context, "incorrect number of arguments to Functor constructor");
+        throw CYJSError(context, "incorrect number of arguments to Pointer constructor");

 
     CYPool pool;
 
 
     CYPool pool;
 


@@ -1089,7 +1091,7 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 0)
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 0)

-        throw CYJSError(context, "incorrect number of arguments to type cast function");
+        throw CYJSError(context, "incorrect number of arguments to Type allocator");

     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
     sig::Type *type(internal->type_);
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
     sig::Type *type(internal->type_);


@@ -1143,6 +1145,16 @@ static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRe
     }
 } CYCatch }
 
     }
 } CYCatch }
 

+static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+    return CYCastJSValue(context, internal->GetFFI()->alignment);
+}
+
+static JSValueRef Type_getProperty_size(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+    return CYCastJSValue(context, internal->GetFFI()->size);
+}
+

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


@@ -1191,6 +1203,12 @@ namespace cy {
     JSStaticFunction const * const Functor::StaticFunctions = Functor_staticFunctions;
 }
 
     JSStaticFunction const * const Functor::StaticFunctions = Functor_staticFunctions;
 }
 

+static JSStaticValue Type_staticValues[3] = {
+    {"alignment", &Type_getProperty_alignment, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"size", &Type_getProperty_size, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, NULL, 0}
+};
+

 static JSStaticFunction Type_staticFunctions[4] = {
     {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Type_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
 static JSStaticFunction Type_staticFunctions[4] = {
     {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Type_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},


@@ -1225,7 +1243,7 @@ JSObjectRef CYGetGlobalObject(JSContextRef context) {
     return JSContextGetGlobalObject(context);
 }
 
     return JSContextGetGlobalObject(context);
 }
 

-const char *CYExecute(apr_pool_t *pool, const char *code) {
+const char *CYExecute(apr_pool_t *pool, CYUTF8String code) {

     JSContextRef context(CYGetJSContext());
     JSValueRef exception(NULL), result;
 
     JSContextRef context(CYGetJSContext());
     JSValueRef exception(NULL), result;
 


@@ -1243,10 +1261,8 @@ const char *CYExecute(apr_pool_t *pool, const char *code) {
         return error;
     }
 
         return error;
     }
 

-    if (exception != NULL) { error:
-        result = exception;
-        exception = NULL;
-    }
+    if (exception != NULL) error:
+        return CYPoolCString(pool, context, CYJSString(context, exception));

 
     if (JSValueIsUndefined(context, result))
         return NULL;
 
     if (JSValueIsUndefined(context, result))
         return NULL;


@@ -1280,8 +1296,6 @@ void CYInitializeDynamic() {
 
     CYInitializeStatic();
 
 
     CYInitializeStatic();
 

-    _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));
-

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


@@ -1289,6 +1303,7 @@ void CYInitializeDynamic() {
     definition = kJSClassDefinitionEmpty;
     definition.className = "All";
     definition.getProperty = &All_getProperty;
     definition = kJSClassDefinitionEmpty;
     definition.className = "All";
     definition.getProperty = &All_getProperty;

+    definition.getPropertyNames = &All_getPropertyNames;

     All_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     All_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;


@@ -1322,6 +1337,7 @@ void CYInitializeDynamic() {
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Type";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Type";

+    definition.staticValues = Type_staticValues;

     definition.staticFunctions = Type_staticFunctions;
     definition.getProperty = &Type_getProperty;
     definition.callAsFunction = &Type_callAsFunction;
     definition.staticFunctions = Type_staticFunctions;
     definition.getProperty = &Type_getProperty;
     definition.callAsFunction = &Type_callAsFunction;


@@ -1330,6 +1346,7 @@ void CYInitializeDynamic() {
     Type_privateData::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     Type_privateData::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;

+    definition.className = "Global";

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


@@ -1344,6 +1361,8 @@ void CYInitializeDynamic() {
     splice_s = JSStringCreateWithUTF8CString("splice");
     toCYON_s = JSStringCreateWithUTF8CString("toCYON");
     toJSON_s = JSStringCreateWithUTF8CString("toJSON");
     splice_s = JSStringCreateWithUTF8CString("splice");
     toCYON_s = JSStringCreateWithUTF8CString("toCYON");
     toJSON_s = JSStringCreateWithUTF8CString("toJSON");

+    toPointer_s = JSStringCreateWithUTF8CString("toPointer");
+    toString_s = JSStringCreateWithUTF8CString("toString");

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


@@ -1400,6 +1419,8 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) {
 }
 
 extern "C" void CYSetupContext(JSGlobalContextRef context) {
 }
 
 extern "C" void CYSetupContext(JSGlobalContextRef context) {

+    JSValueRef exception(NULL);
+

     CYInitializeDynamic();
 
     JSObjectRef global(CYGetGlobalObject(context));
     CYInitializeDynamic();
 
     JSObjectRef global(CYGetGlobalObject(context));


@@ -1431,9 +1452,13 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
 
     JSObjectRef String(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String"))));
     CYSetProperty(context, cy, CYJSString("String"), String);
 
     JSObjectRef String(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String"))));
     CYSetProperty(context, cy, CYJSString("String"), String);

+
+    JSObjectRef String_prototype(CYCastJSObject(context, CYGetProperty(context, String, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("String_prototype"), String_prototype);

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

+    CYSetProperty(context, String_prototype, toCYON_s, &String_callAsFunction_toCYON, kJSPropertyAttributeDontEnum);

 
     JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, global, CYJSString("Cycript"), cycript);
 
     JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, global, CYJSString("Cycript"), cycript);


@@ -1449,23 +1474,29 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     JSObjectRef all(JSObjectMake(context, All_, NULL));
     CYSetProperty(context, cycript, CYJSString("all"), all);
 
     JSObjectRef all(JSObjectMake(context, All_, NULL));
     CYSetProperty(context, cycript, CYJSString("all"), all);
 

-    JSObjectRef last(NULL), curr(global);
+    JSObjectRef alls(JSObjectCallAsConstructor(context, Array, 0, NULL, &exception));
+    CYThrow(context, exception);
+    CYSetProperty(context, cycript, CYJSString("alls"), alls);
+
+    if (true) {
+        JSObjectRef last(NULL), curr(global);
+
+        goto next; for (JSValueRef next;;) {
+            if (JSValueIsNull(context, next))
+                break;
+            last = curr;
+            curr = CYCastJSObject(context, next);
+          next:
+            next = JSObjectGetPrototype(context, curr);
+        }

 
 

-    goto next; for (JSValueRef next;;) {
-        if (JSValueIsNull(context, next))
-            break;
-        last = curr;
-        curr = CYCastJSObject(context, next);
-      next:
-        next = JSObjectGetPrototype(context, curr);
+        JSObjectSetPrototype(context, last, all);

     }
 
     }
 

-    JSObjectSetPrototype(context, last, all);
-
-    CYSetProperty(context, global, CYJSString("$cyq"), &$cyq);
+    CYSetProperty(context, global, CYJSString("$cyq"), &$cyq, kJSPropertyAttributeDontEnum);

 
     JSObjectRef System(JSObjectMake(context, NULL, NULL));
 
     JSObjectRef System(JSObjectMake(context, NULL, NULL));

-    CYSetProperty(context, cy, CYJSString("System"), Function);
+    CYSetProperty(context, cy, CYJSString("System"), System);

 
     CYSetProperty(context, global, CYJSString("system"), System);
     CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));
 
     CYSetProperty(context, global, CYJSString("system"), System);
     CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));


@@ -1474,6 +1505,8 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
 
     if (hooks_ != NULL && hooks_->SetupContext != NULL)
         (*hooks_->SetupContext)(context);
 
     if (hooks_ != NULL && hooks_->SetupContext != NULL)
         (*hooks_->SetupContext)(context);

+
+    CYArrayPush(context, alls, cycript);

 }
 
 JSGlobalContextRef CYGetJSContext() {
 }
 
 JSGlobalContextRef CYGetJSContext() {