On Mac OS X, detect -framework JavaVM for CY_JAVA.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index 1f61c0ebe538491a78abe048406c12c1982463ea..575ccd57cec52c54971fcaaf9040b487d10f14ca 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */

 /*
 /*

- * 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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
  * 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 General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 


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

-#include "JavaScript.hpp"

 #include "Parser.hpp"
 #include "String.hpp"
 
 #include "Parser.hpp"
 #include "String.hpp"
 


@@ -45,6 +44,9 @@
 
 #include "ConvertUTF.h"
 
 
 #include "ConvertUTF.h"
 

+template <>
+::pthread_key_t CYLocal<CYPool>::key_ = Key_();
+

 /* C Strings {{{ */
 CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16) {
     // XXX: this is wrong
 /* C Strings {{{ */
 CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16) {
     // XXX: this is wrong


@@ -192,54 +194,22 @@ double CYCastDouble(const char *value) {
     return CYCastDouble(value, strlen(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 CydgetMemoryParse(const uint16_t **data, size_t *size) {
+CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {

     CYLocalPool local;
     CYLocalPool local;

-
-    CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size)));
-    CYStream stream(utf8.data, utf8.data + utf8.size);

     CYDriver driver(stream);
 
     cy::parser parser(driver);
     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);
 
     CYOptions options;
     CYContext context(options);
     driver.program_->Replace(context);

+

     std::ostringstream str;
     CYOutput out(str, options);
     out << *driver.program_;
     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())));
-
-    size_t bytes(utf16.size * sizeof(uint16_t));
-    uint16_t *copy(reinterpret_cast<uint16_t *>(malloc(bytes)));
-    memcpy(copy, utf16.data, bytes);
-
-    *data = copy;
-    *size = utf16.size;
+    return $pool.strdup(str.str().c_str());

 }
 
 CYPool &CYGetGlobalPool() {
 }
 
 CYPool &CYGetGlobalPool() {