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

Merge branch 'maint'

Browse Source 
* origin/maint:
  tests: check %no-lines
  tests: minor simplification
  graphs: stylistic changes.
  graphs: minor style changes
  graphs: show reductions
  graphs: style: prefix state number with "state"
  graphs: style: use left justification for states
  graphs: style: prefix rules and change shapes
  obstack: import obstack_finish0 from master
  c++: api.location.type
  muscles: a function for backward compatibility
  maint: more macros

Conflicts:
	data/glr.cc
	data/java.m4
	data/lalr1.cc
	doc/bison.texi
	src/muscle-tab.c
	src/system.h
	tests/calc.at
This commit is contained in:
Akim Demaille
2012-10-12 12:39:52 +02:00
parent 23d13411c8 e94ca80bbb
commit f6b561d9f9
16 changed files with 303 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/glr.cc
View File

@@ -47,7 +47,7 @@
m4_define([b4_pure_flag], [1])
m4_include(b4_pkgdatadir/[c++.m4])
b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [],
[m4_include(b4_pkgdatadir/[location.cc])])])
m4_define([b4_parser_class_name],
@@ -219,14 +219,14 @@ b4_percent_code_get([[requires]])[
#include <stdexcept>
#include <string>
#include <iostream>]b4_defines_if([
b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [],
[[#include "location.hh"]])])])[
]b4_YYDEBUG_define[
]b4_namespace_open[
]b4_defines_if([],
[b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
[b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [],
[b4_position_define
b4_location_define])])])[