Flex drove me crazy with "you just got jammed" :/.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index afa705c14da88ab12bd224dedf0214d2d5634d54..e8e70d6599eaacaaf9d7a2ade647beab36f0dbb1 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -34,14 +34,12 @@
 #include <sstream>
 #include <cmath>
 
 #include <sstream>
 #include <cmath>
 

+#include "Driver.hpp"

 #include "Error.hpp"
 #include "Execute.hpp"
 #include "Parser.hpp"
 #include "String.hpp"
 
 #include "Error.hpp"
 #include "Execute.hpp"
 #include "Parser.hpp"
 #include "String.hpp"
 

-#include "Cycript.tab.hh"
-#include "Driver.hpp"
-

 #include "ConvertUTF.h"
 
 template <>
 #include "ConvertUTF.h"
 
 template <>


@@ -120,7 +118,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)
     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,12 +139,35 @@ 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 ? '\'' : '"');
         }
 
     str << (single ? '\'' : '"');


@@ -196,19 +217,17 @@ double CYCastDouble(const char *value) {
 
 CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {
     CYLocalPool local;
 
 CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {
     CYLocalPool local;

-    CYDriver driver(stream);
-
-    cy::parser parser(driver);
-    _assert(parser.parse() == 0);
+    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 +236,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);