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

Replaced strmb with strFindBlock.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-10-28 16:58:32 -07:00
parent e8a738089e
commit 7cdcfdc94b
3 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/bx/string.h
View File

@@ -248,11 +248,11 @@ namespace bx
/// Returns StringView of word or empty.
StringView strWord(const StringView& _str);
///
StringView strSubstr(const StringView& _str, int32_t _start, int32_t _len);
/// Returns substring in string.
StringView strSubstr(const StringView& _str, int32_t _start, int32_t _len = INT32_MAX);
/// Find matching block.
const char* strmb(const char* _str, char _open, char _close);
StringView strFindBlock(const StringView& _str, char _open, char _close);
// Normalize string to sane line endings.
void eolLF(char* _out, int32_t _size, const char* _str);

29
src/string.cpp
View File

@@ -606,26 +606,41 @@ namespace bx
return StringView(ptr, term);
}
const char* strmb(const char* _str, char _open, char _close)
StringView strFindBlock(const StringView& _str, char _open, char _close)
{
int count = 0;
for (char ch = *_str++; ch != '\0' && count >= 0; ch = *_str++)
const char* curr = _str.getPtr();
const char* term = _str.getTerm();
const char* start = NULL;
int32_t count = 0;
for (char ch = *curr; curr != term && count >= 0; ch = *(++curr) )
{
if (ch == _open)
{
count++;
if (0 == count)
{
start = curr;
}
++count;
}
else if (ch == _close)
{
count--;
--count;
if (NULL == start)
{
break;
}
if (0 == count)
{
return _str-1;
return StringView(start, curr+1);
}
}
}
return NULL;
return StringView(term, term);
}
void eolLF(char* _out, int32_t _size, const char* _str)

10
tests/string_test.cpp
View File

@@ -457,3 +457,13 @@ TEST_CASE("strWord", "")
REQUIRE(bx::strWord(" abvgd-1389.0").isEmpty() );
REQUIRE(0 == bx::strCmp(bx::strWord("abvgd-1389.0"), "abvgd") );
}
TEST_CASE("strFindBlock", "")
{
const bx::StringView test0("{ { {} {} abvgd; {} } }");
const bx::StringView test1(test0, 1);
bx::StringView result = bx::strFindBlock(test1, '{', '}');
printf("%.*s", result.getLength(), result.getPtr() );
REQUIRE(19 == result.getLength() );
}