Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added maximum number of items when matching identifier.

Browse Source
This commit is contained in:
Бранимир Караџић
2019-01-16 16:09:54 -08:00
parent 1a2c2cd4a0
commit c90debcfff
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bx/string.h
View File

@@ -261,7 +261,7 @@ namespace bx
StringView findIdentifierMatch(const StringView& _str, const StringView& _word);
/// Finds any identifier from NULL terminated array of identifiers.
StringView findIdentifierMatch(const StringView& _str, const char** _words);
StringView findIdentifierMatch(const StringView& _str, const char** _words, int32_t _num = INT32_MAX);
/// Cross platform implementation of vsnprintf that returns number of
/// characters which would have been written to the final string if

5
src/string.cpp
View File

@@ -687,9 +687,10 @@ namespace bx
return StringView(_str.getTerm(), _str.getTerm() );
}
StringView findIdentifierMatch(const StringView& _str, const char** _words)
StringView findIdentifierMatch(const StringView& _str, const char** _words, int32_t _num)
{
for (StringView word = *_words; !word.isEmpty(); ++_words, word = *_words)
int32_t ii = 0;
for (StringView word = *_words; ii < _num && !word.isEmpty(); ++ii, ++_words, word = *_words)
{
StringView match = findIdentifierMatch(_str, word);
if (!match.isEmpty() )