Store bools as objects in Hashes, since the Dynamic-Bool conversion is optimized, and so the type information is kept. Closes HaxeFoundation#162.

hughsando · hughsando · commit 2bd0f967e0ec · 2015-01-27T13:39:16.000+08:00
diff --git a/src/hx/Hash.cpp b/src/hx/Hash.cpp
@@ -33,13 +33,13 @@ void __int_hash_set(Dynamic &ioHash,int inKey,const Dynamic &value)
       else
       {
          ObjectType type = (ObjectType)value->__GetType();
-         if (type==vtBool || type==vtInt)
+         if (type==vtInt)
             hash = new IntHashInt();
          else if (type==vtFloat)
             hash = new IntHashFloat();
          else if (type==vtString)
             hash = new IntHashString();
-         else
+         else // Object or bool
             hash = new IntHashObject();
       }
       #endif
@@ -51,7 +51,7 @@ void __int_hash_set(Dynamic &ioHash,int inKey,const Dynamic &value)
       if (value!=null())
       {
          ObjectType type = (ObjectType)value->__GetType();
-         if (type==vtBool || type==vtInt)
+         if ( type==vtInt)
          {
             if (hash->store==hashFloat)
                want = hashFloat;
@@ -222,7 +222,7 @@ void __string_hash_set(Dynamic &ioHash,String inKey,const Dynamic &value, bool i
       else
       {
          ObjectType type = (ObjectType)value->__GetType();
-         if (type==vtBool || type==vtInt)
+         if (type==vtInt)
          {
             hash = new StringHashInt();
          }
@@ -242,7 +242,7 @@ void __string_hash_set(Dynamic &ioHash,String inKey,const Dynamic &value, bool i
       if (value!=null())
       {
          ObjectType type = (ObjectType)value->__GetType();
-         if (type==vtBool || type==vtInt)
+         if (type==vtInt)
          {
             if (hash->store==hashFloat)
                want = hashFloat;
@@ -422,7 +422,7 @@ void __object_hash_set(Dynamic &ioHash,Dynamic inKey,const Dynamic &value,bool i
       else
       {
          ObjectType type = (ObjectType)value->__GetType();
-         if (type==vtBool || type==vtInt)
+         if (type==vtInt)
          {
             hash = inWeakKeys ? (DynamicHashBase *)new WeakDynamicHashInt() :
                                 (DynamicHashBase *)new DynamicHashInt();
@@ -446,7 +446,7 @@ void __object_hash_set(Dynamic &ioHash,Dynamic inKey,const Dynamic &value,bool i
       if (value!=null())
       {
          ObjectType type = (ObjectType)value->__GetType();
-         if (type==vtBool || type==vtInt)
+         if (type==vtInt)
          {
             if (hash->store==hashFloat)
                want = hashFloat;

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,13 @@ void __int_hash_set(Dynamic &ioHash,int inKey,const Dynamic &value)`
`33`	`33`	`else`
`34`	`34`	`{`
`35`	`35`	`ObjectType type = (ObjectType)value->__GetType();`
`36`		`- if (type==vtBool \|\| type==vtInt)`
	`36`	`+ if (type==vtInt)`
`37`	`37`	`hash = new IntHashInt();`
`38`	`38`	`else if (type==vtFloat)`
`39`	`39`	`hash = new IntHashFloat();`
`40`	`40`	`else if (type==vtString)`
`41`	`41`	`hash = new IntHashString();`
`42`		`- else`
	`42`	`+ else // Object or bool`
`43`	`43`	`hash = new IntHashObject();`
`44`	`44`	`}`
`45`	`45`	`#endif`
`@@ -51,7 +51,7 @@ void __int_hash_set(Dynamic &ioHash,int inKey,const Dynamic &value)`
`51`	`51`	`if (value!=null())`
`52`	`52`	`{`
`53`	`53`	`ObjectType type = (ObjectType)value->__GetType();`
`54`		`- if (type==vtBool \|\| type==vtInt)`
	`54`	`+ if ( type==vtInt)`
`55`	`55`	`{`
`56`	`56`	`if (hash->store==hashFloat)`
`57`	`57`	`want = hashFloat;`
`@@ -222,7 +222,7 @@ void __string_hash_set(Dynamic &ioHash,String inKey,const Dynamic &value, bool i`
`222`	`222`	`else`
`223`	`223`	`{`
`224`	`224`	`ObjectType type = (ObjectType)value->__GetType();`
`225`		`- if (type==vtBool \|\| type==vtInt)`
	`225`	`+ if (type==vtInt)`
`226`	`226`	`{`
`227`	`227`	`hash = new StringHashInt();`
`228`	`228`	`}`
`@@ -242,7 +242,7 @@ void __string_hash_set(Dynamic &ioHash,String inKey,const Dynamic &value, bool i`
`242`	`242`	`if (value!=null())`
`243`	`243`	`{`
`244`	`244`	`ObjectType type = (ObjectType)value->__GetType();`
`245`		`- if (type==vtBool \|\| type==vtInt)`
	`245`	`+ if (type==vtInt)`
`246`	`246`	`{`
`247`	`247`	`if (hash->store==hashFloat)`
`248`	`248`	`want = hashFloat;`
`@@ -422,7 +422,7 @@ void __object_hash_set(Dynamic &ioHash,Dynamic inKey,const Dynamic &value,bool i`
`422`	`422`	`else`
`423`	`423`	`{`
`424`	`424`	`ObjectType type = (ObjectType)value->__GetType();`
`425`		`- if (type==vtBool \|\| type==vtInt)`
	`425`	`+ if (type==vtInt)`
`426`	`426`	`{`
`427`	`427`	`hash = inWeakKeys ? (DynamicHashBase *)new WeakDynamicHashInt() :`
`428`	`428`	`(DynamicHashBase *)new DynamicHashInt();`
`@@ -446,7 +446,7 @@ void __object_hash_set(Dynamic &ioHash,Dynamic inKey,const Dynamic &value,bool i`
`446`	`446`	`if (value!=null())`
`447`	`447`	`{`
`448`	`448`	`ObjectType type = (ObjectType)value->__GetType();`
`449`		`- if (type==vtBool \|\| type==vtInt)`
	`449`	`+ if (type==vtInt)`
`450`	`450`	`{`
`451`	`451`	`if (hash->store==hashFloat)`
`452`	`452`	`want = hashFloat;`