Separate useful CYPoolCode from CydgetMemoryParse.

diff --git a/Library.cpp b/Library.cpp
index f79711b5ba5e1382fcf55801be9212697e089406..28f9395468d00664da256054abdc77110792689b 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -191,31 +191,38 @@ double CYCastDouble(const char *value) {
     return CYCastDouble(value, strlen(value));
 }
 
     return CYCastDouble(value, strlen(value));
 }
 

-extern "C" bool CydgetMemoryParse(const uint16_t **data, size_t *size) {
+CYUTF8String CYPoolCode(CYPool &pool, CYUTF8String code) {

     CYLocalPool local;
     CYLocalPool local;

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

     CYDriver driver(stream);
 
     cy::parser parser(driver);
     CYDriver driver(stream);
 
     cy::parser parser(driver);

-    if (parser.parse() != 0 || !driver.errors_.empty()) {
-        *data = NULL;
-        *size = 0;
-        return false;
-    }
+    _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;
+
+    std::ostringstream &str(pool.object<std::ostringstream>());

     CYOutput out(str, options);
     out << *driver.program_;
     CYOutput out(str, options);
     out << *driver.program_;

-    std::string code(str.str());
+    return str.str().c_str();
+}

 
 

+extern "C" bool CydgetMemoryParse(const uint16_t **data, size_t *size) {

     CYPool pool;
     CYPool pool;

-    CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size())));

 
 

+    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);
     size_t bytes(utf16.size * sizeof(uint16_t));
     uint16_t *copy(reinterpret_cast<uint16_t *>(malloc(bytes)));
     memcpy(copy, utf16.data, bytes);

diff --git a/Pooling.hpp b/Pooling.hpp
index 24c7cc25af044776623638f1dd9efc36650c1c84..e3116d949623df36169bd35e9b3bac96ab52f79f 100644 (file)
--- a/Pooling.hpp
+++ b/Pooling.hpp
@@ -62,6 +62,11 @@ class CYPool {
         return (size + 7) & ~0x3;
     }
 
         return (size + 7) & ~0x3;
     }
 

+    template <typename Type_>
+    static void delete_(void *data) {
+        reinterpret_cast<Type_ *>(data)->~Type_();
+    }
+

     CYPool(const CYPool &);
 
   public:
     CYPool(const CYPool &);
 
   public:


@@ -182,6 +187,13 @@ class CYPool {
     }
 
     void atexit(void (*code)(void *), void *data = NULL);
     }
 
     void atexit(void (*code)(void *), void *data = NULL);

+
+    template <typename Type_>
+    Type_ &object() {
+        Type_ *value(new(*this) Type_());
+        atexit(&delete_<Type_>, value);
+        return *value;
+    }

 };
 
 _finline void *operator new(size_t size, CYPool &pool) {
 };
 
 _finline void *operator new(size_t size, CYPool &pool) {

diff --git a/cycript.hpp b/cycript.hpp
index 5498b594f9001be4f2f963b854939786bb864c24..e65721a32f5c682d3fb261cb914a1d93726c565e 100644 (file)
--- a/cycript.hpp
+++ b/cycript.hpp
@@ -51,4 +51,6 @@ bool CYSendAll(int socket, const Type_ *data, size_t size) {
 
 CYPool &CYGetGlobalPool();
 
 
 CYPool &CYGetGlobalPool();
 

+CYUTF8String CYPoolCode(CYPool &pool, CYUTF8String code);
+

 #endif/*CYCRIPT_HPP*/
 #endif/*CYCRIPT_HPP*/