Also remove VERSION from libffi #define overlap.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index 8ff066accf35c74d1f704ba2371ba3d68766e81b..1259aeb1df22839516ddaf2f6d72940a136d9a59 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2010  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/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -42,6 +42,7 @@
 #include "Error.hpp"
 #include "String.hpp"
 #include "Execute.hpp"
 #include "Error.hpp"
 #include "String.hpp"
 #include "Execute.hpp"

+#include "JavaScript.hpp"

 
 /* C Strings {{{ */
 template <typename Type_>
 
 /* C Strings {{{ */
 template <typename Type_>


@@ -55,9 +56,7 @@ _finline size_t iconv_(size_t (*iconv)(iconv_t, Type_, size_t *, char **, size_t
 #define UCS_2_INTERNAL "UCS-2-INTERNAL"
 #endif
 
 #define UCS_2_INTERNAL "UCS-2-INTERNAL"
 #endif
 

-CYUTF8String CYPoolUTF8String(apr_pool_t *pool, CYUTF16String utf16) {
-    _assert(pool != NULL);
-
+CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16) {

     const char *in(reinterpret_cast<const char *>(utf16.data));
 
     iconv_t conversion(_syscall(iconv_open("UTF-8", UCS_2_INTERNAL)));
     const char *in(reinterpret_cast<const char *>(utf16.data));
 
     iconv_t conversion(_syscall(iconv_open("UTF-8", UCS_2_INTERNAL)));


@@ -78,9 +77,7 @@ CYUTF8String CYPoolUTF8String(apr_pool_t *pool, CYUTF16String utf16) {
     return utf8;
 }
 
     return utf8;
 }
 

-CYUTF16String CYPoolUTF16String(apr_pool_t *pool, CYUTF8String utf8) {
-    _assert(pool != NULL);
-
+CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8) {

     const char *in(utf8.data);
 
     iconv_t conversion(_syscall(iconv_open(UCS_2_INTERNAL, "UTF-8")));
     const char *in(utf8.data);
 
     iconv_t conversion(_syscall(iconv_open(UCS_2_INTERNAL, "UTF-8")));


@@ -222,17 +219,34 @@ double CYCastDouble(const char *value) {
     return CYCastDouble(value, strlen(value));
 }
 
     return CYCastDouble(value, strlen(value));
 }
 

-extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_t *size) {
-    CYLocalPool local;
+size_t CYArrayLength(JSContextRef context, JSObjectRef array) {
+    return CYCastDouble(context, CYGetProperty(context, array, length_s));
+}

 
 

-    CYDriver driver;
-    cy::parser parser(driver);
+JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index) {
+    JSValueRef exception(NULL);
+    JSValueRef value(JSObjectGetPropertyAtIndex(context, array, index, &exception));
+    CYThrow(context, exception);
+    return value;
+}

 
 

-    CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size)));
+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 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;
 
     if (parser.parse() != 0 || !driver.errors_.empty())
         return;
 


@@ -244,28 +258,20 @@ extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_
     out << *driver.program_;
     std::string code(str.str());
 
     out << *driver.program_;
     std::string code(str.str());
 

-    CYUTF16String utf16(CYPoolUTF16String(remote, CYUTF8String(code.c_str(), code.size())));
-
-    *data = utf16.data;
-    *size = utf16.size;
-}
-
-static apr_pool_t *Pool_;
-
-static bool initialized_;
+    CYPool pool;
+    CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size())));

 
 

-void CYInitializeStatic() {
-    if (!initialized_)
-        initialized_ = true;
-    else return;
+    size_t bytes(utf16.size * sizeof(uint16_t));
+    uint16_t *copy(reinterpret_cast<uint16_t *>(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, ...) {
 }
 
 void CYThrow(const char *format, ...) {


@@ -276,17 +282,24 @@ void CYThrow(const char *format, ...) {
     va_end(args);
 }
 
     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);
 }
 
 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) {
     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);

 }
 }