[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] skeletons: fix output directives
From: |
Akim Demaille |
Subject: |
[PATCH 6/9] skeletons: fix output directives |
Date: |
Wed, 19 Dec 2012 11:36:07 +0100 |
* 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 741ea71..85aca84 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
address@hidden(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 37522aa..7b2aef2 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
address@hidden(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 631247a..b65bf49 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++])[
--
1.8.0.2
- [PATCH 0/9] {master} import improvements from {make-glr-symbol}, Akim Demaille, 2012/12/19
- [PATCH 7/9] gnulib: update, Akim Demaille, 2012/12/19
- [PATCH 4/9] glr.cc: simplifying the handling of parse/lex params, Akim Demaille, 2012/12/19
- [PATCH 6/9] skeletons: fix output directives,
Akim Demaille <=
- [PATCH 5/9] yacc.c: style changes, Akim Demaille, 2012/12/19
- [PATCH 1/9] %define variables: backward compatibility, Akim Demaille, 2012/12/19
- [PATCH 2/9] glr.c: move function declaration earlier, Akim Demaille, 2012/12/19
- [PATCH 3/9] glr: rename lex params, Akim Demaille, 2012/12/19
- [PATCH 9/9] variants: prohibit simple copies, Akim Demaille, 2012/12/19
- [PATCH 8/9] variant: more assertions, Akim Demaille, 2012/12/19