manual merge

CBATeam · Feb 25, 2016 · e6abdff · e6abdff
2 parents a74ab4e + e39c9e9
commit e6abdff
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 51 deletions.
diff --git a/addons/hashes/fnc_hashCreate.sqf b/addons/hashes/fnc_hashCreate.sqf
@@ -32,23 +32,10 @@ Author:
 SCRIPT(hashCreate);
 
 // -----------------------------------------------------------------------------
+params [["_array", [], [[]]], "_defaultValue"];
 
-DEFAULT_PARAM(0,_array,[]);
-DEFAULT_PARAM(1,_defaultValue,nil);
-private ["_keys", "_values"];
-
-_keys = [];
-_values = [];
-
-_keys resize (count _array);
-_values resize (count _array);
-
-for "_i" from 0 to ((count _array) - 1) do
-{
-    _keys set [_i, (_array select _i) select 0];
-    _values set [_i, (_array select _i) select 1];
-};
+private _keys = _array apply {_x select 0};
+private _values = _array apply {_x select 1};
 
 // Return.
-[TYPE_HASH, _keys, _values,
-    if (isNil "_defaultValue") then { nil } else { _defaultValue }];
+[TYPE_HASH, _keys, _values, _defaultValue];
diff --git a/addons/hashes/fnc_hashEachPair.sqf b/addons/hashes/fnc_hashEachPair.sqf
@@ -39,19 +39,13 @@ SCRIPT(hashEachPair);
 
 params ["_hash","_code"];
 
-private ["_keys", "_values"];
+_hash params ["", "_keys", "_values"];
 
-_keys = _hash select HASH_KEYS;
-_values = _hash select HASH_VALUES;
-
-for "_i" from 0 to ((count _keys) - 1) do
 {
-    private ["_key", "_value"];
-
-    _key = _keys select _i;
-    _value = _values select _i;
+    private _key = _x;
+    private _value = _values select _forEachIndex;
     TRACE_2("VM CHECK",_key,_value);
     call _code;
-};
+} forEach _keys;
 
 nil; // Return.
diff --git a/addons/hashes/fnc_hashGet.sqf b/addons/hashes/fnc_hashGet.sqf
@@ -23,21 +23,19 @@ Author:
 SCRIPT(hashGet);
 
 // -----------------------------------------------------------------------------
-private ["_index", "_default", "_new"];
+private ["_index", "_default"];
 params ["_hash","_key"];
 _default = param [2,_hash select HASH_DEFAULT_VALUE];
 
 _index = (_hash select HASH_KEYS) find _key;
-if (_index >= 0) then
-{
+if (_index >= 0) then {
     (_hash select HASH_VALUES) select _index; // Return.
 } else {
     if (isNil "_default") then {
         nil // Return
     } else {
         // Make a copy of the array instead!
-        if (typeName _default == "ARRAY") then
-        {
+        if (_default isEqualType []) then {
             _default = + _default;
         };
         _default // Return.

diff --git a/addons/hashes/fnc_hashRem.sqf b/addons/hashes/fnc_hashRem.sqf
@@ -25,9 +25,7 @@ SCRIPT(hashRem);
 // ----------------------------------------------------------------------------
 params ["_hash","_key"];
 
-private ["_defaultValue"];
-
-_defaultValue = _hash select HASH_DEFAULT_VALUE;
-[_hash, _key, if (isNil "_defaultValue") then { nil } else { _defaultValue }] call CBA_fnc_hashSet;
+private _defaultValue = _hash select HASH_DEFAULT_VALUE;
+[_hash, _key, _defaultValue] call CBA_fnc_hashSet;
 
 _hash; // Return.
diff --git a/addons/hashes/fnc_hashSet.sqf b/addons/hashes/fnc_hashSet.sqf
@@ -26,21 +26,15 @@ private ["_index", "_isDefault"];
 // ----------------------------------------------------------------------------
 params ["_hash","_key","_value"];
 
-if (isNil "_value") then { _value = nil};
 if (isNil "_key") exitWith {_hash};
-if (isNil "_hash") exitWith {_hash;};
-
-if (isNil "BIS_fnc_areEqual") then { LOG( "WARNING: BIS_fnc_areEqual is Nil") };
+if (isNil "_hash") exitWith {_hash};
 
 // Work out whether the new value is the default value for this assoc.
-_isDefault = [if (isNil "_value") then { nil } else { _value },
-    _hash select HASH_DEFAULT_VALUE] call (uiNamespace getVariable "BIS_fnc_areEqual");
+_isDefault = _value isEqualTo (_hash select HASH_DEFAULT_VALUE);
 
 _index = (_hash select HASH_KEYS) find _key;
-if (_index >= 0) then
-{
-    if (_isDefault) then
-    {
+if (_index >= 0) then {
+    if (_isDefault) then {
         // Remove the key, if the new value is the default value.
         // Do this by copying the key and value of the last element
         // in the hash to the position of the element to be removed.
@@ -63,8 +57,7 @@ if (_index >= 0) then
     };
 } else {
     // Ignore values that are the same as the default.
-    if (not _isDefault) then
-    {
+    if !(_isDefault) then {
         _hash select HASH_KEYS pushBack _key;
         _hash select HASH_VALUES pushBack _value;
     };

diff --git a/addons/hashes/fnc_isHash.sqf b/addons/hashes/fnc_isHash.sqf
@@ -25,9 +25,7 @@ SCRIPT(isHash);
 
 params ["_value"];
 
-private "_result";
-
-_result = false;
+private _result = false;
 
 if ((typeName _value) == "ARRAY" && {(count _value) == 4} && {(typeName (_value select HASH_ID)) == (typeName TYPE_HASH)}) then {
     _result = ((_value select HASH_ID) == TYPE_HASH);