Fix issue in 64-bit choose() reported by heardrwt.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index c64268c36cd53e5a2bec6d154782a39c0cccd481..816dab6cebb44a0d27d86eccec185797e45e1702 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -191,34 +191,22 @@ double CYCastDouble(const char *value) {
     return CYCastDouble(value, strlen(value));
 }
 
     return CYCastDouble(value, strlen(value));
 }
 

-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() {