X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/029bc65b46de676c6733fff684000c7363eda512..83646644cade2e27f9df70ca0d5e730c7c84b0ab:/Library.cpp diff --git a/Library.cpp b/Library.cpp index 610e11b..c64268c 100644 --- a/Library.cpp +++ b/Library.cpp @@ -1,123 +1,74 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU 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 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 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 General Public License + * along with Cycript. If not, see . +**/ /* }}} */ #include -#include #include "cycript.hpp" #include "Pooling.hpp" -#include "Context.hpp" #include #include -#include #include #include #include #include #include -#include "Parser.hpp" -#include "Cycript.tab.hh" - #include "Error.hpp" +#include "Execute.hpp" +#include "Parser.hpp" #include "String.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); - - 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); + char *temp(new(pool) char[size]); - size = utf16.size * 2; - _syscall(iconv_(&iconv, conversion, const_cast(&in), &size, &out, &utf8.size)); + const uint16_t *lhs(utf16.data); + uint8_t *rhs(reinterpret_cast(temp)); + _assert(ConvertUTF16toUTF8(&lhs, lhs + utf16.size, &rhs, rhs + size, lenientConversion) == conversionOK); - *out = '\0'; - utf8.size = out - utf8.data; - - _syscall(iconv_close(conversion)); - - 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; - _syscall(iconv_close(conversion)); + const uint8_t *lhs(reinterpret_cast(utf8.data)); + uint16_t *rhs(temp); + _assert(ConvertUTF8toUTF16(&lhs, lhs + utf8.size, &rhs, rhs + size, lenientConversion) == conversionOK); - return utf16; + *rhs = 0; + return CYUTF16String(temp, rhs - temp); } /* }}} */ /* Index Offsets {{{ */ @@ -240,48 +191,39 @@ double CYCastDouble(const char *value) { return CYCastDouble(value, strlen(value)); } -extern "C" void CydgetPoolParse(apr_pool_t *pool, const uint16_t **data, size_t *size) { - CYDriver driver(""); - cy::parser parser(driver); - - CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size))); +extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) { + CYLocalPool local; - driver.data_ = utf8.data; - driver.size_ = utf8.size; + CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size))); + CYStream stream(utf8.data, utf8.data + utf8.size); + CYDriver driver(stream); + cy::parser parser(driver); if (parser.parse() != 0 || !driver.errors_.empty()) return; CYOptions options; - CYContext context(driver.pool_, options); + CYContext context(options); driver.program_->Replace(context); std::ostringstream str; CYOutput out(str, options); out << *driver.program_; std::string code(str.str()); + CYPool pool; CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size()))); - *data = utf16.data; - *size = utf16.size; -} - -static apr_pool_t *Pool_; - -static bool initialized_; - -void CYInitializeStatic() { - if (!initialized_) - initialized_ = true; - else return; + size_t bytes(utf16.size * sizeof(uint16_t)); + uint16_t *copy(reinterpret_cast(malloc(bytes))); + memcpy(copy, utf16.data, bytes); - _aprcall(apr_initialize()); - _aprcall(apr_pool_create(&Pool_, NULL)); + *data = copy; + *size = utf16.size; } -apr_pool_t *CYGetGlobalPool() { - CYInitializeStatic(); - return Pool_; +CYPool &CYGetGlobalPool() { + static CYPool pool; + return pool; } void CYThrow(const char *format, ...) { @@ -292,17 +234,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); }