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

Merge remote-tracking branch 'origin/maint'

Browse Source 
* origin/maint:
  NEWS: spell check.
  api.prefix.

Conflicts:
	data/c.m4
	data/glr.cc
	data/lalr1.cc
	doc/bison.texi
This commit is contained in:
Akim Demaille
2012-07-02 09:55:43 +02:00
parent 73370a9daa 242cc08e8d
commit 5458913aba
11 changed files with 312 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/c++.m4
View File

@@ -116,7 +116,7 @@ m4_ifdef([b4_stype],
};],
[m4_if(b4_tag_seen_flag, 0,
[[ typedef int semantic_type;]],
[[ typedef YYSTYPE semantic_type;]])])])
[[ typedef ]b4_api_PREFIX[STYPE semantic_type;]])])])
# b4_public_types_declare
@@ -124,10 +124,10 @@ m4_ifdef([b4_stype],
# Define the public types: token, semantic value, location, and so forth.
# Depending on %define token_lex, may be output in the header or source file.
m4_define([b4_public_types_declare],
[[#ifndef YYSTYPE
[[#ifndef ]b4_api_PREFIX[STYPE
]b4_semantic_type_declare[
#else
typedef YYSTYPE semantic_type;
typedef ]b4_api_PREFIX[STYPE semantic_type;
#endif]b4_locations_if([
/// Symbol locations.
typedef b4_percent_define_get([[location_type]],