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

vsnprintf now can take StringView as argument.

Browse Source
This commit is contained in:
Бранимир Караџић
2021-10-03 16:11:27 -07:00
parent 70f998ba19
commit f5c797a03a
5 changed files with 133 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/string.cpp
View File

@@ -813,6 +813,11 @@ namespace bx
return write(_writer, _str, _param.prec, _param, _err);
}
static int32_t write(WriterI* _writer, const StringView& _str, const Param& _param, Error* _err)
{
return write(_writer, _str.getPtr(), min(_param.prec, _str.getLength() ), _param, _err);
}
static int32_t write(WriterI* _writer, int32_t _i, const Param& _param, Error* _err)
{
char str[33];
@@ -939,12 +944,15 @@ namespace bx
}
else if ('%' == ch)
{
// %[flags][width][.precision][length sub-specifier]specifier
// %[Flags][Width][.Precision][Leegth]Type
read(&reader, ch, &err);
Param param;
// flags
// Reference(s):
// - Flags field
// https://en.wikipedia.org/wiki/Printf_format_string#Flags_field
//
while (err.isOk()
&& ( ' ' == ch
|| '-' == ch
@@ -971,7 +979,10 @@ namespace bx
param.fill = ' ';
}
// width
// Reference(s):
// - Width field
// https://en.wikipedia.org/wiki/Printf_format_string#Width_field
//
if ('*' == ch)
{
read(&reader, ch, &err);
@@ -994,7 +1005,9 @@ namespace bx
}
}
// .precision
// Reference(s):
// - Precision field
// https://en.wikipedia.org/wiki/Printf_format_string#Precision_field
if ('.' == ch)
{
read(&reader, ch, &err);
@@ -1016,7 +1029,9 @@ namespace bx
}
}
// length sub-specifier
// Reference(s):
// - Length field
// https://en.wikipedia.org/wiki/Printf_format_string#Length_field
while (err.isOk()
&& ( 'h' == ch
|| 'I' == ch
@@ -1031,8 +1046,8 @@ namespace bx
default: break;
case 'j': param.bits = sizeof(intmax_t )*8; break;
case 't': param.bits = sizeof(size_t )*8; break;
case 'z': param.bits = sizeof(ptrdiff_t)*8; break;
case 't': param.bits = sizeof(ptrdiff_t)*8; break;
case 'z': param.bits = sizeof(size_t )*8; break;
case 'h': case 'I': case 'l':
switch (ch)
@@ -1071,7 +1086,9 @@ namespace bx
break;
}
// specifier
// Reference(s):
// - Type field
// https://en.wikipedia.org/wiki/Printf_format_string#Type_field
switch (toLower(ch) )
{
case 'c':
@@ -1079,7 +1096,14 @@ namespace bx
break;
case 's':
size += write(_writer, va_arg(_argList, const char*), param, _err);
if (isUpper(ch) )
{
size += write(_writer, va_arg(_argList, const StringView), param, _err);
}
else
{
size += write(_writer, va_arg(_argList, const char*), param, _err);
}
break;
case 'o':
@@ -1131,6 +1155,10 @@ namespace bx
}
break;
case 'n':
*va_arg(_argList, int32_t*) = size;
break;
default:
size += write(_writer, ch, _err);
break;