Make Pointer/Struct .type compatible with Functor.

[cycript.git] / String.hpp

diff --git a/String.hpp b/String.hpp
index c68ba84a35ee62097edc765ac837bdb36ef8d072..e0e292eecf75af460541a5b71856ecbb20852796 100644 (file)
--- a/String.hpp
+++ b/String.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

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


@@ -22,11 +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 "Pooling.hpp"
+

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


@@ -55,7 +54,7 @@ struct CYUTF8String {
     }
 };
 
     }
 };
 

-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;
 }


@@ -75,6 +74,8 @@ size_t CYGetIndex(const CYUTF8String &value);
 bool CYIsKey(CYUTF8String value);
 bool CYGetOffset(const char *value, ssize_t &index);
 
 bool CYIsKey(CYUTF8String value);
 bool CYGetOffset(const char *value, ssize_t &index);
 

+bool CYStartsWith(const CYUTF8String &haystack, const CYUTF8String &needle);
+

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