[cpp] Add WeakMap implementation

std/cpp/_std/haxe/ds/IntMap.hx

@@ -71,18 +71,6 @@ package haxe.ds;
 	}
 
 	public function toString() : String {
-		var s = new StringBuf();
-		s.add("{");
-		var it = keys();
-		for( i in it ) {
-			s.add(i);
-			s.add(" => ");
-			s.add(Std.string(get(i)));
-			if( it.hasNext() )
-				s.add(", ");
-		}
-		s.add("}");
-		return s.toString();
+		return untyped __global__.__int_hash_to_string(h);
 	}
-
 }

std/cpp/_std/haxe/ds/ObjectMap.hx

@@ -21,56 +21,53 @@
  */
 package haxe.ds;
 
+@:headerClassCode("
+  inline void set(Dynamic key, ::null value) { __object_hash_set(h,key,value); }
+  inline void set(Dynamic key, bool value) { __object_hash_set(h,key,value); }
+  inline void set(Dynamic key, char value) { __object_hash_set_int(h,key,value); }
+  inline void set(Dynamic key, unsigned char value) { __object_hash_set_int(h,key,value); }
+  inline void set(Dynamic key, signed char value) { __object_hash_set_int(h,key,value); }
+  inline void set(Dynamic key, short value) { __object_hash_set_int(h,key,value); }
+  inline void set(Dynamic key, unsigned short value) { __object_hash_set_int(h,key,value); }
+  inline void set(Dynamic key, int value) { __object_hash_set_int(h,key,value); }
+  inline void set(Dynamic key, unsigned int value) { __object_hash_set_int(h,key,value); }
+  inline void set(Dynamic key, float value) { __object_hash_set_float(h,key,value); }
+  inline void set(Dynamic key, double value) { __object_hash_set_float(h,key,value); }
+  inline void set(Dynamic key, ::String value) { __object_hash_set_string(h,key,value); }
+")
 @:coreApi
 class ObjectMap<K:{},V> implements haxe.Constraints.IMap<K,V> {
-	private var __Internal : IntMap<V>;
-	private var __KeyRefs : IntMap<K>;
+	private var h : Dynamic;
 
-	public function new() : Void {
-		__Internal = new IntMap<V>();
-		__KeyRefs = new IntMap<K>();
-	}
+	public function new() : Void { }
 
 	public function set( key : K, value : V ) : Void {
-		var id = untyped __global__.__hxcpp_obj_id(key);
-		__Internal.set( id, value );
-		__KeyRefs.set( id, key );
+		untyped __global__.__object_hash_set(h,key,value);
 	}
 
 	public function get( key : K ) : Null<V> {
-		return __Internal.get( untyped __global__.__hxcpp_obj_id(key) );
+		return untyped __global__.__object_hash_get(h,key);
 	}
 
 	public function exists( key : K ) : Bool {
-		return __Internal.exists( untyped __global__.__hxcpp_obj_id(key) );
+		return untyped __global__.__object_hash_exists(h,key);
 	}
 
 	public function remove( key : K ) : Bool {
-		var id = untyped __global__.__hxcpp_obj_id(key);
-		__Internal.remove(id);
-		return __KeyRefs.remove(id);
+		return untyped __global__.__object_hash_remove(h,key);
 	}
 
 	public function keys() : Iterator<K> {
-		return __KeyRefs.iterator();
+		var a:Array<K> = untyped __global__.__object_hash_keys(h);
+		return a.iterator();
 	}
 
 	public function iterator() : Iterator<V> {
-		return __Internal.iterator();
+		var a:Array<Dynamic> = untyped __global__.__object_hash_values(h);
+		return a.iterator();
 	}
 
 	public function toString() : String {
-		var s = new StringBuf();
-		s.add("{");
-		var it = __Internal.keys();
-		for( i in it ) {
-			s.add(Std.string(__KeyRefs.get(i)));
-			s.add(" => ");
-			s.add(Std.string(__Internal.get(i)));
-			if( it.hasNext() )
-				s.add(", ");
-		}
-		s.add("}");
-		return s.toString();
+		return untyped __global__.__object_hash_to_string(h);
 	}
 }

std/cpp/_std/haxe/ds/WeakMap.hx

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C)2005-2013 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;
+
+@:headerClassCode("
+  inline void set(Dynamic key, ::null value) { __object_hash_set(h,key,value,true); }
+  inline void set(Dynamic key, bool value) { __object_hash_set(h,key,value,true); }
+  inline void set(Dynamic key, char value) { __object_hash_set_int(h,key,value,true); }
+  inline void set(Dynamic key, unsigned char value) { __object_hash_set_int(h,key,value,true); }
+  inline void set(Dynamic key, signed char value) { __object_hash_set_int(h,key,value,true); }
+  inline void set(Dynamic key, short value) { __object_hash_set_int(h,key,value,true); }
+  inline void set(Dynamic key, unsigned short value) { __object_hash_set_int(h,key,value,true); }
+  inline void set(Dynamic key, int value) { __object_hash_set_int(h,key,value,true); }
+  inline void set(Dynamic key, unsigned int value) { __object_hash_set_int(h,key,value,true); }
+  inline void set(Dynamic key, float value) { __object_hash_set_float(h,key,value,true); }
+  inline void set(Dynamic key, double value) { __object_hash_set_float(h,key,value,true); }
+  inline void set(Dynamic key, ::String value) { __object_hash_set_string(h,key,value,true); }
+")
+@:coreApi
+class WeakMap<K:{},V> implements haxe.Constraints.IMap<K,V> {
+	private var h : Dynamic;
+
+	public function new() : Void { }
+
+	public function set( key : K, value : V ) : Void {
+		untyped __global__.__object_hash_set(h,key,value,true);
+	}
+
+	public function get( key : K ) : Null<V> {
+		return untyped __global__.__object_hash_get(h,key);
+	}
+
+	public function exists( key : K ) : Bool {
+		return untyped __global__.__object_hash_exists(h,key);
+	}
+
+	public function remove( key : K ) : Bool {
+		return untyped __global__.__object_hash_remove(h,key);
+	}
+
+	public function keys() : Iterator<K> {
+		var a:Array<K> = untyped __global__.__object_hash_keys(h);
+		return a.iterator();
+	}
+
+	public function iterator() : Iterator<V> {
+		var a:Array<Dynamic> = untyped __global__.__object_hash_values(h);
+		return a.iterator();
+	}
+
+	public function toString() : String {
+		return untyped __global__.__object_hash_to_string(h);
+	}
+}