X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/37954781d9756ece500551055562183a1e28e943..96d36aaa89e579a53bd5848c22a462ca8eb13f80:/String.hpp

diff --git a/String.hpp b/String.hpp
index 56f2eee..0bc5519 100644
--- a/String.hpp
+++ b/String.hpp
@@ -1,12 +1,48 @@
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)
+*/
+
+/* GNU Affero General Public License, Version 3 {{{ */
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+
 #ifndef CYCRIPT_STRING_HPP
 #define CYCRIPT_STRING_HPP
 
-#include "cycript.hpp"
+#include <iostream>
+#include <string>
+
+#include "Pooling.hpp"
 
 struct CYUTF8String {
     const char *data;
     size_t size;
 
+    CYUTF8String() :
+        data(NULL),
+        size(0)
+    {
+    }
+
+    CYUTF8String(const char *data) :
+        data(data),
+        size(strlen(data))
+    {
+    }
+
     CYUTF8String(const char *data, size_t size) :
         data(data),
         size(size)
@@ -17,8 +53,22 @@ struct CYUTF8String {
         size_t length(strlen(data));
         return length == size && memcmp(value, data, length) == 0;
     }
+
+    bool operator !=(const char *value) const {
+        size_t length(strlen(data));
+        return length != size || memcmp(value, data, length) != 0;
+    }
+
+    operator std::string() const {
+        return std::string(data, size);
+    }
 };
 
+static inline std::ostream &operator <<(std::ostream &lhs, const CYUTF8String &rhs) {
+    lhs.write(rhs.data, rhs.size);
+    return lhs;
+}
+
 struct CYUTF16String {
     const uint16_t *data;
     size_t size;
@@ -30,62 +80,26 @@ 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))
-    {
-    }
+size_t CYGetIndex(const CYUTF8String &value);
+bool CYIsKey(CYUTF8String value);
 
-    CYJSString &operator =(const CYJSString &rhs) {
-        Clear_();
-        string_ = CYCopyJSString(rhs.string_);
-        return *this;
-    }
+bool CYGetOffset(const char *value, ssize_t &index);
 
-    ~CYJSString() {
-        Clear_();
-    }
+bool CYStartsWith(const CYUTF8String &haystack, const CYUTF8String &needle);
 
-    void Clear() {
-        Clear_();
-        string_ = NULL;
-    }
+_finline const char *CYPoolCString(CYPool &pool, CYUTF8String utf8) {
+    return pool.strndup(utf8.data, utf8.size);
+}
 
-    operator JSStringRef() const {
-        return string_;
-    }
-};
+_finline CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF8String utf8) {
+    return {pool.strndup(utf8.data, utf8.size), utf8.size};
+}
 
-size_t CYGetIndex(const CYUTF8String &value);
-bool CYIsKey(CYUTF8String value);
-bool CYGetOffset(const char *value, ssize_t &index);
+_finline CYUTF8String CYPoolUTF8String(CYPool &pool, const std::string &value) {
+    return {pool.strndup(value.data(), value.size()), value.size()};
+}
 
-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value);
+CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16);
+CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8);
 
 #endif/*CYCRIPT_STRING_HPP*/