X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c15969fd0a6280c60d2f35876b5343004fed2b11..fb486b846b9e31c15344c3bd6314b8fdd54aad0b:/Library.cpp?ds=inline diff --git a/Library.cpp b/Library.cpp index 0db5f42..74df502 100644 --- a/Library.cpp +++ b/Library.cpp @@ -20,7 +20,6 @@ /* }}} */ #include -#include #include "cycript.hpp" @@ -29,78 +28,47 @@ #include #include -#include #include #include #include #include #include -#include "Parser.hpp" -#include "Cycript.tab.hh" - #include "Error.hpp" -#include "String.hpp" #include "Execute.hpp" -#include "JavaScript.hpp" - -/* C Strings {{{ */ -template -_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(inbuf), inbytesleft, outbuf, outbytesleft); -} - -#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); +#include "Parser.hpp" +#include "String.hpp" - const char *in(reinterpret_cast(utf16.data)); +#include "Cycript.tab.hh" +#include "Driver.hpp" - iconv_t conversion(_syscall(iconv_open("UTF-8", UCS_2_INTERNAL))); +#include "ConvertUTF.h" +/* C Strings {{{ */ +CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16) { // XXX: this is wrong size_t size(utf16.size * 5); - char *out(new(pool) char[size]); - CYUTF8String utf8(out, size); - - size = utf16.size * 2; - _syscall(iconv_(&iconv, conversion, const_cast(&in), &size, &out, &utf8.size)); - - *out = '\0'; - utf8.size = out - utf8.data; + char *temp(new(pool) char[size]); - _syscall(iconv_close(conversion)); + const uint16_t *lhs(utf16.data); + uint8_t *rhs(reinterpret_cast(temp)); + _assert(ConvertUTF16toUTF8(&lhs, lhs + utf16.size, &rhs, rhs + size, lenientConversion) == conversionOK); - return utf8; + *rhs = 0; + return CYUTF8String(temp, reinterpret_cast(rhs) - temp); } -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"))); - +CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8) { // 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(temp)); - - size = utf8.size; - _syscall(iconv_(&iconv, conversion, const_cast(&in), &size, &out, &utf16.size)); - utf16.size = reinterpret_cast(out) - utf16.data; - temp[utf16.size] = 0; + const uint8_t *lhs(reinterpret_cast(utf8.data)); + uint16_t *rhs(temp); + _assert(ConvertUTF8toUTF16(&lhs, lhs + utf8.size, &rhs, rhs + size, lenientConversion) == conversionOK); - _syscall(iconv_close(conversion)); - - return utf16; + *rhs = 0; + return CYUTF16String(temp, rhs - temp); } /* }}} */ /* Index Offsets {{{ */ @@ -223,67 +191,28 @@ double CYCastDouble(const char *value) { return CYCastDouble(value, strlen(value)); } -size_t CYArrayLength(JSContextRef context, JSObjectRef array) { - return CYCastDouble(context, CYGetProperty(context, array, length_s)); -} - -JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index) { - JSValueRef exception(NULL); - JSValueRef value(JSObjectGetPropertyAtIndex(context, array, index, &exception)); - CYThrow(context, exception); - return value; -} - -void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) { - JSValueRef exception(NULL); - JSValueRef arguments[1]; - arguments[0] = value; - JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); - JSObjectCallAsFunction(context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments, &exception); - CYThrow(context, exception); -} - -extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_t *size) { +CYUTF8String CYPoolCode(CYPool &pool, CYUTF8String code) { CYLocalPool local; - - CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size))); - CYStream stream(utf8.data, utf8.data + utf8.size); + CYStream stream(code.data, code.data + code.size); CYDriver driver(stream); cy::parser parser(driver); - if (parser.parse() != 0 || !driver.errors_.empty()) - return; + _assert(parser.parse() == 0); + _assert(driver.errors_.empty()); CYOptions options; CYContext context(options); driver.program_->Replace(context); + std::ostringstream str; CYOutput out(str, options); out << *driver.program_; - std::string code(str.str()); - - CYUTF16String utf16(CYPoolUTF16String(remote, CYUTF8String(code.c_str(), code.size()))); - - *data = utf16.data; - *size = utf16.size; + return $pool.strdup(str.str().c_str()); } -static apr_pool_t *Pool_; - -static bool initialized_; - -void CYInitializeStatic() { - if (!initialized_) - initialized_ = true; - else return; - - _aprcall(apr_initialize()); - _aprcall(apr_pool_create(&Pool_, NULL)); -} - -apr_pool_t *CYGetGlobalPool() { - CYInitializeStatic(); - return Pool_; +CYPool &CYGetGlobalPool() { + static CYPool pool; + return pool; } void CYThrow(const char *format, ...) { @@ -294,17 +223,24 @@ void CYThrow(const char *format, ...) { va_end(args); } -const char *CYPoolError::PoolCString(apr_pool_t *pool) const { - return apr_pstrdup(pool, message_); +const char *CYPoolError::PoolCString(CYPool &pool) const { + return pool.strdup(message_); +} + +CYPoolError::CYPoolError(const CYPoolError &rhs) : + message_(pool_.strdup(rhs.message_)) +{ } CYPoolError::CYPoolError(const char *format, ...) { va_list args; va_start(args, format); - message_ = apr_pvsprintf(pool_, format, args); + // XXX: there might be a beter way to think about this + message_ = pool_.vsprintf(64, format, args); va_end(args); } CYPoolError::CYPoolError(const char *format, va_list args) { - message_ = apr_pvsprintf(pool_, format, args); + // XXX: there might be a beter way to think about this + message_ = pool_.vsprintf(64, format, args); }