From 6acc982e74cd8a10d097c10254d7215028e7f036 Mon Sep 17 00:00:00 2001 From: Sean Silva Date: Wed, 5 Jun 2013 23:32:31 +0000 Subject: [PATCH] Rename BinaryRef::isBinary to more descriptive DataIsHexString. And add a doxygen comment. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183350 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/YAML.h | 17 +++++++++-------- lib/Object/YAML.cpp | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/llvm/Object/YAML.h b/include/llvm/Object/YAML.h index 92811b04eb3..41fe952456e 100644 --- a/include/llvm/Object/YAML.h +++ b/include/llvm/Object/YAML.h @@ -27,26 +27,27 @@ class BinaryRef { /// \brief Either raw binary data, or a string of hex bytes (must always /// be an even number of characters). ArrayRef Data; - bool isBinary; + /// \brief Discriminator between the two states of the `Data` member. + bool DataIsHexString; public: - BinaryRef(ArrayRef Data) : Data(Data), isBinary(true) {} + BinaryRef(ArrayRef Data) : Data(Data), DataIsHexString(false) {} BinaryRef(StringRef Data) : Data(reinterpret_cast(Data.data()), Data.size()), - isBinary(false) {} - BinaryRef() : isBinary(false) {} + DataIsHexString(true) {} + BinaryRef() : DataIsHexString(true) {} StringRef getHex() const { - assert(!isBinary); + assert(DataIsHexString); return StringRef(reinterpret_cast(Data.data()), Data.size()); } ArrayRef getBinary() const { - assert(isBinary); + assert(!DataIsHexString); return Data; } /// \brief The number of bytes that are represented by this BinaryRef. /// This is the number of bytes that writeAsBinary() will write. ArrayRef::size_type binary_size() const { - if (!isBinary) + if (DataIsHexString) return Data.size() / 2; return Data.size(); } @@ -55,7 +56,7 @@ public: if (Ref.Data.empty() && Data.empty()) return true; - return Ref.isBinary == isBinary && Ref.Data == Data; + return Ref.DataIsHexString == DataIsHexString && Ref.Data == Data; } /// \brief Write the contents (regardless of whether it is binary or a /// hex string) as binary to the given raw_ostream. diff --git a/lib/Object/YAML.cpp b/lib/Object/YAML.cpp index b33cf3410f6..cf6e616241f 100644 --- a/lib/Object/YAML.cpp +++ b/lib/Object/YAML.cpp @@ -51,7 +51,7 @@ StringRef yaml::ScalarTraits::input( } void BinaryRef::writeAsBinary(raw_ostream &OS) const { - if (isBinary) { + if (!DataIsHexString) { OS.write((const char *)Data.data(), Data.size()); return; }