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

Simplify names.

Browse Source 
* src/output.c (symbol_definitions_output): Rename symbol
	attributes type_name and has_type_name as type and has_type.
	* data/lalr1.cc: Adjust uses.
This commit is contained in:
Akim Demaille
2008-08-26 20:30:40 +02:00
parent e9805e5743
commit 6659366cda
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2008-11-13 Akim Demaille <demaille@gostai.com>
Simplify names.
* src/output.c (symbol_definitions_output): Rename symbol
attributes type_name and has_type_name as type and has_type.
* data/lalr1.cc: Adjust uses.
2008-11-13 Akim Demaille <demaille@gostai.com>
Use b4_type_names for the union type.

22
data/lalr1.cc
View File

@@ -185,11 +185,11 @@ m4_define([b4_symbol_case_],
# Run actions for the symbol NUMS that all have the same type-name.
# Skip NUMS that have no type-name.
m4_define([b4_type_action_],
[b4_symbol_if([$1], [has_type_name],
[b4_symbol_if([$1], [has_type],
[m4_map([b4_symbol_case_], [$@])[]dnl
b4_dollar_dollar([b4_symbol([$1], [number])],
[b4_symbol([$1], [tag])],
[b4_symbol([$1], [type_name])]);
[b4_symbol([$1], [type])]);
break;
])])
@@ -202,8 +202,8 @@ m4_define([b4_type_action_],
m4_define([b4_symbol_constructor_declaration_],
[ template <token_type>
static inline symbol_type
make_symbol (b4_args(b4_symbol_if([$1], [has_type_name],
[const b4_symbol([$1], [type_name])& v]),
make_symbol (b4_args(b4_symbol_if([$1], [has_type],
[const b4_symbol([$1], [type])& v]),
b4_locations_if([const location_type& l])));
])
@@ -230,8 +230,8 @@ m4_define([b4_symbol_constructor_specialization_],
inline
b4_parser_class_name::symbol_type
b4_parser_class_name::make_symbol <b4_parser_class_name::token::b4_symbol([$1], [id])> (dnl
b4_args(b4_symbol_if([$1], [has_type_name],
[const b4_symbol([$1], [type_name])& v]),
b4_args(b4_symbol_if([$1], [has_type],
[const b4_symbol([$1], [type])& v]),
b4_locations_if([const b4_parser_class_name::location_type& l])));
])])])
@@ -255,12 +255,12 @@ m4_define([b4_symbol_constructor_definition_],
[ template <>
b4_parser_class_name::symbol_type
b4_parser_class_name::make_symbol <b4_parser_class_name::token::b4_symbol([$1], [id])> (dnl
b4_args(b4_symbol_if([$1], [has_type_name],
[const b4_symbol([$1], [type_name])& v]),
b4_args(b4_symbol_if([$1], [has_type],
[const b4_symbol([$1], [type])& v]),
b4_locations_if([const location_type& l])))
{
return symbol_type (b4_args([yytranslate_ (token::b4_symbol([$1], [id]))],
b4_symbol_if([$1], [has_type_name], [v]),
b4_symbol_if([$1], [has_type], [v]),
b4_locations_if([l])));
}
@@ -323,10 +323,10 @@ m4_define([b4_char_sizeof_],
#
# for defined type names.
m4_define([b4_char_sizeof],
[b4_symbol_if([$1], [has_type_name],
[b4_symbol_if([$1], [has_type],
[
m4_map([b4_char_sizeof_], [$@])dnl
char _b4_char_sizeof_dummy@{sizeof([b4_symbol([$1], [type_name])])@};
char _b4_char_sizeof_dummy@{sizeof([b4_symbol([$1], [type])])@};
])])

4
src/output.c
View File

@@ -438,10 +438,10 @@ symbol_definitions_output (FILE *out)
SET_KEY("number");
MUSCLE_INSERT_INT (key, sym->number);
SET_KEY("has_type_name");
SET_KEY("has_type");
MUSCLE_INSERT_INT (key, !!sym->type_name);
SET_KEY("type_name");
SET_KEY("type");
MUSCLE_INSERT_STRING (key, sym->type_name ? sym->type_name : "");
#undef SET_KEY