RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[YAMLTraits] Add trait for char"

Browse Source 
This reverts commit fab08bf4899e40d02d8bf394a63499ac679ac61c.  It has left
the Solaris buildbots broken for a week and a half as reported
in https://reviews.llvm.org/D79745.
This commit is contained in:
Rainer Orth 2020-05-21 17:33:42 +02:00
parent ff25a24574
commit aa8832a483
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/Support/YAMLTraits.h
View File

@ -1159,12 +1159,6 @@ struct ScalarTraits<bool> {
static QuotingType mustQuote(StringRef) { return QuotingType::None; }
};
template <> struct ScalarTraits<char> {
static void output(const char &, void *, raw_ostream &);
static StringRef input(StringRef, void *, char &);
static QuotingType mustQuote(StringRef S) { return needsQuotes(S); }
};
template<>
struct ScalarTraits<StringRef> {
static void output(const StringRef &, void *, raw_ostream &);

11
lib/Support/YAMLTraits.cpp
View File

@ -864,17 +864,6 @@ StringRef ScalarTraits<bool>::input(StringRef Scalar, void *, bool &Val) {
return "invalid boolean";
}
void ScalarTraits<char>::output(const char &Val, void *, raw_ostream &Out) {
Out << Val;
}
StringRef ScalarTraits<char>::input(StringRef Scalar, void *, char &Val) {
if (Scalar.size() != 1)
return "invalid character";
Val = Scalar[0];
return StringRef();
}
void ScalarTraits<StringRef>::output(const StringRef &Val, void *,
raw_ostream &Out) {
Out << Val;

8
unittests/Support/YAMLIOTest.cpp
View File

@ -333,7 +333,6 @@ struct BuiltInTypes {
uint16_t u16;
uint8_t u8;
bool b;
char c;
int64_t s64;
int32_t s32;
int16_t s16;
@ -358,7 +357,6 @@ namespace yaml {
io.mapRequired("u16", bt.u16);
io.mapRequired("u8", bt.u8);
io.mapRequired("b", bt.b);
io.mapRequired("c", bt.c);
io.mapRequired("s64", bt.s64);
io.mapRequired("s32", bt.s32);
io.mapRequired("s16", bt.s16);
@ -388,7 +386,6 @@ TEST(YAMLIO, TestReadBuiltInTypes) {
"u16: 65000\n"
"u8: 255\n"
"b: false\n"
"c: 'c'\n"
"s64: -5000000000\n"
"s32: -2000000000\n"
"s16: -32000\n"
@ -399,7 +396,7 @@ TEST(YAMLIO, TestReadBuiltInTypes) {
"h16: 0x8765\n"
"h32: 0xFEDCBA98\n"
"h64: 0xFEDCBA9876543210\n"
"...\n");
"...\n");
yin >> map;
EXPECT_FALSE(yin.error());
@ -410,7 +407,6 @@ TEST(YAMLIO, TestReadBuiltInTypes) {
EXPECT_EQ(map.u16, 65000);
EXPECT_EQ(map.u8, 255);
EXPECT_EQ(map.b, false);
EXPECT_EQ(map.c, 'c');
EXPECT_EQ(map.s64, -5000000000LL);
EXPECT_EQ(map.s32, -2000000000L);
EXPECT_EQ(map.s16, -32000);
@ -438,7 +434,6 @@ TEST(YAMLIO, TestReadWriteBuiltInTypes) {
map.u16 = 50000;
map.u8 = 254;
map.b = true;
map.c = 'd';
map.s64 = -6000000000LL;
map.s32 = -2000000000;
map.s16 = -32000;
@ -468,7 +463,6 @@ TEST(YAMLIO, TestReadWriteBuiltInTypes) {
EXPECT_EQ(map.u16, 50000);
EXPECT_EQ(map.u8, 254);
EXPECT_EQ(map.b, true);
EXPECT_EQ(map.c, 'd');
EXPECT_EQ(map.s64, -6000000000LL);
EXPECT_EQ(map.s32, -2000000000L);
EXPECT_EQ(map.s16, -32000);