From 1e334b9983c3e6165800813f5ede209a8faafc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 25 Oct 2018 22:16:26 -0700 Subject: [PATCH] Cleanup. --- include/bx/inline/string.inl | 5 +++++ include/bx/string.h | 6 +++--- src/string.cpp | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/bx/inline/string.inl b/include/bx/inline/string.inl index 0683f37..a387128 100644 --- a/include/bx/inline/string.inl +++ b/include/bx/inline/string.inl @@ -236,4 +236,9 @@ namespace bx } } + inline StringView strSubstr(const StringView& _str, int32_t _start, int32_t _len) + { + return StringView(_str, _start, _len); + } + } // namespace bx diff --git a/include/bx/string.h b/include/bx/string.h index 132afa1..196e547 100644 --- a/include/bx/string.h +++ b/include/bx/string.h @@ -245,12 +245,12 @@ namespace bx /// Find end of line. Retuns pointer to new line terminator. StringView strFindEol(const StringView& _str); - /// Returns pointer to first character after word. - const char* strSkipWord(const char* _str, int32_t _max = INT32_MAX); - /// Returns StringView of word or empty. StringView strWord(const StringView& _str); + /// + StringView strSubstr(const StringView& _str, int32_t _start, int32_t _len); + /// Find matching block. const char* strmb(const char* _str, char _open, char _close); diff --git a/src/string.cpp b/src/string.cpp index 649323a..f7815e9 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -593,7 +593,7 @@ namespace bx return StringView(_str.getTerm(), _str.getTerm() ); } - const char* strSkipWord(const char* _str, int32_t _max) + static const char* strSkipWord(const char* _str, int32_t _max) { for (char ch = *_str++; 0 < _max && (isAlphaNum(ch) || '_' == ch); ch = *_str++, --_max) {}; return _str-1;