Somewhat better iconv handling on the Mac when MacPorts is in the path (aka Horrible...

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index d80978e35694949710702e3577e5ebc374226b9e..2b85f96653cd67d353edc1d01c20038ce7b779f9 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -37,18 +37,11 @@
 */
 /* }}} */
 
 */
 /* }}} */
 

-#include <sqlite3.h>
-
-#include "Internal.hpp"
-

 #include <dlfcn.h>
 #include <iconv.h>
 
 #include "cycript.hpp"
 
 #include <dlfcn.h>
 #include <iconv.h>
 
 #include "cycript.hpp"
 

-#include "sig/parse.hpp"
-#include "sig/ffi_type.hpp"
-

 #include "Pooling.hpp"
 
 #include <sys/mman.h>
 #include "Pooling.hpp"
 
 #include <sys/mman.h>


@@ -65,99 +58,30 @@
 #include "Cycript.tab.hh"
 
 #include "Error.hpp"
 #include "Cycript.tab.hh"
 
 #include "Error.hpp"

-#include "JavaScript.hpp"

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

+#include "Execute.hpp"

 
 

-#ifdef __OBJC__
-#define CYCatch_ \
-    catch (NSException *error) { \
-        CYThrow(context, error, exception); \
-        return NULL; \
-    }
-#else
-#define CYCatch_
-#endif
-
-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 {{{ */
-JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetPropertyAtIndex(context, object, index, &exception));
-    CYThrow(context, exception);
-    return value;
-}
-
-JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, JSStringRef name) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetProperty(context, object, name, &exception));
-    CYThrow(context, exception);
-    return value;
-}
-
-void CYSetProperty(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSObjectSetPropertyAtIndex(context, object, index, value, &exception);
-    CYThrow(context, exception);
-}
-
-void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value, JSPropertyAttributes attributes) {
-    JSValueRef exception(NULL);
-    JSObjectSetProperty(context, object, name, value, attributes, &exception);
-    CYThrow(context, exception);
-}
-/* }}} */
-/* JavaScript Strings {{{ */
-JSStringRef CYCopyJSString(const char *value) {
-    return value == NULL ? NULL : JSStringCreateWithUTF8CString(value);
-}
-
-JSStringRef CYCopyJSString(JSStringRef value) {
-    return value == NULL ? NULL : JSStringRetain(value);
-}
-
-JSStringRef CYCopyJSString(CYUTF8String value) {
-    // XXX: this is very wrong
-    return CYCopyJSString(value.data);
-}
-
-JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
-    if (JSValueIsNull(context, value))
-        return NULL;
-    JSValueRef exception(NULL);
-    JSStringRef string(JSValueToStringCopy(context, value, &exception));
-    CYThrow(context, exception);
-    return string;
-}
-
-static CYUTF16String CYCastUTF16String(JSStringRef value) {
-    return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value));
-}
-
+/* C Strings {{{ */

 template <typename Type_>
 _finline size_t iconv_(size_t (*iconv)(iconv_t, Type_, size_t *, char **, size_t *), iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) {
     return iconv(cd, const_cast<Type_>(inbuf), inbytesleft, outbuf, outbytesleft);
 }
 
 template <typename Type_>
 _finline size_t iconv_(size_t (*iconv)(iconv_t, Type_, size_t *, char **, size_t *), iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) {
     return iconv(cd, const_cast<Type_>(inbuf), inbytesleft, outbuf, outbytesleft);
 }
 

-static CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
+#ifdef __GLIBC__
+#define UCS_2_INTERNAL "UCS-2"
+#else
+#define UCS_2_INTERNAL "UCS-2-INTERNAL"
+#endif
+
+CYUTF8String CYPoolUTF8String(apr_pool_t *pool, CYUTF16String utf16) {

     _assert(pool != NULL);
 
     _assert(pool != NULL);
 

-    CYUTF16String utf16(CYCastUTF16String(value));

     const char *in(reinterpret_cast<const char *>(utf16.data));
 
     const char *in(reinterpret_cast<const char *>(utf16.data));
 

-#ifdef __GLIBC__
-    iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2")));
-#else
-    iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2-INTERNAL")));
-#endif
+    iconv_t conversion(_syscall(iconv_open("UTF-8", UCS_2_INTERNAL)));

 
 

-    size_t size(JSStringGetMaximumUTF8CStringSize(value));
+    // XXX: this is wrong
+    size_t size(utf16.size * 5);

     char *out(new(pool) char[size]);
     CYUTF8String utf8(out, size);
 
     char *out(new(pool) char[size]);
     CYUTF8String utf8(out, size);
 


@@ -172,33 +96,48 @@ static CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSS
     return utf8;
 }
 
     return utf8;
 }
 

