Add writeAsHex(raw_ostream &) method to BinaryRef.

This hides the implementation. A future commit will remove the
error-prone getHex() and getBinary() methods.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183352 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Silva 2013-06-05 23:47:23 +00:00
parent c170230b3a
commit 4370ddb8b8
2 changed files with 19 additions and 7 deletions

View File

@ -61,6 +61,11 @@ public:
/// \brief Write the contents (regardless of whether it is binary or a
/// hex string) as binary to the given raw_ostream.
void writeAsBinary(raw_ostream &OS) const;
/// \brief Write the contents (regardless of whether it is binary or a
/// hex string) as hex to the given raw_ostream.
///
/// For example, a possible output could be `DEADBEEFCAFEBABE`.
void writeAsHex(raw_ostream &OS) const;
};
}

View File

@ -20,13 +20,7 @@ using namespace object::yaml;
void yaml::ScalarTraits<object::yaml::BinaryRef>::output(
const object::yaml::BinaryRef &Val, void *, llvm::raw_ostream &Out) {
ArrayRef<uint8_t> Data = Val.getBinary();
for (ArrayRef<uint8_t>::iterator I = Data.begin(), E = Data.end(); I != E;
++I) {
uint8_t Byte = *I;
Out << hexdigit(Byte >> 4);
Out << hexdigit(Byte & 0xf);
}
Val.writeAsHex(Out);
}
// Can't find this anywhere else in the codebase (clang has one, but it has
@ -61,3 +55,16 @@ void BinaryRef::writeAsBinary(raw_ostream &OS) const {
OS.write(Byte);
}
}
void BinaryRef::writeAsHex(raw_ostream &OS) const {
if (DataIsHexString) {
OS.write((const char *)Data.data(), Data.size());
return;
}
for (ArrayRef<uint8_t>::iterator I = Data.begin(), E = Data.end(); I != E;
++I) {
uint8_t Byte = *I;
OS << hexdigit(Byte >> 4);
OS << hexdigit(Byte & 0xf);
}
}