From 22eeb1ab8a5fb2fa3f4e14a22cfd3c13bd58f59f Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Sun, 26 Apr 2020 08:18:46 +0200
Subject: [PATCH] style: fix a few remaining 'type' instead of 'kind'

* data/skeletons/glr.c, data/skeletons/yacc.c (YY_SYMBOL_PRINT):
Here.
---
 data/skeletons/c++.m4 | 2 +-
 data/skeletons/glr.c  | 6 +++---
 data/skeletons/yacc.c | 6 +++---
 src/parse-gram.c      | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/skeletons/c++.m4 b/data/skeletons/c++.m4
index d509fb44..2f84be3f 100644
--- a/data/skeletons/c++.m4
+++ b/data/skeletons/c++.m4
@@ -352,7 +352,7 @@ m4_define([b4_symbol_type_define],
           break;
         }
 
-        // Type destructor.
+        // Value type destructor.
 ]b4_symbol_variant([[yykind]], [[value]], [[template destroy]])])[
         Base::clear ();
       }
diff --git a/data/skeletons/glr.c b/data/skeletons/glr.c
index 13f0d68d..2d2fd5fc 100644
--- a/data/skeletons/glr.c
+++ b/data/skeletons/glr.c
@@ -669,12 +669,12 @@ yysymbol_name (yysymbol_kind_t yysymbol)
 
 ]b4_yy_symbol_print_define[
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                  \
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                  \
   do {                                                                  \
     if (yydebug)                                                        \
       {                                                                 \
         YY_FPRINTF ((stderr, "%s ", Title));                            \
-        yy_symbol_print (stderr, Type, Value]b4_locuser_args([Location])[);        \
+        yy_symbol_print (stderr, Kind, Value]b4_locuser_args([Location])[);        \
         YY_FPRINTF ((stderr, "\n"));                                    \
       }                                                                 \
   } while (0)
@@ -691,7 +691,7 @@ static void yypdumpstack (yyGLRStack* yystackp)
 #else /* !]b4_api_PREFIX[DEBUG */
 
 # define YY_DPRINTF(Args) do {} while (yyfalse)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
 
 #endif /* !]b4_api_PREFIX[DEBUG */
 
diff --git a/data/skeletons/yacc.c b/data/skeletons/yacc.c
index 645188bc..59f0b644 100644
--- a/data/skeletons/yacc.c
+++ b/data/skeletons/yacc.c
@@ -767,13 +767,13 @@ do {                                            \
 
 ]b4_yy_location_print_define[
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
 do {                                                                      \
   if (yydebug)                                                            \
     {                                                                     \
       YYFPRINTF (stderr, "%s ", Title);                                   \
       yy_symbol_print (stderr,                                            \
-                  Type, Value]b4_locations_if([, Location])[]b4_user_args[); \
+                  Kind, Value]b4_locations_if([, Location])[]b4_user_args[); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
 } while (0)
@@ -841,7 +841,7 @@ do {                                    \
 int yydebug;
 #else /* !]b4_api_PREFIX[DEBUG */
 # define YYDPRINTF(Args) ((void) 0)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !]b4_api_PREFIX[DEBUG */
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 55990bd8..3f5c7966 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1018,13 +1018,13 @@ yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
 # endif /* !defined YY_LOCATION_PRINT */
 
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
 do {                                                                      \
   if (yydebug)                                                            \
     {                                                                     \
       YYFPRINTF (stderr, "%s ", Title);                                   \
       yy_symbol_print (stderr,                                            \
-                  Type, Value, Location); \
+                  Kind, Value, Location); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
 } while (0)
@@ -1318,7 +1318,7 @@ do {                                    \
 int yydebug;
 #else /* !GRAM_DEBUG */
 # define YYDPRINTF(Args) ((void) 0)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !GRAM_DEBUG */