mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-30 20:24:32 +00:00
YAMLIO: Allow scalars to dictate quotation rules
Introduce ScalarTraits::mustQuote which determines whether or not a StringRef needs quoting before it is acceptable to output. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205955 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer
@ -20,6 +20,7 @@
|
||||
#include "llvm/ADT/StringSwitch.h"
|
||||
#include "llvm/ADT/Twine.h"
|
||||
#include "llvm/Support/Compiler.h"
|
||||
#include "llvm/Support/Regex.h"
|
||||
#include "llvm/Support/SourceMgr.h"
|
||||
#include "llvm/Support/YAMLParser.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
@ -98,6 +99,7 @@ struct ScalarBitSetTraits {
|
||||
/// // return empty string on success, or error string
|
||||
/// return StringRef();
|
||||
/// }
|
||||
/// static bool mustQuote(StringRef) { return true; }
|
||||
/// };
|
||||
template<typename T>
|
||||
struct ScalarTraits {
|
||||
@ -109,6 +111,9 @@ struct ScalarTraits {
|
||||
// Function to convert a string to a value. Returns the empty
|
||||
// StringRef on success or an error string if string is malformed:
|
||||
//static StringRef input(StringRef scalar, void *ctxt, T &value);
|
||||
//
|
||||
// Function to determine if the value should be quoted.
|
||||
//static bool mustQuote(StringRef);
|
||||
};
|
||||
|
||||
|
||||
@ -198,17 +203,19 @@ struct has_ScalarTraits
|
||||
{
|
||||
typedef StringRef (*Signature_input)(StringRef, void*, T&);
|
||||
typedef void (*Signature_output)(const T&, void*, llvm::raw_ostream&);
|
||||
typedef bool (*Signature_mustQuote)(StringRef);
|
||||
|
||||
template <typename U>
|
||||
static char test(SameType<Signature_input, &U::input>*,
|
||||
SameType<Signature_output, &U::output>*);
|
||||
static char test(SameType<Signature_input, &U::input> *,
|
||||
SameType<Signature_output, &U::output> *,
|
||||
SameType<Signature_mustQuote, &U::mustQuote> *);
|
||||
|
||||
template <typename U>
|
||||
static double test(...);
|
||||
|
||||
public:
|
||||
static bool const value =
|
||||
(sizeof(test<ScalarTraits<T> >(nullptr,nullptr)) == 1);
|
||||
(sizeof(test<ScalarTraits<T>>(nullptr, nullptr, nullptr)) == 1);
|
||||
};
|
||||
|
||||
|
||||
@ -316,7 +323,81 @@ public:
|
||||
static bool const value = (sizeof(test<DocumentListTraits<T> >(0)) == 1);
|
||||
};
|
||||
|
||||
inline bool isNumber(StringRef S) {
|
||||
static const char OctalChars[] = "01234567";
|
||||
if (S.startswith("0") &&
|
||||
S.drop_front().find_first_not_of(OctalChars) == StringRef::npos)
|
||||
return true;
|
||||
|
||||
if (S.startswith("0o") &&
|
||||
S.drop_front(2).find_first_not_of(OctalChars) == StringRef::npos)
|
||||
return true;
|
||||
|
||||
static const char HexChars[] = "0123456789abcdefABCDEF";
|
||||
if (S.startswith("0x") &&
|
||||
S.drop_front(2).find_first_not_of(HexChars) == StringRef::npos)
|
||||
return true;
|
||||
|
||||
static const char DecChars[] = "0123456789";
|
||||
if (S.find_first_not_of(DecChars) == StringRef::npos)
|
||||
return true;
|
||||
|
||||
if (S.equals(".inf") || S.equals(".Inf") || S.equals(".INF"))
|
||||
return true;
|
||||
|
||||
Regex FloatMatcher("^(\\.[0-9]+|[0-9]+(\\.[0-9]*)?)([eE][-+]?[0-9]+)?$");
|
||||
if (FloatMatcher.match(S))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
inline bool isNumeric(StringRef S) {
|
||||
if ((S.front() == '-' || S.front() == '+') && isNumber(S.drop_front()))
|
||||
return true;
|
||||
|
||||
if (isNumber(S))
|
||||
return true;
|
||||
|
||||
if (S.equals(".nan") || S.equals(".NaN") || S.equals(".NAN"))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
inline bool isNull(StringRef S) {
|
||||
return S.equals("null") || S.equals("Null") || S.equals("NULL") ||
|
||||
S.equals("~");
|
||||
}
|
||||
|
||||
inline bool isBool(StringRef S) {
|
||||
return S.equals("true") || S.equals("True") || S.equals("TRUE") ||
|
||||
S.equals("false") || S.equals("False") || S.equals("FALSE");
|
||||
}
|
||||
|
||||
inline bool needsQuotes(StringRef S) {
|
||||
if (S.empty())
|
||||
return true;
|
||||
if (isspace(S.front()) || isspace(S.back()))
|
||||
return true;
|
||||
if (S.front() == ',')
|
||||
return true;
|
||||
|
||||
static const char ScalarSafeChars[] =
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-/^., \t";
|
||||
if (S.find_first_not_of(ScalarSafeChars) != StringRef::npos)
|
||||
return true;
|
||||
|
||||
if (isNull(S))
|
||||
return true;
|
||||
if (isBool(S))
|
||||
return true;
|
||||
if (isNumeric(S))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
template<typename T>
|
||||
@ -371,7 +452,7 @@ public:
|
||||
virtual bool bitSetMatch(const char*, bool) = 0;
|
||||
virtual void endBitSetScalar() = 0;
|
||||
|
||||
virtual void scalarString(StringRef &) = 0;
|
||||
virtual void scalarString(StringRef &, bool) = 0;
|
||||
|
||||
virtual void setError(const Twine &) = 0;
|
||||
|
||||
@ -521,11 +602,11 @@ yamlize(IO &io, T &Val, bool) {
|
||||
llvm::raw_string_ostream Buffer(Storage);
|
||||
ScalarTraits<T>::output(Val, io.getContext(), Buffer);
|
||||
StringRef Str = Buffer.str();
|
||||
io.scalarString(Str);
|
||||
io.scalarString(Str, ScalarTraits<T>::mustQuote(Str));
|
||||
}
|
||||
else {
|
||||
StringRef Str;
|
||||
io.scalarString(Str);
|
||||
io.scalarString(Str, ScalarTraits<T>::mustQuote(Str));
|
||||
StringRef Result = ScalarTraits<T>::input(Str, io.getContext(), Val);
|
||||
if ( !Result.empty() ) {
|
||||
io.setError(llvm::Twine(Result));
|
||||
@ -602,78 +683,91 @@ template<>
|
||||
struct ScalarTraits<bool> {
|
||||
static void output(const bool &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, bool &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<StringRef> {
|
||||
static void output(const StringRef &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, StringRef &);
|
||||
static bool mustQuote(StringRef S) { return needsQuotes(S); }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<std::string> {
|
||||
static void output(const std::string &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, std::string &);
|
||||
static bool mustQuote(StringRef S) { return needsQuotes(S); }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<uint8_t> {
|
||||
static void output(const uint8_t &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, uint8_t &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<uint16_t> {
|
||||
static void output(const uint16_t &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, uint16_t &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<uint32_t> {
|
||||
static void output(const uint32_t &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, uint32_t &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<uint64_t> {
|
||||
static void output(const uint64_t &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, uint64_t &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<int8_t> {
|
||||
static void output(const int8_t &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, int8_t &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<int16_t> {
|
||||
static void output(const int16_t &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, int16_t &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<int32_t> {
|
||||
static void output(const int32_t &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, int32_t &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<int64_t> {
|
||||
static void output(const int64_t &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, int64_t &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<float> {
|
||||
static void output(const float &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, float &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<double> {
|
||||
static void output(const double &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, double &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
|
||||
@ -795,7 +889,7 @@ private:
|
||||
bool beginBitSetScalar(bool &) override;
|
||||
bool bitSetMatch(const char *, bool ) override;
|
||||
void endBitSetScalar() override;
|
||||
void scalarString(StringRef &) override;
|
||||
void scalarString(StringRef &, bool) override;
|
||||
void setError(const Twine &message) override;
|
||||
bool canElideEmptySequence() override;
|
||||
|
||||
@ -920,7 +1014,7 @@ public:
|
||||
bool beginBitSetScalar(bool &) override;
|
||||
bool bitSetMatch(const char *, bool ) override;
|
||||
void endBitSetScalar() override;
|
||||
void scalarString(StringRef &) override;
|
||||
void scalarString(StringRef &, bool) override;
|
||||
void setError(const Twine &message) override;
|
||||
bool canElideEmptySequence() override;
|
||||
public:
|
||||
@ -991,24 +1085,28 @@ template<>
|
||||
struct ScalarTraits<Hex8> {
|
||||
static void output(const Hex8 &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, Hex8 &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<Hex16> {
|
||||
static void output(const Hex16 &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, Hex16 &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<Hex32> {
|
||||
static void output(const Hex32 &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, Hex32 &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
template<>
|
||||
struct ScalarTraits<Hex64> {
|
||||
static void output(const Hex64 &, void*, llvm::raw_ostream &);
|
||||
static StringRef input(StringRef, void*, Hex64 &);
|
||||
static bool mustQuote(StringRef) { return false; }
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user