X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/a2b8d7ada7c9b527d46e781a217292603379e9e0..341d1456832396678c21074a7ec2a07181e12f49:/Library.cpp?ds=sidebyside

diff --git a/Library.cpp b/Library.cpp
index 5be04f4..258ef61 100644
--- a/Library.cpp
+++ b/Library.cpp
@@ -1,21 +1,21 @@
 /* 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
- * 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/>.
 **/
 /* }}} */
 
@@ -44,6 +44,9 @@
 
 #include "ConvertUTF.h"
 
+template <>
+::pthread_key_t CYLocal<CYPool>::key_ = Key_();
+
 /* C Strings {{{ */
 CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16) {
     // XXX: this is wrong
@@ -117,7 +120,7 @@ void CYStringify(std::ostringstream &str, const char *data, size_t size) {
     str << (single ? '\'' : '"');
 
     for (const char *value(data), *end(data + size); value != end; ++value)
-        switch (*value) {
+        switch (uint8_t next = *value) {
             case '\\': str << "\\\\"; break;
             case '\b': str << "\\b"; break;
             case '\f': str << "\\f"; break;
@@ -138,12 +141,35 @@ void CYStringify(std::ostringstream &str, const char *data, size_t size) {
                 else goto simple;
             break;
 
+            case '\0':
+                if (value[1] >= '0' && value[1] <= '9')
+                    str << "\\x00";
+                else
+                    str << "\\0";
+            break;
+
             default:
-                // this test is designed to be "awesome", generating neither warnings nor incorrect results
-                if (*value < 0x20 || *value >= 0x7f)
-                    str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(uint8_t(*value));
-                else simple:
+                if (next >= 0x20 && next < 0x7f) simple:
                     str << *value;
+                else {
+                    unsigned levels(1);
+                    if ((next & 0x80) != 0)
+                        while ((next & 0x80 >> ++levels) != 0);
+
+                    unsigned point(next & 0xff >> levels);
+                    while (--levels != 0)
+                        point = point << 6 | uint8_t(*++value) & 0x3f;
+
+                    if (point < 0x100)
+                        str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << point;
+                    else if (point < 0x10000)
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << point;
+                    else {
+                        point -= 0x10000;
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << (0xd800 | point >> 0x0a);
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << (0xdc00 | point & 0x3ff);
+                    }
+                }
         }
 
     str << (single ? '\'' : '"');
@@ -191,10 +217,9 @@ double CYCastDouble(const char *value) {
     return CYCastDouble(value, strlen(value));
 }
 
-CYUTF8String CYPoolCode(CYPool &pool, CYUTF8String code) {
+CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {
     CYLocalPool local;
-    CYStream stream(code.data, code.data + code.size);
-    CYDriver driver(stream);
+    CYDriver driver(local, stream);
 
     cy::parser parser(driver);
     _assert(parser.parse() == 0);
@@ -204,40 +229,18 @@ CYUTF8String CYPoolCode(CYPool &pool, CYUTF8String code) {
     CYContext context(options);
     driver.program_->Replace(context);
 
-    std::ostringstream str;
+    std::stringbuf str;
     CYOutput out(str, options);
     out << *driver.program_;
     return $pool.strdup(str.str().c_str());
 }
 
-extern "C" bool CydgetMemoryParse(const uint16_t **data, size_t *size) {
-    CYPool pool;
-
-    CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size)));
-    try {
-        utf8 = CYPoolCode(pool, utf8);
-    } catch (const CYException &) {
-        *data = NULL;
-        *size = 0;
-        return false;
-    }
-
-    CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.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 true;
-}
-
 CYPool &CYGetGlobalPool() {
     static CYPool pool;
     return pool;
 }
 
-void CYThrow(const char *format, ...) {
+_visible void CYThrow(const char *format, ...) {
     va_list args;
     va_start(args, format);
     throw CYPoolError(format, args);