-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
-    CYUTF8String utf8(CYPoolUTF8String(pool, context, value));
-    _assert(memchr(utf8.data, '\0', utf8.size) == NULL);
-    return utf8.data;
-}
+CYUTF16String CYPoolUTF16String(apr_pool_t *pool, CYUTF8String utf8) {
+    _assert(pool != NULL);
+
+    const char *in(utf8.data);
+
+    iconv_t conversion(_syscall(iconv_open(UCS_2_INTERNAL, "UTF-8")));
+
+    // XXX: this is wrong
+    size_t size(utf8.size * 5);
+    uint16_t *temp(new (pool) uint16_t[size]);
+    CYUTF16String utf16(temp, size * 2);
+    char *out(reinterpret_cast<char *>(temp));

 
 

-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    return JSValueIsNull(context, value) ? NULL : CYPoolCString(pool, context, CYJSString(context, value));
+    size = utf8.size;
+    _syscall(iconv_(&iconv, conversion, const_cast<char **>(&in), &size, &out, &utf16.size));
+
+    utf16.size = reinterpret_cast<uint16_t *>(out) - utf16.data;
+    temp[utf16.size] = 0;
+
+    _syscall(iconv_close(conversion));
+
+    return utf16;

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

-

 /* Index Offsets {{{ */
 size_t CYGetIndex(const CYUTF8String &value) {
     if (value.data[0] != '0') {
 /* Index Offsets {{{ */
 size_t CYGetIndex(const CYUTF8String &value) {
     if (value.data[0] != '0') {

-        char *end;
-        size_t index(strtoul(value.data, &end, 10));
-        if (value.data + value.size == end)
-            return index;
-    } else if (value.data[1] == '\0')
+        size_t index(0);
+        for (size_t i(0); i != value.size; ++i) {
+            if (!DigitRange_[value.data[i]])
+                return _not(size_t);
+            index *= 10;
+            index += value.data[i] - '0';
+        }
+        return index;
+    } else if (value.size == 1)

         return 0;
         return 0;

-    return _not(size_t);
-}
-
-size_t CYGetIndex(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
-    return CYGetIndex(CYPoolUTF8String(pool, context, value));
+    else
+        return _not(size_t);

 }
 
 }
 

+// XXX: this isn't actually right

 bool CYGetOffset(const char *value, ssize_t &index) {
     if (value[0] != '0') {
         char *end;
 bool CYGetOffset(const char *value, ssize_t &index) {
     if (value[0] != '0') {
         char *end;


@@ -213,7 +152,6 @@ bool CYGetOffset(const char *value, ssize_t &index) {
     return false;
 }
 /* }}} */
     return false;
 }
 /* }}} */

-

 /* JavaScript *ify {{{ */
 void CYStringify(std::ostringstream &str, const char *data, size_t size) {
     unsigned quot(0), apos(0);
 /* JavaScript *ify {{{ */
 void CYStringify(std::ostringstream &str, const char *data, size_t size) {
     unsigned quot(0), apos(0);


@@ -250,7 +188,7 @@ void CYStringify(std::ostringstream &str, const char *data, size_t size) {
             break;
 
             default:
             break;
 
             default:

-                // this test is designed to be "awewsome", generating neither warnings nor incorrect results
+                // this test is designed to be "awesome", generating neither warnings nor incorrect results

                 if (*value < 0x20 || *value >= 0x7f)
                     str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(uint8_t(*value));
                 else simple:
                 if (*value < 0x20 || *value >= 0x7f)
                     str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(uint8_t(*value));
                 else simple:


@@ -290,170 +228,6 @@ bool CYIsKey(CYUTF8String value) {
 }
 /* }}} */
 
 }
 /* }}} */
 

-static JSGlobalContextRef Context_;
-static JSObjectRef System_;
-
-static JSClassRef Functor_;
-static JSClassRef Pointer_;
-static JSClassRef Runtime_;
-static JSClassRef Struct_;
-
-static JSStringRef Result_;
-
-JSObjectRef Array_;
-JSObjectRef Error_;
-JSObjectRef Function_;
-JSObjectRef String_;
-
-JSStringRef length_;
-JSStringRef message_;
-JSStringRef name_;
-JSStringRef prototype_;
-JSStringRef toCYON_;
-JSStringRef toJSON_;
-
-JSObjectRef Object_prototype_;
-JSObjectRef Function_prototype_;
-
-JSObjectRef Array_prototype_;
-JSObjectRef Array_pop_;
-JSObjectRef Array_push_;
-JSObjectRef Array_splice_;
-
-sqlite3 *Bridge_;
-
-void CYFinalize(JSObjectRef object) {
-    delete reinterpret_cast<CYData *>(JSObjectGetPrivate(object));
-}
-
-struct CStringMapLess :
-    std::binary_function<const char *, const char *, bool>
-{
-    _finline bool operator ()(const char *lhs, const char *rhs) const {
-        return strcmp(lhs, rhs) < 0;
-    }
-};
-
-void Structor_(apr_pool_t *pool, const char *name, const char *types, sig::Type *&type) {
-    if (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, 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;
-    }
-}
-
-JSClassRef Type_privateData::Class_;
-
-struct Pointer :
-    CYOwned
-{
-    Type_privateData *type_;
-
-    Pointer(void *value, JSContextRef context, JSObjectRef owner, sig::Type *type) :
-        CYOwned(value, context, owner),
-        type_(new(pool_) Type_privateData(type))
-    {
-    }
-};
-
-struct Struct_privateData :
-    CYOwned
-{
-    Type_privateData *type_;
-
-    Struct_privateData(JSContextRef context, JSObjectRef owner) :
-        CYOwned(NULL, context, owner)
-    {
-    }
-};
-
-typedef std::map<const char *, Type_privateData *, CStringMapLess> TypeMap;
-static TypeMap Types_;
-
-JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
-    Struct_privateData *internal(new Struct_privateData(context, owner));
-    apr_pool_t *pool(internal->pool_);
-    Type_privateData *typical(new(pool) Type_privateData(type, ffi));
-    internal->type_ = typical;
-
-    if (owner != NULL)
-        internal->value_ = data;
-    else {
-        size_t size(typical->GetFFI()->size);
-        void *copy(apr_palloc(internal->pool_, size));
-        memcpy(copy, data, size);
-        internal->value_ = copy;
-    }
-
-    return JSObjectMake(context, Struct_, internal);
-}
-
-JSValueRef CYCastJSValue(JSContextRef context, bool value) {
-    return JSValueMakeBoolean(context, value);
-}
-
-JSValueRef CYCastJSValue(JSContextRef context, double value) {
-    return JSValueMakeNumber(context, value);
-}
-
-#define CYCastJSValue_(Type_) \
-    JSValueRef CYCastJSValue(JSContextRef context, Type_ value) { \
-        return JSValueMakeNumber(context, static_cast<double>(value)); \
-    }
-
-CYCastJSValue_(int)
-CYCastJSValue_(unsigned int)
-CYCastJSValue_(long int)
-CYCastJSValue_(long unsigned int)
-CYCastJSValue_(long long int)
-CYCastJSValue_(long long unsigned int)
-
-JSValueRef CYJSUndefined(JSContextRef context) {
-    return JSValueMakeUndefined(context);
-}
-

 double CYCastDouble(const char *value, size_t size) {
     char *end;
     double number(strtod(value, &end));
 double CYCastDouble(const char *value, size_t size) {
     char *end;
     double number(strtod(value, &end));


@@ -466,950 +240,56 @@ double CYCastDouble(const char *value) {
     return CYCastDouble(value, strlen(value));
 }
 
     return CYCastDouble(value, strlen(value));
 }
 

-double CYCastDouble(JSContextRef context, JSValueRef value) {
-    JSValueRef exception(NULL);
-    double number(JSValueToNumber(context, value, &exception));
-    CYThrow(context, exception);
-    return number;
-}
-
-bool CYCastBool(JSContextRef context, JSValueRef value) {
-    return JSValueToBoolean(context, value);
-}
-
-JSValueRef CYJSNull(JSContextRef context) {
-    return JSValueMakeNull(context);
-}
-
-JSValueRef CYCastJSValue(JSContextRef context, JSStringRef value) {
-    return value == NULL ? CYJSNull(context) : JSValueMakeString(context, value);
-}
-
-JSValueRef CYCastJSValue(JSContextRef context, const char *value) {
-    return CYCastJSValue(context, CYJSString(value));
-}
-
-JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSObjectRef object(JSValueToObject(context, value, &exception));
-    CYThrow(context, exception);
-    return object;
-}
-
-JSValueRef CYCallAsFunction(JSContextRef context, JSObjectRef function, JSObjectRef _this, size_t count, JSValueRef arguments[]) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectCallAsFunction(context, function, _this, count, arguments, &exception));
-    CYThrow(context, exception);
-    return value;
-}
-
-bool CYIsCallable(JSContextRef context, JSValueRef value) {
-    return value != NULL && JSValueIsObject(context, value) && JSObjectIsFunction(context, (JSObjectRef) value);
-}
-
-static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count == 0)
-        printf("\n");
-    else {
-        CYPool pool;
-        printf("%s\n", CYPoolCString(pool, context, arguments[0]));
-    }
-
-    return CYJSUndefined(context);
-} CYCatch }
-
-static size_t Nonce_(0);
-
-static JSValueRef $cyq(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
-    CYPool pool;
-    const char *name(apr_psprintf(pool, "%s%zu", CYPoolCString(pool, context, arguments[0]), Nonce_++));
-    return CYCastJSValue(context, name);
-}
-
-static JSValueRef Cycript_gc_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
-    JSGarbageCollect(context);
-    return CYJSUndefined(context);
-}
-
-const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception) { CYTry {
-    switch (JSType type = JSValueGetType(context, value)) {
-        case kJSTypeUndefined:
-            return "undefined";
-        case kJSTypeNull:
-            return "null";
-        case kJSTypeBoolean:
-            return CYCastBool(context, value) ? "true" : "false";
-
-        case kJSTypeNumber: {
-            std::ostringstream str;
-            CYNumerify(str, CYCastDouble(context, value));
-            std::string value(str.str());
-            return apr_pstrmemdup(pool, value.c_str(), value.size());
-        } break;
-
-        case kJSTypeString: {
-            std::ostringstream str;
-            CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, value)));
-            CYStringify(str, string.data, string.size);
-            std::string value(str.str());
-            return apr_pstrmemdup(pool, value.c_str(), value.size());
-        } break;
-
-        case kJSTypeObject:
-            return CYPoolCCYON(pool, context, (JSObjectRef) value);
-        default:
-            throw CYJSError(context, "JSValueGetType() == 0x%x", type);
-    }
-} CYCatch }
-
-const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    JSValueRef exception(NULL);
-    const char *cyon(CYPoolCCYON(pool, context, value, &exception));
-    CYThrow(context, exception);
-    return cyon;
-}
+extern "C" void CydgetPoolParse(apr_pool_t *pool, const uint16_t **data, size_t *size) {
+    CYDriver driver("");
+    cy::parser parser(driver);

 
 

-const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
-    JSValueRef toCYON(CYGetProperty(context, object, toCYON_));
-    if (CYIsCallable(context, toCYON)) {
-        JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toCYON, object, 0, NULL));
-        return CYPoolCString(pool, context, value);
-    }
-
-    JSValueRef toJSON(CYGetProperty(context, object, toJSON_));
-    if (CYIsCallable(context, toJSON)) {
-        JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))};
-        JSValueRef exception(NULL);
-        const char *cyon(CYPoolCCYON(pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments), &exception));
-        CYThrow(context, exception);
-        return cyon;
-    }
-
-    std::ostringstream str;
-
-    str << '{';
-
-    // XXX: this is, sadly, going to leak
-    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object));
-
-    bool comma(false);
-
-    for (size_t index(0), count(JSPropertyNameArrayGetCount(names)); index != count; ++index) {
-        JSStringRef name(JSPropertyNameArrayGetNameAtIndex(names, index));
-        JSValueRef value(CYGetProperty(context, object, name));
-
-        if (comma)
-            str << ',';
-        else
-            comma = true;
-
-        CYUTF8String string(CYPoolUTF8String(pool, context, name));
-        if (CYIsKey(string))
-            str << string.data;
-        else
-            CYStringify(str, string.data, string.size);
-
-        str << ':' << CYPoolCCYON(pool, context, value);
-    }
-
-    str << '}';
-
-    JSPropertyNameArrayRelease(names);
-
-    std::string string(str.str());
-    return apr_pstrmemdup(pool, string.c_str(), string.size());
-}
-
-static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    CYPool pool;
-    std::ostringstream str;
-
-    str << '[';
-
-    JSValueRef length(CYGetProperty(context, _this, length_));
-    bool comma(false);
-
-    for (size_t index(0), count(CYCastDouble(context, length)); index != count; ++index) {
-        JSValueRef value(CYGetProperty(context, _this, index));
-
-        if (comma)
-            str << ',';
-        else
-            comma = true;
-
-        if (!JSValueIsUndefined(context, value))
-            str << CYPoolCCYON(pool, context, value);
-        else {
-            str << ',';
-            comma = false;
-        }
-    }
+    CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size)));

 
 

