Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed incorrect substring usage in find #421

Merged
merged 2 commits into from
Jul 11, 2016
Merged

Fixed incorrect substring usage in find #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f28118
Fixed incorrect substring usage in find
nilsms Jul 11, 2016
6969b3a
added test case for find with initialIndex
nilsms Jul 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/strings/fnc_find.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if(_initialIndex < 1) then {
if(_initialIndex > (count _haystack) ) exitWith {
-1
};
private _tempString = [_haystack, _initialIndex, ((count _haystack) - _initialIndex)] call CBA_fnc_substring;
private _tempString = [_haystack, _initialIndex] call CBA_fnc_substr;
_ret = _tempString find _needle;
if(_ret > -1) then {
_ret = _ret + _initialIndex;
Expand Down
3 changes: 3 additions & 0 deletions addons/strings/test_strings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ TEST_OP(_pos,==,-1,_fn);
_pos = ["frofrog", "frog"] call CBA_fnc_find;
TEST_OP(_pos,==,3,_fn);

_pos = ["frog-headed fish", "f", 5] call CBA_fnc_find;
TEST_OP(_pos,==,12,_fn);

// ----------------------------------------------------------------------------
// UNIT TESTS (stringSplit)
_fn = "CBA_fnc_split";
Expand Down