OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

allow range format to be specified positionally

master
Daniel Kolesa 2015-07-04 01:14:33 +01:00
parent 55dc5bdf34
commit 47a98592f0
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
octa/format.hh
View File

@ -131,6 +131,8 @@ struct FormatSpec {
const char *nested_sep = nullptr;
octa::Size nested_sep_len = 0;
bool is_nested = false;
template<typename R>
bool read_until_spec(R &writer, octa::Size *wret) {
octa::Size written = 0;
@ -195,7 +197,10 @@ private:
bool read_spec_range() {
p_fmt++;
const char *begin_inner = p_fmt;
if (!read_until_dummy()) return false;
if (!read_until_dummy()) {
is_nested = false;
return false;
}
/* find delimiter or ending */
const char *begin_delim = p_fmt;
const char *p = strchr(begin_delim, '%');
@ -213,6 +218,7 @@ private:
nested_sep = begin_delim;
nested_sep_len = p - nested_sep - 1;
p_fmt = ++p;
is_nested = true;
return true;
}
if (*p == '|') {
@ -225,12 +231,15 @@ private:
if (*p == ')') {
nested_sep_len = p - nested_sep - 1;
p_fmt = ++p;
is_nested = true;
return true;
}
}
is_nested = false;
return false;
}
}
is_nested = false;
return false;
}
@ -252,6 +261,10 @@ private:
havepos = true;
}
if (havepos && (*p_fmt == '(')) {
return read_spec_range();
}
/* parse flags */
flags = 0;
octa::Size skipd = 0;