-    str << ']';
+    driver.data_ = utf8.data;
+    driver.size_ = utf8.size;

 
 

-    std::string value(str.str());
-    return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
-} CYCatch }
-
-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
-    Pointer *internal(new Pointer(pointer, context, owner, type));
-    return JSObjectMake(context, Pointer_, internal);
-}
-
-static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) {
-    cy::Functor *internal(new cy::Functor(type, function));
-    return JSObjectMake(context, Functor_, internal);
-}
-
-static bool CYGetOffset(apr_pool_t *pool, JSContextRef context, JSStringRef value, ssize_t &index) {
-    return CYGetOffset(CYPoolCString(pool, context, value), index);
-}
-
-void *CYCastPointer_(JSContextRef context, JSValueRef value) {
-    switch (JSValueGetType(context, value)) {
-        case kJSTypeNull:
-            return NULL;
-        /*case kJSTypeObject:
-            if (JSValueIsObjectOfClass(context, value, Pointer_)) {
-                Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate((JSObjectRef) value)));
-                return internal->value_;
-            }*/
-        default:
-            double number(CYCastDouble(context, value));
-            if (std::isnan(number))
-                throw CYJSError(context, "cannot convert value to pointer");
-            return reinterpret_cast<void *>(static_cast<uintptr_t>(static_cast<long long>(number)));
-    }
-}
-
-void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) {
-    switch (type->primitive) {
-        case sig::boolean_P:
-            *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
-        break;
-
-#define CYPoolFFI_(primitive, native) \
-        case sig::primitive ## _P: \
-            *reinterpret_cast<native *>(data) = CYCastDouble(context, value); \
-        break;
-
-        CYPoolFFI_(uchar, unsigned char)
-        CYPoolFFI_(char, char)
-        CYPoolFFI_(ushort, unsigned short)
-        CYPoolFFI_(short, short)
-        CYPoolFFI_(ulong, unsigned long)
-        CYPoolFFI_(long, long)
-        CYPoolFFI_(uint, unsigned int)
-        CYPoolFFI_(int, int)
-        CYPoolFFI_(ulonglong, unsigned long long)
-        CYPoolFFI_(longlong, long long)
-        CYPoolFFI_(float, float)
-        CYPoolFFI_(double, double)
-
-        case sig::pointer_P:
-            *reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value);
-        break;
-
-        case sig::string_P:
-            *reinterpret_cast<const char **>(data) = CYPoolCString(pool, context, value);
-        break;
-
-        case sig::struct_P: {
-            uint8_t *base(reinterpret_cast<uint8_t *>(data));
-            JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
-            for (size_t index(0); index != type->data.signature.count; ++index) {
-                sig::Element *element(&type->data.signature.elements[index]);
-                ffi_type *field(ffi->elements[index]);
-
-                JSValueRef rhs;
-                if (aggregate == NULL)
-                    rhs = value;
-                else {
-                    rhs = CYGetProperty(context, aggregate, index);
-                    if (JSValueIsUndefined(context, rhs)) {
-                        if (element->name != NULL)
-                            rhs = CYGetProperty(context, aggregate, CYJSString(element->name));
-                        else
-                            goto undefined;
-                        if (JSValueIsUndefined(context, rhs)) undefined:
-                            throw CYJSError(context, "unable to extract structure value");
-                    }
-                }
-
-                CYPoolFFI(pool, context, element->type, field, base, rhs);
-                // XXX: alignment?
-                base += field->size;
-            }
-        } break;
-
-        case sig::void_P:
-        break;
-
-        default:
-            if (hooks_ != NULL && hooks_->PoolFFI != NULL)
-                if ((*hooks_->PoolFFI)(pool, context, type, ffi, data, value))
-                    return;
-
-            fprintf(stderr, "CYPoolFFI(%c)\n", type->primitive);
-            _assert(false);
-    }
-}
-
-JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) {
-    switch (type->primitive) {
-        case sig::boolean_P:
-            return CYCastJSValue(context, *reinterpret_cast<bool *>(data));
-
-#define CYFromFFI_(primitive, native) \
-        case sig::primitive ## _P: \
-            return CYCastJSValue(context, *reinterpret_cast<native *>(data)); \
-
-        CYFromFFI_(uchar, unsigned char)
-        CYFromFFI_(char, char)
-        CYFromFFI_(ushort, unsigned short)
-        CYFromFFI_(short, short)
-        CYFromFFI_(ulong, unsigned long)
-        CYFromFFI_(long, long)
-        CYFromFFI_(uint, unsigned int)
-        CYFromFFI_(int, int)
-        CYFromFFI_(ulonglong, unsigned long long)
-        CYFromFFI_(longlong, long long)
-        CYFromFFI_(float, float)
-        CYFromFFI_(double, double)
-
-        case sig::pointer_P:
-            if (void *pointer = *reinterpret_cast<void **>(data))
-                return CYMakePointer(context, pointer, type->data.data.type, ffi, owner);
-            else goto null;
-
-        case sig::string_P:
-            if (char *utf8 = *reinterpret_cast<char **>(data))
-                return CYCastJSValue(context, utf8);
-            else goto null;
-
-        case sig::struct_P:
-            return CYMakeStruct(context, data, type, ffi, owner);
-        case sig::void_P:
-            return CYJSUndefined(context);
-
-        null:
-            return CYJSNull(context);
-        default:
-            if (hooks_ != NULL && hooks_->FromFFI != NULL)
-                if (JSValueRef value = (*hooks_->FromFFI)(context, type, ffi, data, initialize, owner))
-                    return value;
-
-            fprintf(stderr, "CYFromFFI(%c)\n", type->primitive);
-            _assert(false);
-    }
-}
-
-static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
-    Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
-
-    JSContextRef context(internal->context_);
-
-    size_t count(internal->cif_.nargs);
-    JSValueRef values[count];
-
-    for (size_t index(0); index != count; ++index)
-        values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]);
-
-    JSValueRef value(CYCallAsFunction(context, internal->function_, NULL, count, values));
-    CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
-}
-
-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) {
-    // XXX: in case of exceptions this will leak
-    // XXX: in point of fact, this may /need/ to leak :(
-    Closure_privateData *internal(new Closure_privateData(CYGetJSContext(), function, type));
-
-    ffi_closure *closure((ffi_closure *) _syscall(mmap(
-        NULL, sizeof(ffi_closure),
-        PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,
-        -1, 0
-    )));
-
-    ffi_status status(ffi_prep_closure(closure, &internal->cif_, callback, internal));
-    _assert(status == FFI_OK);
-
-    _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
-
-    internal->value_ = closure;
-
-    return internal;
-}
-
-static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const char *type) {
-    Closure_privateData *internal(CYMakeFunctor_(context, function, type, &FunctionClosure_));
-    return JSObjectMake(context, Functor_, internal);
-}
-
-static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const char *type) {
-    JSValueRef exception(NULL);
-    bool function(JSValueIsInstanceOfConstructor(context, value, Function_, &exception));
-    CYThrow(context, exception);
-
-    if (function) {
-        JSObjectRef function(CYCastJSObject(context, value));
-        return CYMakeFunctor(context, function, type);
-    } else {
-        void (*function)()(CYCastPointer<void (*)()>(context, value));
-        return CYMakeFunctor(context, function, type);
-    }
-}
-
-static bool Index_(apr_pool_t *pool, JSContextRef context, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {
-    Type_privateData *typical(internal->type_);
-    sig::Type *type(typical->type_);
-    if (type == NULL)
-        return false;
-
-    const char *name(CYPoolCString(pool, context, property));
-    size_t length(strlen(name));
-    double number(CYCastDouble(name, length));
-
-    size_t count(type->data.signature.count);
-
-    if (std::isnan(number)) {
-        if (property == NULL)
-            return false;
-
-        sig::Element *elements(type->data.signature.elements);
-
-        for (size_t local(0); local != count; ++local) {
-            sig::Element *element(&elements[local]);
-            if (element->name != NULL && strcmp(name, element->name) == 0) {
-                index = local;
-                goto base;
-            }
-        }
-
-        return false;
-    } else {
-        index = static_cast<ssize_t>(number);
-        if (index != number || index < 0 || static_cast<size_t>(index) >= count)
-            return false;
-    }
-
-  base:
-    ffi_type **elements(typical->GetFFI()->elements);
-
-    base = reinterpret_cast<uint8_t *>(internal->value_);
-    for (ssize_t local(0); local != index; ++local)
-        base += elements[local]->size;
-
-    return true;
-}
-
-static JSValueRef Pointer_getIndex(JSContextRef context, JSObjectRef object, size_t index, JSValueRef *exception) { CYTry {
-    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
-    Type_privateData *typical(internal->type_);
-
-    ffi_type *ffi(typical->GetFFI());
-
-    uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
-    base += ffi->size * index;
-
-    JSObjectRef owner(internal->GetOwner() ?: object);
-    return CYFromFFI(context, typical->type_, ffi, base, false, owner);
-} CYCatch }
-
-static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
-    CYPool pool;
-    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
-    Type_privateData *typical(internal->type_);
-
-    if (typical->type_ == NULL)
-        return NULL;
-
-    ssize_t offset;
-    if (!CYGetOffset(pool, context, property, offset))
-        return NULL;
-
-    return Pointer_getIndex(context, object, offset, exception);
-}
-
-static JSValueRef Pointer_getProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
-    return Pointer_getIndex(context, object, 0, exception);
-}
-
-static bool Pointer_setIndex(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value, JSValueRef *exception) { CYTry {
-    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
-    Type_privateData *typical(internal->type_);
-
-    ffi_type *ffi(typical->GetFFI());
-
-    uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
-    base += ffi->size * index;
-
-    CYPoolFFI(NULL, context, typical->type_, ffi, base, value);
-    return true;
-} CYCatch }
-
-static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
-    CYPool pool;
-    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
-    Type_privateData *typical(internal->type_);
-
-    if (typical->type_ == NULL)
-        return NULL;
-
-    ssize_t offset;
-    if (!CYGetOffset(pool, context, property, offset))
-        return NULL;
-
-    return Pointer_setIndex(context, object, offset, value, exception);
-}
-
-static bool Pointer_setProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
-    return Pointer_setIndex(context, object, 0, value, exception);
-}
-
-static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
-    Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(_this)));
-    Type_privateData *typical(internal->type_);
-    return CYMakePointer(context, internal->value_, typical->type_, typical->ffi_, _this);
-}
-
-static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYPool pool;
-    Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
-    Type_privateData *typical(internal->type_);
-
-    ssize_t index;
-    uint8_t *base;
-
-    if (!Index_(pool, context, internal, property, index, base))
-        return NULL;
-
-    JSObjectRef owner(internal->GetOwner() ?: object);
-
-    return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner);
-} CYCatch }
-
-static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
-    CYPool pool;
-    Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
-    Type_privateData *typical(internal->type_);
-
-    ssize_t index;
-    uint8_t *base;
-
-    if (!Index_(pool, context, internal, property, index, base))
-        return false;
-
-    CYPoolFFI(NULL, context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, value);
-    return true;
-} CYCatch }
-
-static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
-    Type_privateData *typical(internal->type_);
-    sig::Type *type(typical->type_);
-
-    if (type == NULL)
+    if (parser.parse() != 0 || !driver.errors_.empty())

         return;
 
         return;
 

