Re: [PATCH] pickles: Replace enum with enum_ in {b,c}tf.pk

[Jose E. Marchesi]

Hi Mohammad.

This looks OK to me for master.

I am CCing David and Indu in to make sure they notice this change.  They
may prefer to rename these fields to something else.  In that case,
these patches are approved in advance :)

> `enum` is a keyword.
>
> 2021-12-27  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>
>
>       * pickles/btf.pk (BTF_Type): s/enum/_enum/.
>       * pickles/ctf.pk (CTF_Type): Likewise.
>       * pickles/btf-dump.pk (btf_dump_type_vdata): Likewise.
>       * pickles/ctf-dump.pk (ctf_dump_vlen_data): Likewise.
> ---
>  ChangeLog           | 7 +++++++
>  pickles/btf-dump.pk | 2 +-
>  pickles/btf.pk      | 2 +-
>  pickles/ctf-dump.pk | 2 +-
>  pickles/ctf.pk      | 2 +-
>  5 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index c16d05b2..7ab3b1fc 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,10 @@
> +2021-12-27  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>
> +
> +     * pickles/btf.pk (BTF_Type): s/enum/_enum/.
> +     * pickles/ctf.pk (CTF_Type): Likewise.
> +     * pickles/btf-dump.pk (btf_dump_type_vdata): Likewise.
> +     * pickles/ctf-dump.pk (ctf_dump_vlen_data): Likewise.
> +
>  2021-12-27  Jose E. Marchesi  <jemarch@gnu.org>
>  
>       * libpoke/pkl-lex.l: Recognize `enum' as a reserved word.
> diff --git a/pickles/btf-dump.pk b/pickles/btf-dump.pk
> index 26ea98f0..ca2cbd75 100644
> --- a/pickles/btf-dump.pk
> +++ b/pickles/btf-dump.pk
> @@ -118,7 +118,7 @@ fun btf_dump_type_vdata = (BTF_Section btf, BTF_Type t) 
> void:
>      /* Enum */
>      try
>      {
> -      btf_dump_enum (btf, t.data.enum);
> +      btf_dump_enum (btf, t.data._enum);
>        return;
>      }
>      catch if E_elem {}
> diff --git a/pickles/btf.pk b/pickles/btf.pk
> index f19890ea..3089517b 100644
> --- a/pickles/btf.pk
> +++ b/pickles/btf.pk
> @@ -173,7 +173,7 @@ type BTF_Type =
>      {
>        BTF_Int integer                    : info.kind == BTF_KIND_INT;
>        BTF_Array array                    : info.kind == BTF_KIND_ARRAY;
> -      BTF_Enum[info.vlen] enum           : info.kind == BTF_KIND_ENUM;
> +      BTF_Enum[info.vlen] _enum          : info.kind == BTF_KIND_ENUM;
>        BTF_Func_Proto func_proto          : info.kind == BTF_KIND_FUNC_PROTO;
>        BTF_Variable variable              : info.kind == BTF_KIND_VAR;
>        BTF_Member[info.vlen] members      : (info.kind == BTF_KIND_UNION
> diff --git a/pickles/ctf-dump.pk b/pickles/ctf-dump.pk
> index 52a42480..d15afc45 100644
> --- a/pickles/ctf-dump.pk
> +++ b/pickles/ctf-dump.pk
> @@ -128,7 +128,7 @@ fun ctf_dump_vlen_data = (CTF_Dictionary ctf, CTF_Type t) 
> void:
>    try ctf_dump_sou_members (ctf, t.data.members);
>    catch if E_elem {};
>  
> -  try ctf_dump_enum (ctf, t.data.enum);
> +  try ctf_dump_enum (ctf, t.data._enum);
>    catch if E_elem {};
>  
>    /* XXX CTF_Func_Args declaration scoped within CTF_Type is not available.  
> */
> diff --git a/pickles/ctf.pk b/pickles/ctf.pk
> index 58753dc6..9deeea2e 100644
> --- a/pickles/ctf.pk
> +++ b/pickles/ctf.pk
> @@ -296,7 +296,7 @@ type CTF_Type =
>        CTF_Array array                  : info.kind == CTF_KIND_ARRAY;
>        CTF_Slice slice                  : info.kind == CTF_KIND_SLICE;
>        CTF_Member[info.vlen] members    : info.kind in 
> [CTF_KIND_STRUCT,CTF_KIND_UNION];
> -      CTF_Enum[info.vlen] enum         : info.kind == CTF_KIND_ENUM;
> +      CTF_Enum[info.vlen] _enum        : info.kind == CTF_KIND_ENUM;
>        CTF_Func_Args func_args          : info.kind == CTF_KIND_FUNCTION;
>        struct {} nothing;
>      } data;