/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012 Jay Freeman (saurik)
+ * Copyright (C) 2009-2013 Jay Freeman (saurik)
*/
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
/*
- * 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.
+ * 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.
*
- * 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.
+ * 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.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with Cycript. If not, see <http://www.gnu.org/licenses/>.
**/
/* }}} */
#include <dlfcn.h>
-#include <iconv.h>
#include "cycript.hpp"
#include "Execute.hpp"
#include "JavaScript.hpp"
-/* 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);
-}
-
-#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<const char *>(utf16.data));
-
- 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<char **>(&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<uint8_t *>(temp));
+ _assert(ConvertUTF16toUTF8(&lhs, lhs + utf16.size, &rhs, rhs + size, lenientConversion) == conversionOK);
- return utf8;
+ *rhs = 0;
+ return CYUTF8String(temp, reinterpret_cast<char *>(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<char *>(temp));
-
- 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));
+ const uint8_t *lhs(reinterpret_cast<const uint8_t *>(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 {{{ */
CYThrow(context, exception);
}
-extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_t *size) {
+extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) {
CYLocalPool local;
CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size)));
out << *driver.program_;
std::string code(str.str());
- CYUTF16String utf16(CYPoolUTF16String(remote, CYUTF8String(code.c_str(), code.size())));
-
- *data = utf16.data;
- *size = utf16.size;
-}
+ CYPool pool;
+ CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size())));
-static apr_pool_t *Pool_;
+ size_t bytes(utf16.size * sizeof(uint16_t));
+ uint16_t *copy(reinterpret_cast<uint16_t *>(malloc(bytes)));
+ memcpy(copy, utf16.data, bytes);
-static bool initialized_;
-
-void CYInitializeStatic() {
- if (!initialized_)
- initialized_ = true;
- else return;
-
- _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, ...) {
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);
}
projects / cycript.git / blobdiff