Unify the build environment for Android and Apple.

[cycript.git] / String.hpp

diff --git a/String.hpp b/String.hpp
index c68ba84a35ee62097edc765ac837bdb36ef8d072..fe33fcbbfa410ba3e4fa8dc3f25d585bfe76b256 100644 (file)
--- a/String.hpp
+++ b/String.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -22,10 +22,10 @@
 #ifndef CYCRIPT_STRING_HPP
 #define CYCRIPT_STRING_HPP
 
 #ifndef CYCRIPT_STRING_HPP
 #define CYCRIPT_STRING_HPP
 

-#include "cycript.hpp"
-#include "Pooling.hpp"
-

 #include <iostream>
 #include <iostream>

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

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


@@ -53,9 +53,18 @@ struct CYUTF8String {
         size_t length(strlen(data));
         return length == size && memcmp(value, data, length) == 0;
     }
         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, CYUTF8String &rhs) {
+static inline std::ostream &operator <<(std::ostream &lhs, const CYUTF8String &rhs) {

     lhs.write(rhs.data, rhs.size);
     return lhs;
 }
     lhs.write(rhs.data, rhs.size);
     return lhs;
 }


@@ -73,8 +82,15 @@ struct CYUTF16String {
 
 size_t CYGetIndex(const CYUTF8String &value);
 bool CYIsKey(CYUTF8String value);
 
 size_t CYGetIndex(const CYUTF8String &value);
 bool CYIsKey(CYUTF8String value);

+

 bool CYGetOffset(const char *value, ssize_t &index);
 
 bool CYGetOffset(const char *value, ssize_t &index);
 

+bool CYStartsWith(const CYUTF8String &haystack, const CYUTF8String &needle);
+
+const char *CYPoolCString(CYPool &pool, CYUTF8String utf8);
+CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF8String utf8);
+CYUTF8String CYPoolUTF8String(CYPool &pool, const std::string &value);
+

 CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16);
 CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8);
 
 CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16);
 CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8);