Universal binary!

[cycript.git] / String.hpp

diff --git a/String.hpp b/String.hpp
index 5c47ca18c3c182579560d244e452afbc5246b680..ec45c47d4535e7e89f5c6eebe5c38512e34dce8c 100644 (file)
--- a/String.hpp
+++ b/String.hpp
@@ -1,4 +1,4 @@
-/* Cycript - Error.hppution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler

  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 


@@ -41,11 +41,20 @@
 #define CYCRIPT_STRING_HPP
 
 #include "cycript.hpp"
 #define CYCRIPT_STRING_HPP
 
 #include "cycript.hpp"

+#include "Pooling.hpp"
+
+#include <iostream>

 
 struct CYUTF8String {
     const char *data;
     size_t size;
 
 
 struct CYUTF8String {
     const char *data;
     size_t size;
 

+    CYUTF8String(const char *data) :
+        data(data),
+        size(strlen(data))
+    {
+    }
+

     CYUTF8String(const char *data, size_t size) :
         data(data),
         size(size)
     CYUTF8String(const char *data, size_t size) :
         data(data),
         size(size)


@@ -58,6 +67,11 @@ struct CYUTF8String {
     }
 };
 
     }
 };
 

+static inline std::ostream &operator <<(std::ostream &lhs, CYUTF8String &rhs) {
+    lhs.write(rhs.data, rhs.size);
+    return lhs;
+}
+

 struct CYUTF16String {
     const uint16_t *data;
     size_t size;
 struct CYUTF16String {
     const uint16_t *data;
     size_t size;


@@ -69,62 +83,11 @@ struct CYUTF16String {
     }
 };
 
     }
 };
 

-JSStringRef CYCopyJSString(const char *value);
-JSStringRef CYCopyJSString(JSStringRef value);
-JSStringRef CYCopyJSString(CYUTF8String value);
-JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value);
-
-class CYJSString {
-  private:
-    JSStringRef string_;
-
-    void Clear_() {
-        if (string_ != NULL)
-            JSStringRelease(string_);
-    }
-
-  public:
-    CYJSString(const CYJSString &rhs) :
-        string_(CYCopyJSString(rhs.string_))
-    {
-    }
-
-    template <typename Arg0_>
-    CYJSString(Arg0_ arg0) :
-        string_(CYCopyJSString(arg0))
-    {
-    }
-
-    template <typename Arg0_, typename Arg1_>
-    CYJSString(Arg0_ arg0, Arg1_ arg1) :
-        string_(CYCopyJSString(arg0, arg1))
-    {
-    }
-
-    CYJSString &operator =(const CYJSString &rhs) {
-        Clear_();
-        string_ = CYCopyJSString(rhs.string_);
-        return *this;
-    }
-
-    ~CYJSString() {
-        Clear_();
-    }
-
-    void Clear() {
-        Clear_();
-        string_ = NULL;
-    }
-
-    operator JSStringRef() const {
-        return string_;
-    }
-};
-

 size_t CYGetIndex(const CYUTF8String &value);
 bool CYIsKey(CYUTF8String value);
 bool CYGetOffset(const char *value, ssize_t &index);
 
 size_t CYGetIndex(const CYUTF8String &value);
 bool CYIsKey(CYUTF8String value);
 bool CYGetOffset(const char *value, ssize_t &index);
 

-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value);
+CYUTF8String CYPoolUTF8String(apr_pool_t *pool, CYUTF16String utf16);
+CYUTF16String CYPoolUTF16String(apr_pool_t *pool, CYUTF8String utf8);

 
 #endif/*CYCRIPT_STRING_HPP*/
 
 #endif/*CYCRIPT_STRING_HPP*/