From fd3c17995e813b8f1f6cf218f7160bfafa667902 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Wed, 3 Oct 2018 07:30:55 +0200
Subject: [PATCH] c++: style changes

* data/lalr1.cc: Formatting changes.
Remove duplicate definition of YY_NULLPTR.
Add quotes to help Emacs track balanced parens.
---
 data/glr.cc   | 7 ++++---
 data/lalr1.cc | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/glr.cc b/data/glr.cc
index b5f0b903..f9ec1018 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -234,9 +234,10 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 b4_namespace_close
 ])
 
-# b4_shared_declarations
-# ----------------------
-# Declaration that might either go into the header (if --defines)
+
+# b4_shared_declarations(hh|cc)
+# -----------------------------
+# Declaration that might either go into the header (if --defines, $1 = hh)
 # or in the implementation file.
 m4_define([b4_shared_declarations],
 [m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
diff --git a/data/lalr1.cc b/data/lalr1.cc
index af9c9e2a..a5839ac5 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -147,6 +147,7 @@ b4_bison_locations_if([# Backward compatibility.
 m4_include(b4_pkgdatadir/[stack.hh])
 b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
 
+
 # b4_shared_declarations(hh|cc)
 # -----------------------------
 # Declaration that might either go into the header (if --defines, $1 = hh)
@@ -415,13 +416,11 @@ b4_percent_code_get([[top]])[]dnl
 m4_if(b4_prefix, [yy], [],
 [
 // Take the name prefix into account.
-#define yylex   b4_prefix[]lex])[
+[#]define yylex   b4_prefix[]lex])[
 
 // First part of user declarations.
 ]b4_user_pre_prologue[
 
-]b4_null_define[
-
 ]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
                [b4_shared_declarations([cc])])[