From eaf690a700e53258294d48145c1d5fa93147821e Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@lrde.epita.fr>
Date: Wed, 19 Dec 2012 11:17:29 +0100
Subject: [PATCH] skeletons: fix output directives

* data/lalr1.cc, data/location.cc, data/glr.cc: Use b4_output_begin.
Broken during a merge.
---
 data/glr.cc      | 4 +---
 data/lalr1.cc    | 5 +----
 data/location.cc | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/data/glr.cc b/data/glr.cc
index 741ea71b..85aca842 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -314,9 +314,7 @@ b4_percent_define_flag_if([[global_tokens_and_yystype]],
 ])
 
 b4_defines_if(
-[m4_changecom()dnl
-m4_divert_push(0)dnl
-@output(b4_spec_defines_file@)@
+[b4_output_begin([b4_spec_defines_file])
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
              [2002-2012])[
 
diff --git a/data/lalr1.cc b/data/lalr1.cc
index 37522aa3..7b2aef2d 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -332,11 +332,8 @@ b4_public_types_define])[
 ]b4_percent_code_get([[provides]])[
 ]])
 
-# We do want M4 expansion after # for CPP macros.
-m4_changecom()
 b4_defines_if(
-[m4_divert_push(0)dnl
-@output(b4_spec_defines_file@)@
+[b4_output_begin([b4_spec_defines_file])
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 [
 /**
diff --git a/data/location.cc b/data/location.cc
index 631247a7..b65bf490 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -268,8 +268,6 @@ m4_define([b4_location_define],
 ]])
 
 
-# We do want M4 expansion after # for CPP macros.
-m4_changecom()
 b4_defines_if([
 b4_output_begin([b4_dir_prefix[]position.hh])
 b4_copyright([Positions for Bison parsers in C++])[
-- 
2.45.2