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

StringView cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-10-20 11:14:05 -07:00
parent c25a405a80
commit 0af3748629
12 changed files with 281 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bx/commandline.h
View File

@@ -12,7 +12,7 @@ namespace bx
{
/// Reference:
/// http://msdn.microsoft.com/en-us/library/a1y7w461.aspx
const char* tokenizeCommandLine(const StringView& _commandLine, char* _buffer, uint32_t& _bufferSize, int32_t& _argc, char* _argv[], int32_t _maxArgvs, char _term = '\0');
StringView tokenizeCommandLine(const StringView& _commandLine, char* _buffer, uint32_t& _bufferSize, int32_t& _argc, char* _argv[], int32_t _maxArgvs, char _term = '\0');
///
class CommandLine

8
include/bx/filepath.h
View File

@@ -85,19 +85,19 @@ namespace bx
/// If path is `/abv/gd/555/333/pod.mac` returns `/abv/gd/555/333/`.
///
const StringView getPath() const;
StringView getPath() const;
/// If path is `/abv/gd/555/333/pod.mac` returns `pod.mac`.
///
const StringView getFileName() const;
StringView getFileName() const;
/// If path is `/abv/gd/555/333/pod.mac` returns `pod`.
///
const StringView getBaseName() const;
StringView getBaseName() const;
/// If path is `/abv/gd/555/333/pod.mac` returns `.mac`.
///
const StringView getExt() const;
StringView getExt() const;
/// Returns true if file path is absolute.
///

33
include/bx/inline/string.inl
View File

@@ -75,6 +75,21 @@ namespace bx
return *this;
}
inline StringView::StringView(char* _ptr)
{
set(_ptr, INT32_MAX);
}
inline StringView::StringView(const char* _ptr)
{
set(_ptr, INT32_MAX);
}
inline StringView::StringView(char* _ptr, int32_t _len)
{
set(_ptr, _len);
}
inline StringView::StringView(const char* _ptr, int32_t _len)
{
set(_ptr, _len);
@@ -91,18 +106,24 @@ namespace bx
set(_container);
}
inline void StringView::set(char* _ptr)
{
set(_ptr, INT32_MAX);
}
inline void StringView::set(const char* _ptr)
{
set(_ptr, INT32_MAX);
}
inline void StringView::set(const char* _ptr, int32_t _len)
{
clear();
if (NULL != _ptr)
{
int32_t len = strLen(_ptr, _len);
if (0 != len)
{
m_len = len;
m_ptr = _ptr;
}
m_len = INT32_MAX == _len ? strLen(_ptr) : _len;
m_ptr = _ptr;
}
}

56
include/bx/string.h
View File

@@ -37,7 +37,16 @@ namespace bx
StringView& operator=(const StringView& _rhs);
///
StringView(const char* _ptr, int32_t _len = INT32_MAX);
StringView(char* _ptr);
///
StringView(const char* _ptr);
///
StringView(char* _ptr, int32_t _len);
///
StringView(const char* _ptr, int32_t _len);
///
StringView(const char* _ptr, const char* _term);
@@ -47,7 +56,13 @@ namespace bx
explicit StringView(const Ty& _container);
///
void set(const char* _ptr, int32_t _len = INT32_MAX);
void set(char* _ptr);
///
void set(const char* _ptr);
///
void set(const char* _ptr, int32_t _len);
///
void set(const char* _ptr, const char* _term);
@@ -198,20 +213,26 @@ namespace bx
int32_t strCat(char* _dst, int32_t _dstSize, const StringView& _str, int32_t _num = INT32_MAX);
/// Find character in string. Limit search to _max characters.
const char* strFind(const StringView& _str, char _ch);
StringView strFind(const StringView& _str, char _ch);
/// Find character in string in reverse. Limit search to _max characters.
const char* strRFind(const StringView& _str, char _ch);
StringView strRFind(const StringView& _str, char _ch);
/// Find substring in string. Limit search to _max characters.
const char* strFind(const StringView& _str, const StringView& _find, int32_t _num = INT32_MAX);
StringView strFind(const StringView& _str, const StringView& _find, int32_t _num = INT32_MAX);
/// Find substring in string. Case insensitive. Limit search to _max characters.
const char* strFindI(const StringView& _str, const StringView& _find, int32_t _num = INT32_MAX);
StringView strFindI(const StringView& _str, const StringView& _find, int32_t _num = INT32_MAX);
/// Returns string view with characters _chars trimmed from left.
StringView strLTrim(const StringView& _str, const StringView& _chars);
/// Returns string view with whitespace characters trimmed from left.
StringView strLTrimSpace(const StringView& _str);
/// Returns string view with non-whitespace characters trimmed from left.
StringView strLTrimNonSpace(const StringView& _str);
/// Returns string view with characters _chars trimmed from right.
StringView strRTrim(const StringView& _str, const StringView& _chars);
@@ -219,25 +240,10 @@ namespace bx
StringView strTrim(const StringView& _str, const StringView& _chars);
/// Find new line. Returns pointer after new line terminator.
const char* strnl(const char* _str);
StringView strFindNl(const StringView& _str);
/// Find end of line. Retuns pointer to new line terminator.
const char* streol(const char* _str);
/// Find end of line. Retuns pointer to new line terminator.
const StringView strFindEol(const StringView& _str);
/// Skip whitespace.
const char* strws(const char* _str);
/// Skip whitespace.
const StringView strSkipSpace(const StringView& _str);
/// Skip non-whitespace.
const char* strnws(const char* _str);
/// Skip non-whitespace.
const StringView strSkipNonSpace(const StringView& _str);
StringView strFindEol(const StringView& _str);
/// Returns pointer to first character after word.
const char* strSkipWord(const char* _str, int32_t _max = INT32_MAX);
@@ -252,10 +258,10 @@ namespace bx
void eolLF(char* _out, int32_t _size, const char* _str);
// Finds identifier.
const char* findIdentifierMatch(const char* _str, const char* _word);
StringView findIdentifierMatch(const StringView& _str, const StringView& _word);
/// Finds any identifier from NULL terminated array of identifiers.
const char* findIdentifierMatch(const char* _str, const char* _words[]);
StringView findIdentifierMatch(const StringView& _str, const char** _words);
/// Cross platform implementation of vsnprintf that returns number of
/// characters which would have been written to the final string if