//===----------------------------------------------------------------------===//
#include "llvm/Object/YAML.h"
+#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/raw_ostream.h"
+#include <cctype>
using namespace llvm;
using namespace object::yaml;
Val.writeAsHex(Out);
}
-// Can't find this anywhere else in the codebase (clang has one, but it has
-// some baggage). Deduplicate as required.
-static bool isHexDigit(uint8_t C) {
- return ('0' <= C && C <= '9') ||
- ('A' <= C && C <= 'F') ||
- ('a' <= C && C <= 'f');
-}
-
StringRef yaml::ScalarTraits<object::yaml::BinaryRef>::input(
StringRef Scalar, void *, object::yaml::BinaryRef &Val) {
if (Scalar.size() % 2 != 0)
// TODO: Can we improve YAMLIO to permit a more accurate diagnostic here?
// (e.g. a caret pointing to the offending character).
for (unsigned I = 0, N = Scalar.size(); I != N; ++I)
- if (!isHexDigit(Scalar[I]))
+ if (!isxdigit(Scalar[I]))
return "BinaryRef hex string must contain only hex digits.";
Val = object::yaml::BinaryRef(Scalar);
return StringRef();
}
void BinaryRef::writeAsHex(raw_ostream &OS) const {
+ if (binary_size() == 0)
+ return;
if (DataIsHexString) {
OS.write((const char *)Data.data(), Data.size());
return;