Move lexer hacks for ++ and -- to LexCrement rule.

[cycript.git] / String.hpp

diff --git a/String.hpp b/String.hpp
index 754cdbc8446d3207c08a96f55c798bb6637e12aa..e0e292eecf75af460541a5b71856ecbb20852796 100644 (file)
--- a/String.hpp
+++ b/String.hpp
@@ -1,52 +1,47 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 */
 

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

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * 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 <iostream>
+

 #include "Pooling.hpp"
 
 struct CYUTF8String {
     const char *data;
     size_t size;
 
 #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)
     CYUTF8String(const char *data, size_t size) :
         data(data),
         size(size)


@@ -59,6 +54,11 @@ struct CYUTF8String {
     }
 };
 
     }
 };
 

+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;
 struct CYUTF16String {
     const uint16_t *data;
     size_t size;


@@ -74,7 +74,9 @@ 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);
 

-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*/