fixed bug with filter and tell that was throwing errors on nil params

dwringer · Oct 29, 2016 · 11bac4b · 11bac4b
1 parent 37f7c32
commit 11bac4b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/ClassDemo.Tanoa/classes/fnc_tell.sqf b/ClassDemo.Tanoa/classes/fnc_tell.sqf
@@ -21,4 +21,6 @@ _methods = [[["_method_list", "_msg"],
 _methods = [[["_x"], "not isNil ""_x"""] call fnc_lambdastr,
             _methods] call fnc_filter;
 _result = ([_instance] + _parameters) call (_methods select 0);
-_result;  // RETURN //////////////////////////////////////////////////////////
+if (not isNil "_result") then {
+	_result;
+};  // RETURN //////////////////////////////////////////////////////////
diff --git a/ClassDemo.Tanoa/lambda/fnc_filter.sqf b/ClassDemo.Tanoa/lambda/fnc_filter.sqf
@@ -1,6 +1,6 @@
 /////////////////////////////// fnc_filter ///////////////////////// 2016-10-21
-/*  Filter an array by application of a predicate   */
-//////////////////////////////////////////////////////
+/*  Filter an array by application of a predicate  */
+/////////////////////////////////////////////////////
 private [                //                                    
          "_fn",          // Function [IN/A0/B0]                        //
          "_arr",         // Array    [IN/A1/B1]                       //// 
@@ -19,8 +19,14 @@ if ((count _this) == 3) then {
 _acc = [];
 for "_i" from 0 to ((count _arr) - 1) do {
 	_elt = _arr select _i;
-	if (([_elt] + _extra_vars) call _fn) then {
-		_acc = _acc + [_elt];
+	if (not isNil "_elt") then {
+		if (([_elt] + _extra_vars) call _fn) then {
+			_acc = _acc + [_elt];
+		};
+        } else {
+		if (([nil] + _extra_vars) call _fn) then {
+			_acc = _acc + [_elt];
+		};
 	};
 };
 _acc;  // RETURN //////////////////////////////////////////////////////////////
diff --git a/classes/fnc_tell.sqf b/classes/fnc_tell.sqf
@@ -21,4 +21,6 @@ _methods = [[["_method_list", "_msg"],
 _methods = [[["_x"], "not isNil ""_x"""] call fnc_lambdastr,
             _methods] call fnc_filter;
 _result = ([_instance] + _parameters) call (_methods select 0);
-_result;  // RETURN //////////////////////////////////////////////////////////
+if (not isNil "_result") then {
+	_result;
+};  // RETURN //////////////////////////////////////////////////////////
diff --git a/lambda/fnc_filter.sqf b/lambda/fnc_filter.sqf
@@ -1,6 +1,6 @@
 /////////////////////////////// fnc_filter ///////////////////////// 2016-10-21
-/*  Filter an array by application of a predicate   */
-//////////////////////////////////////////////////////
+/*  Filter an array by application of a predicate  */
+/////////////////////////////////////////////////////
 private [                //                                    
          "_fn",          // Function [IN/A0/B0]                        //
          "_arr",         // Array    [IN/A1/B1]                       //// 
@@ -19,8 +19,14 @@ if ((count _this) == 3) then {
 _acc = [];
 for "_i" from 0 to ((count _arr) - 1) do {
 	_elt = _arr select _i;
-	if (([_elt] + _extra_vars) call _fn) then {
-		_acc = _acc + [_elt];
+	if (not isNil "_elt") then {
+		if (([_elt] + _extra_vars) call _fn) then {
+			_acc = _acc + [_elt];
+		};
+        } else {
+		if (([nil] + _extra_vars) call _fn) then {
+			_acc = _acc + [_elt];
+		};
 	};
 };
 _acc;  // RETURN //////////////////////////////////////////////////////////////