poke-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v2] pk-map-tab: rename ERROR to ERR because it clashes with a


From: Jose E. Marchesi
Subject: Re: [PATCH v2] pk-map-tab: rename ERROR to ERR because it clashes with a define on Windows
Date: Wed, 15 Feb 2023 19:08:22 +0100
User-agent: Gnus/5.13 (Gnus v5.13)

Hi Hannes.

OK for master and maint/poke-3.
Thanks!

> 2023-02-15  Hannes Domani  <ssbssa@yahoo.de>
>
>       * poke/pk-map-lex.l: Rename ERROR to ERR.
>       * poke/pk-map-tab.y: Likewise.
> ---
>  poke/pk-map-lex.l | 2 +-
>  poke/pk-map-tab.y | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/poke/pk-map-lex.l b/poke/pk-map-lex.l
> index ae9e7f63..07ccb659 100644
> --- a/poke/pk-map-lex.l
> +++ b/poke/pk-map-lex.l
> @@ -124,4 +124,4 @@ TAGNAME            %[a-zA-Z_][a-zA-Z0-9_]*
>          return TAG;
>  }
>  
> -<*>.                { return ERROR; }
> +<*>.                { return ERR; }
> diff --git a/poke/pk-map-tab.y b/poke/pk-map-tab.y
> index 05d3ee3e..3b9ac6ae 100644
> --- a/poke/pk-map-tab.y
> +++ b/poke/pk-map-tab.y
> @@ -272,7 +272,7 @@ pk_map_tab_error (YYLTYPE *llocp, struct pk_map_parser 
> *map_parser, char const *
>  
>  /* Tokens.  */
>  
> -%token ERROR SEP
> +%token ERR SEP
>  %token ENTRY
>  %token <integer> TAG
>  %token <string> DATA



reply via email to

[Prev in Thread] Current Thread [Next in Thread]