Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 13:23:04 +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

4
data/c++.m4
View File

@@ -28,7 +28,7 @@ b4_percent_define_default([[parser_class_name]], [[parser]])
# Don't do that so that we remember whether we're using a user
# request, or the default value.
#
# b4_percent_define_default([[location_type]], [[location]])
# b4_percent_define_default([[api.location.type]], [[location]])
b4_percent_define_default([[filename_type]], [[std::string]])
b4_percent_define_default([[api.namespace]], m4_defn([b4_prefix]))
@@ -130,7 +130,7 @@ m4_define([b4_public_types_declare],
typedef ]b4_api_PREFIX[STYPE semantic_type;
#endif]b4_locations_if([
/// Symbol locations.
typedef b4_percent_define_get([[location_type]],
typedef b4_percent_define_get([[api.location.type]],
[[location]]) location_type;])[
/// Syntax errors thrown from user actions.

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

4
data/java.m4
View File

@@ -197,8 +197,8 @@ m4_define([b4_throws], [b4_percent_define_get([[throws]])])
b4_percent_define_default([[init_throws]], [])
m4_define([b4_init_throws], [b4_percent_define_get([[init_throws]])])
b4_percent_define_default([[location_type]], [Location])
m4_define([b4_location_type], [b4_percent_define_get([[location_type]])])
b4_percent_define_default([[api.location.type]], [Location])
m4_define([b4_location_type], [b4_percent_define_get([[api.location.type]])])
b4_percent_define_default([[position_type]], [Position])
m4_define([b4_position_type], [b4_percent_define_get([[position_type]])])

6
data/lalr1.cc
View File

@@ -120,7 +120,7 @@ m4_pushdef([b4_copyright_years],
m4_define([b4_parser_class_name],
[b4_percent_define_get([[parser_class_name]])])
b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [],
[# Backward compatibility.
m4_define([b4_location_constructors])
m4_include(b4_pkgdatadir/[location.cc])])])
@@ -139,7 +139,7 @@ m4_define([b4_shared_declarations],
# include <stdexcept>
# include <string>]b4_defines_if([[
# include "stack.hh"
]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[
@@ -148,7 +148,7 @@ m4_define([b4_shared_declarations],
]b4_defines_if([],
[b4_stack_define
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])])])[