projects/dwt-addons: dwtx/dwtxhelper/Collection.d comparison

comparison dwtx/dwtxhelper/Collection.d @ 195:a4d38d47ddc4

HashMap support for null values and keys

author	Frank Benoit <benoit@tionex.de>
date	Tue, 03 Feb 2009 16:08:10 +0100
parents	6d35b9960800
children	489eb3f36068

comparison

equal deleted inserted replaced

-:6d35b9960800
+:a4d38d47ddc4
 public void   set(Object o);
 }
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 class MapEntry : Map.Entry {
 Map map;
 Object key;
 private this( Map map, Object key){
 this.map = map;
 this.key = key;
 }
 public override int opEquals(Object o){
 if( auto other = cast(MapEntry)o){
 if(( getKey() is null ? other.getKey() is null : getKey() == other.getKey() )  &&
 ( getValue() is null ? other.getValue() is null : getValue() == other.getValue() )){
 return true;
-}
-return false;
 }
 return false;
 }
-public Object getKey(){
+return false;
-return key;
+}
-}
+public Object getKey(){
-public Object getValue(){
+return key;
-return map.get(key);
+}
-}
+public Object getValue(){
-public override hash_t toHash(){
+return map.get(key);
-return ( getKey()   is null ? 0 : getKey().toHash()   ) ^
+}
-( getValue() is null ? 0 : getValue().toHash() );
+public override hash_t toHash(){
-}
+return ( getKey()   is null ? 0 : getKey().toHash()   ) ^
-public Object     setValue(Object value){
+( getValue() is null ? 0 : getValue().toHash() );
-return map.put( key, value );
+}
-}
+public Object     setValue(Object value){
+return map.put( key, value );
 }
+}
+private struct ObjRef {
+Object obj;
+static ObjRef opCall( Object obj ){
+ObjRef res;
+res.obj = obj;
+return res;
+}
+public hash_t toHash(){
+return obj is null ? 0 : obj.toHash();
+}
+public int opEquals( ObjRef other ){
+return obj is null ? other.obj is null : obj.opEquals( other.obj );
+}
+public int opEquals( Object other ){
+return obj is null ? other is null : obj.opEquals( other );
+}
+}
 class HashMap : Map {
-//FIXME "NULL" is used to work around tango ticket 1468.
-static Object NULL;
 // The HashMap  class is roughly equivalent to Hashtable, except that it is unsynchronized and permits nulls.
-alias tango.util.container.HashMap.HashMap!(Object,Object) MapType;
+alias tango.util.container.HashMap.HashMap!(ObjRef,ObjRef) MapType;
 private MapType map;
 public this(){
-if( NULL is null ) NULL  = new Object();
 map = new MapType();
 }
 public this(int initialCapacity){
 this();
 }
 public this(int initialCapacity, float loadFactor){
-if( NULL is null ) NULL  = new Object();
 map = new MapType(loadFactor);
 }
 public this(Map m){
 this();
 putAll(m);
 }
 public void clear(){
 map.clear();
 }
 public bool containsKey(Object key){
-Object v;
+ObjRef v;
-return map.get(key, v );
+ObjRef keyr = ObjRef(key);
+return map.get(keyr, v );
 }
 public bool containsKey(String key){
 return containsKey(stringcast(key));
 }
 public bool containsValue(Object value){
-Object v = (value is null) ? NULL : value;
+ObjRef valuer = ObjRef(value);
-return map.contains(v);
+return map.contains(valuer);
 }
 public Set  entrySet(){
 HashSet res = new HashSet();
 foreach( k, v; map ){
-res.add( new MapEntry(this,k));
+res.add( new MapEntry(this,k.obj));
 }
 return res;
 }
 public override int opEquals(Object o){
 if( auto other = cast(HashMap) o ){
 if( other.size() !is size() ){
 return false;
 }
 foreach( k, v; map ){
-Object vo = other.get(k);
+auto vo = other.get(k.obj);
 if( v != vo ){
 return false;
 }
 }
 return true;
 }
 return false;
 }
 public Object get(Object key){
-if( auto v = key in map ){
+ObjRef keyr = ObjRef(key);
-if( *v is NULL ) return null;
+if( auto v = keyr in map ){
-return *v;
+return (*v).obj;
 }
 return null;
 }
 public Object get(String key){
 return get(stringcast(key));
 return map.isEmpty();
 }
 public Set    keySet(){
 HashSet res = new HashSet();
 foreach( k, v; map ){
-res.add(k);
+res.add(k.obj);
 }
 return res;
 }
 public Object put(Object key, Object value){
-Object v = (value is null) ? NULL : value;
+ObjRef valuer = ObjRef(value);
+ObjRef keyr = ObjRef(key);
 Object res = null;
-if( auto vold = key in map ){
+if( auto vold = keyr in map ){
-res = *vold;
+res = (*vold).obj;
 }
-map[ key ] = v;
+map[ keyr ] = valuer;
 return res;
 }
 public Object put(String key, Object value){
 return put( stringcast(key), value );
 }
 public Object put(String key, String value){
 return put( stringcast(key), stringcast(value) );
 }
 public void   putAll(Map t){
 foreach( k, v; t ){
-Object vi = (v is null) ? NULL : v;
+map[ObjRef(k)] = ObjRef(v);
-map[k] = vi;
 }
 }
 public Object remove(Object key){
-if( auto v = key in map ){
+ObjRef keyr = ObjRef(key);
-Object res = *v;
+if( auto v = keyr in map ){
-map.remove(key);
+Object res = (*v).obj;
-if( res is NULL ) return null;
+map.remove(keyr);
 return res;
 }
-map.remove(key);
+map.remove(keyr);
 return null;
 }
 public Object remove(String key){
 return remove(stringcast(key));
 }
 return map.size();
 }
 public Collection values(){
 ArrayList res = new ArrayList( size() );
 foreach( k, v; map ){
-res.add( v );
+res.add( v.obj );
 }
 return res;
 }
 public int opApply (int delegate(ref Object value) dg){
-return map.opApply( dg );
+int ldg( ref ObjRef or ){
+return dg( or.obj );
+}
+return map.opApply( &ldg );
 }
 public int opApply (int delegate(ref Object key, ref Object value) dg){
-return map.opApply( dg );
+int ldg( ref ObjRef key, ref ObjRef value ){
+return dg( key.obj, value.obj );
+}
+return map.opApply( &ldg );
 }
 }
 class IdentityHashMap : Map {

Mercurial > projects > dwt-addons

comparison dwtx/dwtxhelper/Collection.d @ 195:a4d38d47ddc4