Fix quote when stringifying C/Objective-C strings.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index afa705c14da88ab12bd224dedf0214d2d5634d54..ac9d8b08db673d9ef5b1596d1b27601298aaa371 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -19,14 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include <dlfcn.h>
-

 #include "cycript.hpp"
 
 #include "cycript.hpp"
 

-#include "Pooling.hpp"
-
-#include <sys/mman.h>
-

 #include <iostream>
 #include <set>
 #include <map>
 #include <iostream>
 #include <set>
 #include <map>


@@ -34,15 +28,17 @@
 #include <sstream>
 #include <cmath>
 
 #include <sstream>
 #include <cmath>
 

-#include "Error.hpp"
-#include "Execute.hpp"
-#include "Parser.hpp"
-#include "String.hpp"
+#include <dlfcn.h>

 
 

-#include "Cycript.tab.hh"
-#include "Driver.hpp"
+#include <sys/mman.h>

 
 #include "ConvertUTF.h"
 
 #include "ConvertUTF.h"

+#include "Driver.hpp"
+#include "Error.hpp"
+#include "Execute.hpp"
+#include "Pooling.hpp"
+#include "String.hpp"
+#include "Syntax.hpp"

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


@@ -107,20 +103,25 @@ bool CYGetOffset(const char *value, ssize_t &index) {
 }
 /* }}} */
 /* JavaScript *ify {{{ */
 }
 /* }}} */
 /* JavaScript *ify {{{ */

-void CYStringify(std::ostringstream &str, const char *data, size_t size) {
-    unsigned quot(0), apos(0);
-    for (const char *value(data), *end(data + size); value != end; ++value)
-        if (*value == '"')
-            ++quot;
-        else if (*value == '\'')
-            ++apos;
-
-    bool single(quot > apos);
+void CYStringify(std::ostringstream &str, const char *data, size_t size, bool c) {
+    bool single;
+    if (c)
+        single = false;
+    else {
+        unsigned quot(0), apos(0);
+        for (const char *value(data), *end(data + size); value != end; ++value)
+            if (*value == '"')
+                ++quot;
+            else if (*value == '\'')
+                ++apos;
+
+        single = quot > apos;
+    }

 
     str << (single ? '\'' : '"');
 
     for (const char *value(data), *end(data + size); value != end; ++value)
 
     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;
             case '\\': str << "\\\\"; break;
             case '\b': str << "\\b"; break;
             case '\f': str << "\\f"; break;


@@ -141,18 +142,48 @@ void CYStringify(std::ostringstream &str, const char *data, size_t size) {
                 else goto simple;
             break;
 
                 else goto simple;
             break;
 

+            case '\0':
+                if (value[1] >= '0' && value[1] <= '9')
+                    str << "\\x00";
+                else
+                    str << "\\0";
+            break;
+

             default:
             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;
                     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 ? '\'' : '"');
 }
 
 void CYNumerify(std::ostringstream &str, double value) {
         }
 
     str << (single ? '\'' : '"');
 }
 
 void CYNumerify(std::ostringstream &str, double value) {

+    if (std::isinf(value)) {
+        if (value < 0)
+            str << '-';
+        str << "Infinity";
+        return;
+    }
+

     char string[32];
     // XXX: I want this to print 1e3 rather than 1000
     sprintf(string, "%.17g", value);
     char string[32];
     // XXX: I want this to print 1e3 rather than 1000
     sprintf(string, "%.17g", value);


@@ -194,21 +225,23 @@ double CYCastDouble(const char *value) {
     return CYCastDouble(value, strlen(value));
 }
 
     return CYCastDouble(value, strlen(value));
 }
 

-CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {
-    CYLocalPool local;
-    CYDriver driver(stream);
+_visible bool CYStartsWith(const CYUTF8String &haystack, const CYUTF8String &needle) {
+    return haystack.size >= needle.size && strncmp(haystack.data, needle.data, needle.size) == 0;
+}

 
 

-    cy::parser parser(driver);
-    _assert(parser.parse() == 0);
+CYUTF8String CYPoolCode(CYPool &pool, std::streambuf &stream) {
+    CYLocalPool local;
+    CYDriver driver(local, stream);
+    _assert(!driver.Parse());

     _assert(driver.errors_.empty());
 
     CYOptions options;
     CYContext context(options);
     _assert(driver.errors_.empty());
 
     CYOptions options;
     CYContext context(options);

-    driver.program_->Replace(context);
+    driver.script_->Replace(context);

 
     std::stringbuf str;
     CYOutput out(str, options);
 
     std::stringbuf str;
     CYOutput out(str, options);

-    out << *driver.program_;
+    out << *driver.script_;

     return $pool.strdup(str.str().c_str());
 }
 
     return $pool.strdup(str.str().c_str());
 }
 


@@ -217,7 +250,7 @@ CYPool &CYGetGlobalPool() {
     return 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);
     va_list args;
     va_start(args, format);
     throw CYPoolError(format, args);