diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-12-03 16:27:23 +0100 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-12-03 16:27:23 +0100 |
| commit | 064e42b0aca1db0ca84b06b01cac5a40f3016591 (patch) | |
| tree | b9608c4afcca3c4fcfb0c5867dc6ee48554abbf4 /data/location.cc | |
| parent | 5807bb9156930091850a52b5bb9ab9f89082b04e (diff) | |
| parent | 03dbf629d54bab4b5903f35c881bb240511d1f39 (diff) | |
| download | bison-064e42b0aca1db0ca84b06b01cac5a40f3016591.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
parser: accept #line NUM
m4: use a safer pattern to enable/disable output
tests: beware of gnulib's need for config.h
gnulib: update
yacc.c, glr.c: check and fix the display of locations
formatting changes
glr.c: remove stray macro
Conflicts:
data/c.m4
data/glr.cc
data/lalr1.cc
data/lalr1.java
data/location.cc
data/stack.hh
data/yacc.c
src/scan-gram.l
Diffstat (limited to 'data/location.cc')
| -rw-r--r-- | data/location.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/data/location.cc b/data/location.cc index 5879ea37..b49028f9 100644 --- a/data/location.cc +++ b/data/location.cc @@ -268,8 +268,7 @@ m4_define([b4_location_define], # We do want M4 expansion after # for CPP macros. m4_changecom() b4_defines_if([ -m4_divert_push(0)dnl -@output(b4_dir_prefix[]position.hh@)@ +b4_output_begin([b4_dir_prefix[]position.hh]) b4_copyright([Positions for Bison parsers in C++])[ /** @@ -289,7 +288,10 @@ b4_copyright([Positions for Bison parsers in C++])[ ]b4_position_define[ ]b4_namespace_close[ ]b4_cpp_guard_close([b4_dir_prefix[]position.hh]) -@output(b4_dir_prefix[]location.hh@)@ +b4_output_end() + + +b4_output_begin([b4_dir_prefix[]location.hh]) b4_copyright([Locations for Bison parsers in C++])[ /** @@ -305,7 +307,8 @@ b4_copyright([Locations for Bison parsers in C++])[ ]b4_location_define[ ]b4_namespace_close[ ]b4_cpp_guard_close([b4_dir_prefix[]location.hh]) -m4_divert_pop(0) -])# b4_defines_if -m4_popdef([b4_copyright_years])dnl -m4_changecom([#]) +b4_output_end() +]) + + +m4_popdef([b4_copyright_years]) |