Merge remote-tracking branch 'origin/development' into java_vs_jvm

HaxeFoundation · Feb 1, 2024 · f499494 · f499494
2 parents 3c793ba + 1939a7b
commit f499494
Show file tree

Hide file tree

Showing 2 changed files with 155 additions and 89 deletions.
diff --git a/std/jvm/_std/haxe/ds/IntMap.hx b/std/jvm/_std/haxe/ds/IntMap.hx
@@ -0,0 +1,91 @@
+/*
+ * 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.ds;
+
+@:coreApi
+class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
+	var hashMap:java.util.HashMap<Int, T>;
+
+	@:overload
+	public function new():Void {
+		hashMap = new java.util.HashMap();
+	}
+
+	@:overload
+	function new(hashMap:java.util.HashMap<Int, T>):Void {
+		this.hashMap = hashMap;
+	}
+
+	public function set(key:Int, value:T):Void {
+		hashMap.put(key, value);
+	}
+
+	public function get(key:Int):Null<T> {
+		return hashMap.get(key);
+	}
+
+	public function exists(key:Int):Bool {
+		return hashMap.containsKey(key);
+	}
+
+	public function remove(key:Int):Bool {
+		var has = exists(key);
+		hashMap.remove(key);
+		return has;
+	}
+
+	public inline function keys():Iterator<Int> {
+		return hashMap.keySet().iterator();
+	}
+
+	@:runtime public inline function keyValueIterator():KeyValueIterator<Int, T> {
+		return new haxe.iterators.MapKeyValueIterator(this);
+	}
+
+	public inline function iterator():Iterator<T> {
+		return hashMap.values().iterator();
+	}
+
+	public function copy():IntMap<T> {
+		return new IntMap(hashMap.clone());
+	}
+
+	public function toString():String {
+		var s = new StringBuf();
+		s.add("[");
+		var it = keys();
+		for (i in it) {
+			s.add(Std.string(i));
+			s.add(" => ");
+			s.add(Std.string(get(i)));
+			if (it.hasNext())
+				s.add(", ");
+		}
+		s.add("]");
+		return s.toString();
+	}
+
+	public function clear():Void {
+		hashMap.clear();
+	}
+}
diff --git a/tests/unit/src/unit/issues/Issue5862.hx b/tests/unit/src/unit/issues/Issue5862.hx
@@ -1,109 +1,84 @@
 package unit.issues;
+
 import haxe.ds.*;
 #if jvm
 import java.NativeArray;
 #end
 
 class Issue5862 extends Test {
-#if jvm
-  public function test() {
-    var imap = new IntMap();
-    imap.set(0, "val1");
-    imap.set(1, "val2");
-    imap.set(2, "val3");
-    imap.set(2, "changed_val3");
+	#if jvm
+	public function test() {
+		var imap = new IntMap();
+		imap.set(0, "val1");
+		imap.set(1, "val2");
+		imap.set(2, "val3");
+		imap.set(2, "changed_val3");
 
-    var v:Vector<Dynamic> = cast @:privateAccess imap.vals;
-    for (i in 0...v.length) {
-      t(v[i] != "val3");
-    }
+		var smap = new StringMap();
+		smap.set("v1", "val1");
+		smap.set("v2", "val2");
+		smap.set("v3", "val3");
+		smap.set("v3", "changed_val3");
 
-    var smap = new StringMap();
-    smap.set("v1", "val1");
-    smap.set("v2", "val2");
-    smap.set("v3", "val3");
-    smap.set("v3", "changed_val3");
+		var omap = new ObjectMap<{}, String>();
+		omap.set(imap, "val1");
+		omap.set(smap, "val2");
+		omap.set(omap, "val3");
+		omap.set(omap, "changed_val3");
 
-	#if !jvm
-    var v:Vector<Dynamic> = cast @:privateAccess smap.vals;
-    for (i in 0...v.length) {
-      t(v[i] != "val3");
-	}
-	#end
+		var v:Vector<Dynamic> = cast @:privateAccess omap.vals;
+		for (i in 0...v.length) {
+			t(v[i] != "val3");
+		}
 
-    var omap = new ObjectMap<{}, String>();
-    omap.set(imap, "val1");
-    omap.set(smap, "val2");
-    omap.set(omap, "val3");
-    omap.set(omap, "changed_val3");
+		var wmap = new WeakMap<{}, String>();
+		wmap.set(imap, "val1");
+		wmap.set(smap, "val2");
+		wmap.set(omap, "val3");
+		wmap.set(omap, "changed_val3");
 
-    var v:Vector<Dynamic> = cast @:privateAccess omap.vals;
-    for (i in 0...v.length) {
-      t(v[i] != "val3");
-    }
-#if jvm
-    var wmap = new WeakMap<{}, String>();
-    wmap.set(imap, "val1");
-    wmap.set(smap, "val2");
-    wmap.set(omap, "val3");
-    wmap.set(omap, "changed_val3");
+		var v = @:privateAccess wmap.entries;
+		for (i in 0...v.length) {
+			t(v[i] == null || v[i].value != "val3");
+		}
 
-    var v = @:privateAccess wmap.entries;
-    for (i in 0...v.length) {
-      t(v[i] == null || v[i].value != "val3");
-    }
-#end
+		var imap = new IntMap();
+		imap.set(0, "val1");
+		imap.set(1, "val2");
+		imap.set(2, "val3");
+		imap.set(2, "changed_val3");
+		imap.set(1, "changed_val2");
+
+		var smap = new StringMap();
+		smap.set("v1", "val1");
+		smap.set("v2", "val2");
+		smap.set("v3", "val3");
+		smap.set("v3", "changed_val3");
+		smap.set("v2", "changed_val2");
 
-    var imap = new IntMap();
-    imap.set(0, "val1");
-    imap.set(1, "val2");
-    imap.set(2, "val3");
-    imap.set(2, "changed_val3");
-    imap.set(1, "changed_val2");
+		var omap = new ObjectMap<{}, String>();
+		omap.set(imap, "val1");
+		omap.set(smap, "val2");
+		omap.set(omap, "val3");
+		omap.set(omap, "changed_val3");
+		omap.set(smap, "changed_val2");
 
-    var v:Vector<Dynamic> = cast @:privateAccess imap.vals;
-    for (i in 0...v.length) {
-      t(v[i] != "val2");
-    }
+		var v:Vector<Dynamic> = cast @:privateAccess omap.vals;
+		for (i in 0...v.length) {
+			t(v[i] != "val2");
+		}
 
-    var smap = new StringMap();
-    smap.set("v1", "val1");
-    smap.set("v2", "val2");
-    smap.set("v3", "val3");
-    smap.set("v3", "changed_val3");
-    smap.set("v2", "changed_val2");
+		var wmap = new WeakMap<{}, String>();
+		wmap.set(imap, "val1");
+		wmap.set(smap, "val2");
+		wmap.set(omap, "val3");
+		wmap.set(omap, "changed_val3");
+		wmap.set(smap, "changed_val2");
 
-	#if !jvm
-    var v:Vector<Dynamic> = cast @:privateAccess smap.vals;
-    for (i in 0...v.length) {
-      t(v[i] != "val2");
+		var v = @:privateAccess wmap.entries;
+		for (i in 0...v.length) {
+			t(v[i] == null || v[i].value != "val2");
+		}
 	}
 	#end
-
-    var omap = new ObjectMap<{}, String>();
-    omap.set(imap, "val1");
-    omap.set(smap, "val2");
-    omap.set(omap, "val3");
-    omap.set(omap, "changed_val3");
-    omap.set(smap, "changed_val2");
-
-    var v:Vector<Dynamic> = cast @:privateAccess omap.vals;
-    for (i in 0...v.length) {
-      t(v[i] != "val2");
-    }
-#if jvm
-    var wmap = new WeakMap<{}, String>();
-    wmap.set(imap, "val1");
-    wmap.set(smap, "val2");
-    wmap.set(omap, "val3");
-    wmap.set(omap, "changed_val3");
-    wmap.set(smap, "changed_val2");
-
-    var v = @:privateAccess wmap.entries;
-    for (i in 0...v.length) {
-      t(v[i] == null || v[i].value != "val2");
-    }
-#end
-  }
-#end
 }