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

skeletons: introduce api.symbol.prefix

Browse Source 
* data/skeletons/bison.m4 (b4_symbol_prefix): New.
(b4_symbol_kind): Use it.
* data/skeletons/c++.m4, data/skeletons/c.m4, data/skeletons/d.m4
* data/skeletons/java.m4 (api.symbol.prefix): Provide a default value.

* data/skeletons/glr.c, data/skeletons/glr.cc, data/skeletons/lalr1.cc,
* data/skeletons/lalr1.d, data/skeletons/lalr1.java, data/skeletons/yacc.c:
Adjust: use b4_symbol_prefix instead of YYSYMBOL_.
This commit is contained in:
Akim Demaille
2020-04-07 08:09:29 +02:00
parent 52d0e77c2c
commit bbb9750b3e
11 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/skeletons/c++.m4
View File

@@ -383,7 +383,7 @@ m4_define([b4_symbol_type_define],
symbol_kind_type type_get () const YY_NOEXCEPT;
/// The symbol type.
/// \a YYSYMBOL_YYEMPTY when empty.
/// \a ]b4_symbol_prefix[YYEMPTY when empty.
symbol_kind_type type;
};
@@ -456,7 +456,7 @@ m4_define([b4_public_types_define],
bool
]b4_parser_class[::basic_symbol<Base>::empty () const YY_NOEXCEPT
{
return Base::type_get () == YYSYMBOL_YYEMPTY;
return Base::type_get () == ]b4_symbol_prefix[YYEMPTY;
}
template <typename Base>
@@ -472,7 +472,7 @@ m4_define([b4_public_types_define],
// by_type.
]b4_inline([$1])b4_parser_class[::by_type::by_type ()
: type (YYSYMBOL_YYEMPTY)
: type (]b4_symbol_prefix[YYEMPTY)
{}
#if 201103L <= YY_CPLUSPLUS
@@ -494,7 +494,7 @@ m4_define([b4_public_types_define],
]b4_inline([$1])[void
]b4_parser_class[::by_type::clear ()
{
type = YYSYMBOL_YYEMPTY;
type = ]b4_symbol_prefix[YYEMPTY;
}
]b4_inline([$1])[void
@@ -540,11 +540,11 @@ m4_define([b4_yytranslate_define],
const int user_token_number_max_ = ]b4_user_token_number_max[;
if (t <= 0)
return YYSYMBOL_YYEOF;
return ]b4_symbol_prefix[YYEOF;
else if (t <= user_token_number_max_)
return YY_CAST (symbol_kind_type, translate_table[t]);
else
return YYSYMBOL_YYUNDEF;]])[
return ]b4_symbol_prefix[YYUNDEF;]])[
}
]])