Merge pull request #1377 from CBATeam/hashArrayDeep

hashValues - don't copy arrays
CBATeam · Nov 3, 2020 · 311e599 · 311e599
2 parents fc63a09 + 0a5a938
commit 311e599
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/addons/hashes/fnc_hashKeys.sqf b/addons/hashes/fnc_hashKeys.sqf
@@ -22,4 +22,4 @@ SCRIPT(hashKeys);
 // -----------------------------------------------------------------------------
 params [["_hash", [[], []], [[]]]];
 
-+(_hash select HASH_KEYS)
+[] + (_hash select HASH_KEYS) // flat-copy
diff --git a/addons/hashes/fnc_hashValues.sqf b/addons/hashes/fnc_hashValues.sqf
@@ -22,4 +22,4 @@ SCRIPT(hashValues);
 // -----------------------------------------------------------------------------
 params [["_hash", [[], []], [[]]]];
 
-+(_hash select HASH_VALUES)
+ [] + (_hash select HASH_VALUES) // flat-copy
diff --git a/addons/hashes/test_hashes.sqf b/addons/hashes/test_hashes.sqf
@@ -18,6 +18,7 @@ TEST_DEFINED("CBA_fnc_hashHasKey","");
 TEST_DEFINED("CBA_fnc_isHash","");
 TEST_DEFINED("CBA_fnc_hashSize","");
 TEST_DEFINED("CBA_fnc_hashKeys","");
+TEST_DEFINED("CBA_fnc_hashValues","");
 
 TEST_FALSE([[]] call CBA_fnc_isHash,"CBA_fnc_isHash");
 _hash = [5, [4], [1], 2]; // Not a real hash.
@@ -128,4 +129,38 @@ TEST_OP(_keys,isEqualTo,[],"hashKeys");
 _keys = [_hash] call CBA_fnc_hashKeys;
 TEST_OP(_keys,isEqualTo,[ARR_3("123","124",125)],"hashKeys");
 
+// Using an array as a key
+_hash = [] call CBA_fnc_hashCreate;
+private _arrayKey = [];
+[_hash, _arrayKey, "whyWouldYouDoThis"] call CBA_fnc_hashSet;
+_keys = [_hash] call CBA_fnc_hashKeys;
+(_keys select 0) pushBack 7;
+TEST_OP(_arrayKey,isEqualTo,[7],"hashKeysDepth");
+_result = [_hash, [7]] call CBA_fnc_hashGet;
+TEST_OP(_result,==,"whyWouldYouDoThis","hashKeysDepth");
+
+// Test CBA_fnc_hashValues
+_hash = [] call CBA_fnc_hashCreate;
+private _values = [_hash] call CBA_fnc_hashValues;
+TEST_OP(_values,isEqualTo,[],"hashValues - empty");
+
+[_hash, "a", 1] call CBA_fnc_hashSet;
+[_hash, "b", 2] call CBA_fnc_hashSet;
+_values = [_hash] call CBA_fnc_hashValues;
+TEST_OP(_values,isEqualTo,[ARR_2(1,2)],"hashValues - values");
+
+[_hash, "a"] call CBA_fnc_hashRem;
+_values = [_hash] call CBA_fnc_hashValues;
+TEST_OP(_values,isEqualTo,[2],"hashValues - removed");
+
+_hash = [] call CBA_fnc_hashCreate;
+private _data = [3];
+[_hash, "c", _data] call CBA_fnc_hashSet;
+_values = [_hash] call CBA_fnc_hashValues;
+TEST_OP(_values,isEqualTo,[[3]],"hashValues - array");
+
+_data pushBack [7];
+TEST_OP(_values,isEqualTo,[[ARR_2(3,[7])]],"hashValues - deep array copy");
+
+
 nil;