-    size_t count(type->data.signature.count);
-    sig::Element *elements(type->data.signature.elements);
-
-    char number[32];
-
-    for (size_t index(0); index != count; ++index) {
-        const char *name;
-        name = elements[index].name;
-
-        if (name == NULL) {
-            sprintf(number, "%lu", index);
-            name = number;
-        }
-
-        JSPropertyNameAccumulatorAddName(names, CYJSString(name));
-    }
-}
-
-JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) { CYTry {
-    if (setups + count != signature->count - 1)
-        throw CYJSError(context, "incorrect number of arguments to ffi function");
-
-    size_t size(setups + count);
-    void *values[size];
-    memcpy(values, setup, sizeof(void *) * setups);
-
-    for (size_t index(setups); index != size; ++index) {
-        sig::Element *element(&signature->elements[index + 1]);
-        ffi_type *ffi(cif->arg_types[index]);
-        // XXX: alignment?
-        values[index] = new(pool) uint8_t[ffi->size];
-        CYPoolFFI(pool, context, element->type, ffi, values[index], arguments[index - setups]);
-    }
-
-    uint8_t value[cif->rtype->size];
-
-    if (hooks_ != NULL && hooks_->CallFunction != NULL)
-        (*hooks_->CallFunction)(context, cif, function, value, values);
-    else
-        ffi_call(cif, function, value, values);
-
-    return CYFromFFI(context, signature->elements[0].type, cif->rtype, value, initialize);
-} CYCatch }
-
-static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
-    CYPool pool;
-    cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
-    return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
-}
-
-static JSObjectRef CYMakeType(JSContextRef context, const char *type) {
-    Type_privateData *internal(new Type_privateData(NULL, type));
-    return JSObjectMake(context, Type_privateData::Class_, internal);
-}
-
-static JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) {
-    Type_privateData *internal(new Type_privateData(type));
-    return JSObjectMake(context, Type_privateData::Class_, internal);
-}
-
-static void *CYCastSymbol(const char *name) {
-    return dlsym(RTLD_DEFAULT, name);
-}
-
-static JSValueRef Runtime_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    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);
-    }
-
-    _sqlcall(sqlite3_finalize(statement));
-
-    switch (mode) {
-        default:
-            _assert(false);
-        case -1:
-            return NULL;
-
-        case 0:
-            return JSEvaluateScript(CYGetJSContext(), CYJSString(value), NULL, NULL, 0, NULL);
-        case 1:
-            return CYMakeFunctor(context, reinterpret_cast<void (*)()>(CYCastSymbol(name.data)), value);
-
-        case 2: {
-            // 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, CYCastSymbol(name.data));
-        }
-
-        // XXX: implement case 3
-        case 4:
-            return CYMakeType(context, value);
-    }
-} CYCatch }
-
-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");
-
-    CYPool pool;
-
-    void *value(CYCastPointer<void *>(context, arguments[0]));
-    const char *type(CYPoolCString(pool, context, arguments[1]));
-
-    sig::Signature signature;
-    sig::Parse(pool, &signature, type, &Structor_);
-
-    return CYMakePointer(context, value, signature.elements[0].type, NULL, NULL);
-} CYCatch }
-
-static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count != 1)
-        throw CYJSError(context, "incorrect number of arguments to Type constructor");
-    CYPool pool;
-    const char *type(CYPoolCString(pool, context, arguments[0]));
-    return CYMakeType(context, type);
-} CYCatch }
-
-static JSValueRef Type_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
-
-    sig::Type type;
-
-    if (JSStringIsEqualToUTF8CString(property, "$cyi")) {
-        type.primitive = sig::pointer_P;
-        type.data.data.size = 0;
-    } else {
-        CYPool pool;
-        size_t index(CYGetIndex(pool, context, property));
-        if (index == _not(size_t))
-            return NULL;
-        type.primitive = sig::array_P;
-        type.data.data.size = index;
-    }
-
-    type.name = NULL;
-    type.flags = 0;
-
-    type.data.data.type = internal->type_;
-
-    return CYMakeType(context, &type);
-} CYCatch }
-
-static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
-
-    if (count != 1)
-        throw CYJSError(context, "incorrect number of arguments to type cast function");
-    sig::Type *type(internal->type_);
-    ffi_type *ffi(internal->GetFFI());
-    // XXX: alignment?
-    uint8_t value[ffi->size];
-    CYPool pool;
-    CYPoolFFI(pool, context, type, ffi, value, arguments[0]);
-    return CYFromFFI(context, type, ffi, value);
-} CYCatch }
-
-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");
-    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
-
-    sig::Type *type(internal->type_);
-    size_t size;
-
-    if (type->primitive != sig::array_P)
-        size = 0;
-    else {
-        size = type->data.data.size;
-        type = type->data.data.type;
-    }
-
-    void *value(malloc(internal->GetFFI()->size));
-    return CYMakePointer(context, value, type, NULL, NULL);
-} CYCatch }
-
-static JSObjectRef Functor_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");
-    CYPool pool;
-    const char *type(CYPoolCString(pool, context, arguments[1]));
-    return CYMakeFunctor(context, arguments[0], type);
-} CYCatch }
-
-static JSValueRef CYValue_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
-    return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
-} CYCatch }
-
-static JSValueRef CYValue_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
-    return CYValue_callAsFunction_valueOf(context, object, _this, count, arguments, exception);
-}
-
-static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
-    char string[32];
-    sprintf(string, "%p", internal->value_);
-
-    return CYCastJSValue(context, string);
-} CYCatch }
-
-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;
-    const char *type(sig::Unparse(pool, internal->type_));
-    return CYCastJSValue(context, CYJSString(type));
-} CYCatch }
-
-static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-    CYPool pool;
-    const char *type(sig::Unparse(pool, internal->type_));
-    size_t size(strlen(type));
-    char *cyon(new(pool) char[12 + size + 1]);
-    memcpy(cyon, "new Type(\"", 10);
-    cyon[12 + size] = '\0';
-    cyon[12 + size - 2] = '"';
-    cyon[12 + size - 1] = ')';
-    memcpy(cyon + 10, type, size);
-    return CYCastJSValue(context, CYJSString(cyon));
-} CYCatch }
-
-static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
-    return Type_callAsFunction_toString(context, object, _this, count, arguments, exception);
-}
-
-static JSStaticValue Pointer_staticValues[2] = {
-    {"$cyi", &Pointer_getProperty_$cyi, &Pointer_setProperty_$cyi, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {NULL, NULL, NULL, 0}
-};
-
-static JSStaticFunction Pointer_staticFunctions[4] = {
-    {"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {NULL, NULL, 0}
-};
-
-static JSStaticFunction Struct_staticFunctions[2] = {
-    {"$cya", &Struct_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {NULL, NULL, 0}
-};
-
-static JSStaticFunction Functor_staticFunctions[4] = {
-    {"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {NULL, NULL, 0}
-};
-
-namespace cy {
-    JSStaticFunction const * const Functor::StaticFunctions = Functor_staticFunctions;
-}
-
-static JSStaticFunction Type_staticFunctions[4] = {
-    {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {"toJSON", &Type_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {"toString", &Type_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {NULL, NULL, 0}
-};
-
-static JSObjectRef (*$JSObjectMakeArray)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
-
-void CYSetArgs(int argc, const char *argv[]) {
-    JSContextRef context(CYGetJSContext());
-    JSValueRef args[argc];
-    for (int i(0); i != argc; ++i)
-        args[i] = CYCastJSValue(context, argv[i]);
-
-    JSObjectRef array;
-    if ($JSObjectMakeArray != NULL) {
-        JSValueRef exception(NULL);
-        array = (*$JSObjectMakeArray)(context, argc, args, &exception);
-        CYThrow(context, exception);
-    } else {
-        JSValueRef value(CYCallAsFunction(context, Array_, NULL, argc, args));
-        array = CYCastJSObject(context, value);
-    }
-
-    CYSetProperty(context, System_, CYJSString("args"), array);
-}
-
-JSObjectRef CYGetGlobalObject(JSContextRef context) {
-    return JSContextGetGlobalObject(context);
-}
-
-const char *CYExecute(apr_pool_t *pool, const char *code) {
-    JSContextRef context(CYGetJSContext());
-    JSValueRef exception(NULL), result;
-
-    void *handle;
-    if (hooks_ != NULL && hooks_->ExecuteStart != NULL)
-        handle = (*hooks_->ExecuteStart)(context);
-    else
-        handle = NULL;
-
-    const char *json;
-
-    try {
-        result = JSEvaluateScript(context, CYJSString(code), NULL, NULL, 0, &exception);
-    } catch (const char *error) {
-        return error;
-    }
-
-    if (exception != NULL) { error:
-        result = exception;
-        exception = NULL;
-    }
-
-    if (JSValueIsUndefined(context, result))
-        return NULL;
-
-    try {
-        json = CYPoolCCYON(pool, context, result, &exception);
-    } catch (const char *error) {
-        return error;
-    }
-
-    if (exception != NULL)
-        goto error;
+    CYOptions options;
+    CYContext context(driver.pool_, options);
+    driver.program_->Replace(context);
+    std::ostringstream str;
+    CYOutput out(str, options);
+    out << *driver.program_;
+    std::string code(str.str());

 
 

-    CYSetProperty(context, CYGetGlobalObject(context), Result_, result);
+    CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size())));

 
 

-    if (hooks_ != NULL && hooks_->ExecuteEnd != NULL)
-        (*hooks_->ExecuteEnd)(context, handle);
-    return json;
+    *data = utf16.data;
+    *size = utf16.size;

 }
 
 static apr_pool_t *Pool_;
 
 static bool initialized_;
 
 }
 
 static apr_pool_t *Pool_;
 
 static bool initialized_;
 

-void CYInitialize() {
+void CYInitializeStatic() {

     if (!initialized_)
         initialized_ = true;
     else return;
 
     _aprcall(apr_initialize());
     _aprcall(apr_pool_create(&Pool_, NULL));
     if (!initialized_)
         initialized_ = true;
     else return;
 
     _aprcall(apr_initialize());
     _aprcall(apr_pool_create(&Pool_, NULL));

-    _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));
-
-    $JSObjectMakeArray = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));

 }
 
 apr_pool_t *CYGetGlobalPool() {
 }
 
 apr_pool_t *CYGetGlobalPool() {

-    CYInitialize();
+    CYInitializeStatic();

     return Pool_;
 }
 
     return Pool_;
 }
 

