[llvm] r226942 - [YAMLIO] Add support for numeric values in enums.
Rafael EspĂndola
rafael.espindola at gmail.com
Fri Jan 23 14:05:26 PST 2015
Looks like this broke the build:
YAMLTraits.h:479:11: error: no viable conversion from
'llvm::ELFYAML::ELF_ET' to 'llvm::yaml::Hex16'
On 23 January 2015 at 16:57, Michael J. Spencer <bigcheesegs at gmail.com>
wrote:
> Author: mspencer
> Date: Fri Jan 23 15:57:50 2015
> New Revision: 226942
>
> URL: http://llvm.org/viewvc/llvm-project?rev=226942&view=rev
> Log:
> [YAMLIO] Add support for numeric values in enums.
>
> Modified:
> llvm/trunk/include/llvm/Support/YAMLTraits.h
> llvm/trunk/lib/Support/YAMLTraits.cpp
>
> Modified: llvm/trunk/include/llvm/Support/YAMLTraits.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/YAMLTraits.h?rev=226942&r1=226941&r2=226942&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Support/YAMLTraits.h (original)
> +++ llvm/trunk/include/llvm/Support/YAMLTraits.h Fri Jan 23 15:57:50 2015
> @@ -447,6 +447,7 @@ public:
>
> virtual void beginEnumScalar() = 0;
> virtual bool matchEnumScalar(const char*, bool) = 0;
> + virtual bool matchEnumFallback() = 0;
> virtual void endEnumScalar() = 0;
>
> virtual bool beginBitSetScalar(bool &) = 0;
> @@ -472,6 +473,15 @@ public:
> }
> }
>
> + template <typename FBT, typename T>
> + void enumFallback(T &Val) {
> + if ( matchEnumFallback() ) {
> + FBT Res = Val;
> + yamlize(*this, Res, true);
> + Val = Res;
> + }
> + }
> +
> template <typename T>
> void bitSetCase(T &Val, const char* Str, const T ConstVal) {
> if ( bitSetMatch(Str, outputting() && (Val & ConstVal) == ConstVal) )
> {
> @@ -899,6 +909,7 @@ private:
> void endFlowSequence() override;
> void beginEnumScalar() override;
> bool matchEnumScalar(const char*, bool) override;
> + bool matchEnumFallback() override;
> void endEnumScalar() override;
> bool beginBitSetScalar(bool &) override;
> bool bitSetMatch(const char *, bool ) override;
> @@ -1026,6 +1037,7 @@ public:
> void endFlowSequence() override;
> void beginEnumScalar() override;
> bool matchEnumScalar(const char*, bool) override;
> + bool matchEnumFallback() override;
> void endEnumScalar() override;
> bool beginBitSetScalar(bool &) override;
> bool bitSetMatch(const char *, bool ) override;
>
> Modified: llvm/trunk/lib/Support/YAMLTraits.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/YAMLTraits.cpp?rev=226942&r1=226941&r2=226942&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Support/YAMLTraits.cpp (original)
> +++ llvm/trunk/lib/Support/YAMLTraits.cpp Fri Jan 23 15:57:50 2015
> @@ -233,6 +233,13 @@ bool Input::matchEnumScalar(const char *
> return false;
> }
>
> +bool Input::matchEnumFallback() {
> + if (ScalarMatchFound)
> + return false;
> + ScalarMatchFound = true;
> + return true;
> +}
> +
> void Input::endEnumScalar() {
> if (!ScalarMatchFound) {
> setError(CurrentNode, "unknown enumerated scalar");
> @@ -508,6 +515,13 @@ bool Output::matchEnumScalar(const char
> return false;
> }
>
> +bool Output::matchEnumFallback() {
> + if (EnumerationMatchFound)
> + return false;
> + EnumerationMatchFound = true;
> + return true;
> +}
> +
> void Output::endEnumScalar() {
> if (!EnumerationMatchFound)
> llvm_unreachable("bad runtime enum value");
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150123/64ed0afa/attachment.html>
More information about the llvm-commits
mailing list