leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow formatting C strings as pointers (#223)

Browse Source
This commit is contained in:
vitaut
2015-11-09 07:17:36 -08:00
parent 7c24973637
commit 8b86a74ad5
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
format.cc
+16 -3
View File
@@ -409,6 +409,12 @@ class BasicArgFormatter : public ArgVisitor<Impl, void> {
FMT_DISALLOW_COPY_AND_ASSIGN(BasicArgFormatter);
void write_pointer(const void *p) {
spec_.flags_ = HASH_FLAG;
spec_.type_ = 'x';
writer_.write_int(reinterpret_cast<uintptr_t>(p), spec_);
}
protected:
BasicWriter<Char> &writer() { return writer_; }
const FormatSpec &spec() const { return spec_; }
@@ -462,6 +468,15 @@ class BasicArgFormatter : public ArgVisitor<Impl, void> {
*out = internal::CharTraits<Char>::cast(value);
}
void visit_cstring(const char *value) {
if (spec_.type_ == 'p') {
write_pointer(value);
return;
}
Arg::StringValue<char> str = {value, 0};
writer_.write_str(str, spec_);
}
void visit_string(Arg::StringValue<char> value) {
writer_.write_str(value, spec_);
}
@@ -475,9 +490,7 @@ class BasicArgFormatter : public ArgVisitor<Impl, void> {
void visit_pointer(const void *value) {
if (spec_.type_ && spec_.type_ != 'p')
report_unknown_type(spec_.type_, "pointer");
spec_.flags_ = HASH_FLAG;
spec_.type_ = 'x';
writer_.write_int(reinterpret_cast<uintptr_t>(value), spec_);
write_pointer(value);
}
};