-void CYThrow(JSContextRef context, JSValueRef value) {
-    if (value != NULL)
-        throw CYJSError(context, value);
-}
-
-const char *CYJSError::PoolCString(apr_pool_t *pool) const {
-    return CYPoolCString(pool, context_, value_);
-}
-
-JSValueRef CYJSError::CastJSValue(JSContextRef context) const {
-    // XXX: what if the context is different?
-    return value_;
-}
-

 void CYThrow(const char *format, ...) {
     va_list args;
 void CYThrow(const char *format, ...) {
     va_list args;

-    va_start (args, format);
+    va_start(args, format);

     throw CYPoolError(format, args);
     // XXX: does this matter? :(
     throw CYPoolError(format, args);
     // XXX: does this matter? :(

-    va_end (args);
+    va_end(args);

 }
 
 const char *CYPoolError::PoolCString(apr_pool_t *pool) const {
 }
 
 const char *CYPoolError::PoolCString(apr_pool_t *pool) const {


@@ -1418,162 +298,11 @@ const char *CYPoolError::PoolCString(apr_pool_t *pool) const {
 
 CYPoolError::CYPoolError(const char *format, ...) {
     va_list args;
 
 CYPoolError::CYPoolError(const char *format, ...) {
     va_list args;

-    va_start (args, format);
+    va_start(args, format);

     message_ = apr_pvsprintf(pool_, format, args);
     message_ = apr_pvsprintf(pool_, format, args);

-    va_end (args);
+    va_end(args);

 }
 
 CYPoolError::CYPoolError(const char *format, va_list args) {
     message_ = apr_pvsprintf(pool_, format, args);
 }
 }
 
 CYPoolError::CYPoolError(const char *format, va_list args) {
     message_ = apr_pvsprintf(pool_, format, args);
 }

-
-JSValueRef CYPoolError::CastJSValue(JSContextRef context) const {
-    return CYCastJSValue(context, message_);
-}
-
-CYJSError::CYJSError(JSContextRef context, const char *format, ...) {
-    if (context == NULL)
-        context = CYGetJSContext();
-
-    CYPool pool;
-
-    va_list args;
-    va_start (args, format);
-    const char *message(apr_pvsprintf(pool, format, args));
-    va_end (args);
-
-    JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(message))};
-
-    JSValueRef exception(NULL);
-    value_ = JSObjectCallAsConstructor(context, Error_, 1, arguments, &exception);
-    CYThrow(context, exception);
-}
-
-void CYObjectiveC(JSContextRef context, JSObjectRef global);
-
-JSGlobalContextRef CYGetJSContext() {
-    CYInitialize();
-
-    if (Context_ == NULL) {
-        JSClassDefinition definition;
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Functor";
-        definition.staticFunctions = cy::Functor::StaticFunctions;
-        definition.callAsFunction = &Functor_callAsFunction;
-        definition.finalize = &CYFinalize;
-        Functor_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Pointer";
-        definition.staticValues = Pointer_staticValues;
-        definition.staticFunctions = Pointer_staticFunctions;
-        definition.getProperty = &Pointer_getProperty;
-        definition.setProperty = &Pointer_setProperty;
-        definition.finalize = &CYFinalize;
-        Pointer_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Struct";
-        definition.staticFunctions = Struct_staticFunctions;
-        definition.getProperty = &Struct_getProperty;
-        definition.setProperty = &Struct_setProperty;
-        definition.getPropertyNames = &Struct_getPropertyNames;
-        definition.finalize = &CYFinalize;
-        Struct_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Type";
-        definition.staticFunctions = Type_staticFunctions;
-        definition.getProperty = &Type_getProperty;
-        definition.callAsFunction = &Type_callAsFunction;
-        definition.callAsConstructor = &Type_callAsConstructor;
-        definition.finalize = &CYFinalize;
-        Type_privateData::Class_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Runtime";
-        definition.getProperty = &Runtime_getProperty;
-        Runtime_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        //definition.getProperty = &Global_getProperty;
-        JSClassRef Global(JSClassCreate(&definition));
-
-        JSGlobalContextRef context(JSGlobalContextCreate(Global));
-        Context_ = context;
-        JSObjectRef global(CYGetGlobalObject(context));
-
-        JSObjectSetPrototype(context, global, JSObjectMake(context, Runtime_, NULL));
-
-        Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
-        JSValueProtect(context, Array_);
-
-        Error_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Error")));
-        JSValueProtect(context, Error_);
-
-        Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));
-        JSValueProtect(context, Function_);
-
-        String_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String")));
-        JSValueProtect(context, String_);
-
-        length_ = JSStringCreateWithUTF8CString("length");
-        message_ = JSStringCreateWithUTF8CString("message");
-        name_ = JSStringCreateWithUTF8CString("name");
-        prototype_ = JSStringCreateWithUTF8CString("prototype");
-        toCYON_ = JSStringCreateWithUTF8CString("toCYON");
-        toJSON_ = JSStringCreateWithUTF8CString("toJSON");
-
-        JSObjectRef Object(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Object"))));
-        Object_prototype_ = CYCastJSObject(context, CYGetProperty(context, Object, prototype_));
-        JSValueProtect(context, Object_prototype_);
-
-        Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_));
-        Array_pop_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("pop")));
-        Array_push_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("push")));
-        Array_splice_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("splice")));
-
-        CYSetProperty(context, Array_prototype_, toCYON_, JSObjectMakeFunctionWithCallback(context, toCYON_, &Array_callAsFunction_toCYON), kJSPropertyAttributeDontEnum);
-
-        JSValueProtect(context, Array_prototype_);
-        JSValueProtect(context, Array_pop_);
-        JSValueProtect(context, Array_push_);
-        JSValueProtect(context, Array_splice_);
-
-        JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
-
-        Function_prototype_ = (JSObjectRef) CYGetProperty(context, Function_, prototype_);
-        JSValueProtect(context, Function_prototype_);
-
-        JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_), Function_prototype_);
-
-        CYSetProperty(context, global, CYJSString("Functor"), Functor);
-        CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
-        CYSetProperty(context, global, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));
-
-        JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
-        CYSetProperty(context, global, CYJSString("Cycript"), cycript);
-        CYSetProperty(context, cycript, CYJSString("gc"), JSObjectMakeFunctionWithCallback(context, CYJSString("gc"), &Cycript_gc_callAsFunction));
-
-        CYSetProperty(context, global, CYJSString("$cyq"), JSObjectMakeFunctionWithCallback(context, CYJSString("$cyq"), &$cyq));
-
-        System_ = JSObjectMake(context, NULL, NULL);
-        JSValueProtect(context, System_);
-
-        CYSetProperty(context, global, CYJSString("system"), System_);
-        CYSetProperty(context, System_, CYJSString("args"), CYJSNull(context));
-        //CYSetProperty(context, System_, CYJSString("global"), global);
-
-        CYSetProperty(context, System_, CYJSString("print"), JSObjectMakeFunctionWithCallback(context, CYJSString("print"), &System_print));
-
-        Result_ = JSStringCreateWithUTF8CString("_");
-
-// XXX: this is very wrong and sad
-#ifdef __APPLE__
-        CYObjectiveC(context, global);
-#endif
-    }
-
-    return Context_;
-}