If I call ExecuteStart I /must/ call ExecuteEnd.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index 37e2b3c4cd6dd56786425788bb8c829b8e5bc375..c64268c36cd53e5a2bec6d154782a39c0cccd481 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -20,7 +20,6 @@
 /* }}} */
 
 #include <dlfcn.h>
-#include <iconv.h>
 
 #include "cycript.hpp"
 
@@ -29,78 +28,47 @@
 #include <sys/mman.h>
 
 #include <iostream>
-#include <ext/stdio_filebuf.h>
 #include <set>
 #include <map>
 #include <iomanip>
 #include <sstream>
 #include <cmath>
 
-#include "Parser.hpp"
-#include "Cycript.tab.hh"
-
 #include "Error.hpp"
-#include "String.hpp"
 #include "Execute.hpp"
-#include "JavaScript.hpp"
+#include "Parser.hpp"
+#include "String.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);
-}
+#include "Cycript.tab.hh"
+#include "Driver.hpp"
 
-#ifdef __GLIBC__
-#define UCS_2_INTERNAL "UCS-2"
-#else
-#define UCS_2_INTERNAL "UCS-2-INTERNAL"
-#endif
+#include "ConvertUTF.h"
 
+/* C Strings {{{ */
 CYUTF8String CYPoolUTF8String(CYPool &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)));
-
     // 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<char **>(&in), &size, &out, &utf8.size));
+    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);
 
-    *out = '\0';
-    utf8.size = out - utf8.data;
-
-    _syscall(iconv_close(conversion));
-
-    return utf8;
+    *rhs = 0;
+    return CYUTF8String(temp, reinterpret_cast<char *>(rhs) - temp);
 }
 
 CYUTF16String CYPoolUTF16String(CYPool &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));
-
-    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;
+    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);
 
-    _syscall(iconv_close(conversion));
-
-    return utf16;
+    *rhs = 0;
+    return CYUTF16String(temp, rhs - temp);
 }
 /* }}} */
 /* Index Offsets {{{ */
@@ -223,27 +191,7 @@ 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) {
+extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) {
     CYLocalPool local;
 
     CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size)));
@@ -262,25 +210,18 @@ extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_
     out << *driver.program_;
     std::string code(str.str());
 
-    CYPool pool(remote);
+    CYPool pool;
     CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size())));
 
-    *data = utf16.data;
-    *size = utf16.size;
-}
-
-static bool initialized_;
+    size_t bytes(utf16.size * sizeof(uint16_t));
+    uint16_t *copy(reinterpret_cast<uint16_t *>(malloc(bytes)));
+    memcpy(copy, utf16.data, bytes);
 
-void CYInitializeStatic() {
-    if (!initialized_)
-        initialized_ = true;
-    else return;
-
-    _aprcall(apr_initialize());
+    *data = copy;
+    *size = utf16.size;
 }
 
 CYPool &CYGetGlobalPool() {
-    CYInitializeStatic();
     static CYPool pool;
     return pool;
 }
@@ -297,13 +238,20 @@ 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_ = pool_.vsprintf(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_ = pool_.vsprintf(format, args);
+    // XXX: there might be a beter way to think about this
+    message_ = pool_.vsprintf(64, format, args);
 }