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

unify string format

master
Daniel Kolesa 2015-07-03 21:50:02 +01:00
parent a984ee7026
commit 69b31e439c
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
octa/format.hh
View File

@ -298,12 +298,11 @@ namespace detail {
/* C string */
template<typename R>
octa::Ptrdiff write(R &writer, const char *val) {
octa::Ptrdiff write(R &writer, const char *val, octa::Size n) {
if (this->spec != 's') {
assert(false && "cannot format strings with the given spec");
return -1;
}
octa::Size n = strlen(val);
octa::Ptrdiff r = n;
r += this->write_ws(writer, n, true);
writer.put_n(val, n);
@ -311,19 +310,15 @@ namespace detail {
return r;
}
template<typename R>
octa::Ptrdiff write(R &writer, const char *val) {
return write(writer, val, strlen(val));
}
/* OctaSTD string */
template<typename R, typename A>
octa::Ptrdiff write(R &writer, const octa::AnyString<A> &val) {
if (this->spec != 's') {
assert(false && "cannot format strings with the given spec");
return -1;
}
octa::Size n = val.size();
octa::Ptrdiff r = n;
r += this->write_ws(writer, n, true);
writer.put_n(val.data(), n);
r += this->write_ws(writer, n, false);
return r;
return write(writer, val.data(), val.size());
}
/* character */