[neko] StringIteratorUnicode; StringKeyValueIteratorUnicode (closes #8763)

std/StringTools.hx

@@ -157,7 +157,7 @@ class StringTools {
 	**/
 	public static function htmlEscape(s:String, ?quotes:Bool):String {
 		var buf = new StringBuf();
-		for (code in new haxe.iterators.StringIteratorUnicode(s)) {
+		for (code in #if neko iterator(s) #else new haxe.iterators.StringIteratorUnicode(s) #end) {
 			switch (code) {
 				case '&'.code:
 					buf.add("&");

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C)2005-2019 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;
+
+class StringIteratorUnicode {
+	var byteOffset:Int = 0;
+	var s:String;
+
+	public inline function new(s:String) {
+		this.s = s;
+	}
+
+	public inline function hasNext() {
+		return byteOffset < s.length;
+	}
+
+	public inline function next() {
+		var code:Int = codeAt(byteOffset);
+		if (code < 0xC0) {
+			byteOffset++;
+		} else if (code < 0xE0) {
+			code = ((code - 0xC0) << 6) + codeAt(byteOffset + 1) - 0x80;
+			byteOffset += 2;
+		} else if (code < 0xF0) {
+			code = ((code - 0xE0) << 12) + ((codeAt(byteOffset + 1) - 0x80) << 6) + codeAt(byteOffset + 2) - 0x80;
+			byteOffset += 3;
+		} else {
+			code = ((code - 0xF0) << 18)
+				+ ((codeAt(byteOffset + 1) - 0x80) << 12)
+				+ ((codeAt(byteOffset + 2) - 0x80) << 6)
+				+ codeAt(byteOffset + 3)
+				- 0x80;
+			byteOffset += 4;
+		}
+		return code;
+	}
+
+	inline function codeAt(index:Int):Int {
+		return untyped $sget(s.__s, index);
+	}
+
+	static public inline function unicodeIterator(s:String) {
+		return new StringIteratorUnicode(s);
+	}
+}

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C)2005-2019 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;
+
+class StringKeyValueIteratorUnicode {
+	var byteOffset:Int = 0;
+	var charOffset:Int = 0;
+	var s:String;
+
+	public inline function new(s:String) {
+		this.s = s;
+	}
+
+	public inline function hasNext() {
+		return byteOffset < s.length;
+	}
+
+	public inline function next() {
+		var code:Int = codeAt(byteOffset);
+		if (code < 0xC0) {
+			byteOffset++;
+		} else if (code < 0xE0) {
+			code = ((code - 0xC0) << 6) + codeAt(byteOffset + 1) - 0x80;
+			byteOffset += 2;
+		} else if (code < 0xF0) {
+			code = ((code - 0xE0) << 12) + ((codeAt(byteOffset + 1) - 0x80) << 6) + codeAt(byteOffset + 2) - 0x80;
+			byteOffset += 3;
+		} else {
+			code = ((code - 0xF0) << 18)
+				+ ((codeAt(byteOffset + 1) - 0x80) << 12)
+				+ ((codeAt(byteOffset + 2) - 0x80) << 6)
+				+ codeAt(byteOffset + 3)
+				- 0x80;
+			byteOffset += 4;
+		}
+		return {key: charOffset++, value: code};
+	}
+
+	inline function codeAt(index:Int):Int {
+		return untyped $sget(s.__s, index);
+	}
+
+	static public inline function unicodeKeyValueIterator(s:String) {
+		return new StringKeyValueIteratorUnicode(s);
+	}
+}

tests/unit/src/unitstd/haxe/iterators/StringIteratorUnicode.unit.hx

@@ -6,7 +6,7 @@ function traverse(s:String) {
 	return a;
 }
 
-#if target.unicode
+#if (target.unicode || neko)
 
 traverse("abcde") == ["a".code, "b".code, "c".code, "d".code, "e".code];
 traverse("aa😂éé") == ["a".code, "a".code, "😂".code, "é".code, "é".code];

tests/unit/src/unitstd/haxe/iterators/StringKeyValueIteratorUnicode.unit.hx

@@ -8,7 +8,7 @@ function traverse(s:String) {
 	return { k: ak, v: av };
 }
 
-#if target.unicode
+#if (target.unicode || neko)
 
 var r = traverse("abcde");
 r.k == [0, 1, 2, 3, 4];