Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint'

Browse Source 
* 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
This commit is contained in:
Akim Demaille
2012-12-03 16:27:23 +01:00
parent 5807bb9156 03dbf629d5
commit 064e42b0ac
18 changed files with 198 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/location.cc
View File

@@ -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])