Update the copyright year now that 2016 has begun.

[cycript.git] / String.hpp

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

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Cycript 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 Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * 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
 
 **/
 /* }}} */
 
 #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;
     size_t size;
 
 
 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) :
         data(data),
         size(strlen(data))


@@ -47,9 +53,13 @@ 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;
     }

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


@@ -67,9 +77,12 @@ 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);
 

-CYUTF8String CYPoolUTF8String(apr_pool_t *pool, CYUTF16String utf16);
-CYUTF16String CYPoolUTF16String(apr_pool_t *pool, CYUTF8String utf8);
+bool CYStartsWith(const CYUTF8String &haystack, const CYUTF8String &needle);
+
+CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16);
+CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8);

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