[php] optimized StringIteratorUnicode and StringKeyValueIteratorUnicode

std/php/_std/haxe/iterators/StringIteratorUnicode.hx

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)2005-2018 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package haxe.iterators;
+
+import php.Global.*;
+
+class StringIteratorUnicode {
+	var byteOffset:Int = 0;
+	var totalBytes:Int;
+	var s:String;
+
+	public inline function new(s:String) {
+		this.s = s;
+		totalBytes = strlen(s);
+	}
+
+	public inline function hasNext() {
+		return byteOffset < totalBytes;
+	}
+
+	public inline function next() {
+		var char = mb_substr(substr(s, byteOffset, 4), 0, 1, 'UTF-8');
+		byteOffset += strlen(char);
+		return mb_ord(char, 'UTF-8');
+	}
+
+	static public inline function unicodeIterator(s:String) {
+		return new StringIteratorUnicode(s);
+	}
+}

std/php/_std/haxe/iterators/StringKeyValueIteratorUnicode.hx

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C)2005-2018 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package haxe.iterators;
+
+import php.Global.*;
+
+class StringKeyValueIteratorUnicode {
+	var charOffset:Int = 0;
+	var byteOffset:Int = 0;
+	var totalBytes:Int;
+	var s:String;
+
+	public inline function new(s:String) {
+		this.s = s;
+		totalBytes = strlen(s);
+	}
+
+	public inline function hasNext() {
+		return byteOffset < totalBytes;
+	}
+
+	public inline function next() {
+		var char = mb_substr(substr(s, byteOffset, 4), 0, 1, 'UTF-8');
+		byteOffset += strlen(char);
+		return { key: charOffset++, value: mb_ord(char, 'UTF-8') };
+	}
+
+	static public inline function unicodeKeyValueIterator(s:String) {
+		return new StringKeyValueIteratorUnicode(s);
+	}
+}