From d07564af63f9be06078e93e7102656f2e9a15c56 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Sat, 29 Dec 2018 21:21:31 +0100
Subject: [PATCH] style: remove stray empty lines

* data/skeletons/glr.c, data/skeletons/glr.cc: here.
* data/skeletons/bison.m4 (b4_glr_cc_if): Move it here.
---
 data/skeletons/bison.m4 | 6 ++++++
 data/skeletons/glr.c    | 6 +-----
 data/skeletons/glr.cc   | 3 +--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/skeletons/bison.m4 b/data/skeletons/bison.m4
index e3260691..4d7f610f 100644
--- a/data/skeletons/bison.m4
+++ b/data/skeletons/bison.m4
@@ -374,6 +374,12 @@ b4_define_flag_if([token_table])        # Whether yytoken_table is demanded.
 b4_define_flag_if([yacc])               # Whether POSIX Yacc is emulated.
 
 
+# b4_glr_cc_if([IF-TRUE], [IF-FALSE])
+# -----------------------------------
+m4_define([b4_glr_cc_if],
+          [m4_if(b4_skeleton, ["glr.cc"], $@)])
+
+
 ## --------- ##
 ## Symbols.  ##
 ## --------- ##
diff --git a/data/skeletons/glr.c b/data/skeletons/glr.c
index 4c97f806..a102d552 100644
--- a/data/skeletons/glr.c
+++ b/data/skeletons/glr.c
@@ -23,9 +23,6 @@
 m4_if(b4_skeleton, ["glr.c"],
       [m4_include(b4_skeletonsdir/[c.m4])])
 
-m4_define([b4_glr_cc_if],
-          [m4_if(b4_skeleton, ["glr.cc"], [$1], [$2])])
-
 
 ## ---------------- ##
 ## Default values.  ##
@@ -231,8 +228,7 @@ b4_copyright([Skeleton implementation for Bison GLR parsers in C],
 #define yyparse ]b4_prefix[parse
 #define yylex   ]b4_prefix[lex
 #define yyerror ]b4_prefix[error
-#define yydebug ]b4_prefix[debug
-]]b4_pure_if([], [[
+#define yydebug ]b4_prefix[debug]]b4_pure_if([], [[
 #define yylval  ]b4_prefix[lval
 #define yychar  ]b4_prefix[char
 #define yynerrs ]b4_prefix[nerrs]b4_locations_if([[
diff --git a/data/skeletons/glr.cc b/data/skeletons/glr.cc
index b5b0dba2..d2447f08 100644
--- a/data/skeletons/glr.cc
+++ b/data/skeletons/glr.cc
@@ -122,8 +122,7 @@ m4_if(b4_prefix, [yy], [],
 #define yyparse ]b4_prefix[parse
 #define yylex   ]b4_prefix[lex
 #define yyerror ]b4_prefix[error
-#define yydebug ]b4_prefix[debug
-]]b4_pure_if([], [[
+#define yydebug ]b4_prefix[debug]]b4_pure_if([], [[
 #define yylval  ]b4_prefix[lval
 #define yychar  ]b4_prefix[char
 #define yynerrs ]b4_prefix[nerrs]b4_locations_if([[