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

tests: c++: don't fuse prefix and namespace

Browse Source 
They are not the same concept.  It appears that we still consider that
api.prefix is the default for api.namespace.  We should stop that.

* tests/local.at (AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS):
Separate namespace and prefix.
Adjust dependencies.
This commit is contained in:
Akim Demaille
2018-10-06 16:50:30 +02:00
parent 53bde230c6
commit 1a0b3bf83b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/local.at
View File

@@ -184,8 +184,15 @@ m4_pushdef([AT_PURE_IF],
[$2])]) [$2])])
m4_pushdef([AT_PUSH_IF], m4_pushdef([AT_PUSH_IF],
[m4_bmatch([$3], [%define api.push-pull \(both\|pull\)], [$1], [$2])]) [m4_bmatch([$3], [%define api.push-pull \(both\|pull\)], [$1], [$2])])
# AT_NAME_PREFIX: also consider api.namespace. # AT_NAME_PREFIX.
m4_pushdef([AT_NAME_PREFIX], m4_pushdef([AT_NAME_PREFIX],
[m4_bmatch([$3], [\(%define api\.\|prefix\|%name-prefix\) .*],
[m4_bregexp([$3],
[\(%define api\.prefix\|%name-prefix\) [\{\"]\([^\"\}]*\)[\"\}]],
[\2])],
[yy])])
# AT_NAMESPACE: also consider api.prefix. FIXME: Stop that confusion.
m4_pushdef([AT_NAMESPACE],
[m4_bmatch([$3], [\(%define api\.\(namespace\|prefix\)\|%name-prefix\) .*], [m4_bmatch([$3], [\(%define api\.\(namespace\|prefix\)\|%name-prefix\) .*],
[m4_bregexp([$3], [m4_bregexp([$3],
[\(%define api\.\(namespace\|prefix\)\|%name-prefix\) [\{\"]\([^\"\}]*\)[\"\}]], [\(%define api\.\(namespace\|prefix\)\|%name-prefix\) [\{\"]\([^\"\}]*\)[\"\}]],
@@ -235,10 +242,10 @@ m4_pushdef([AT_PURE_LEX_IF],
[AT_SKEL_CC_IF([$1], [$2])])]) [AT_SKEL_CC_IF([$1], [$2])])])
m4_pushdef([AT_YYSTYPE], m4_pushdef([AT_YYSTYPE],
[AT_SKEL_CC_IF([AT_NAME_PREFIX[::parser::semantic_type]], [AT_SKEL_CC_IF([AT_NAMESPACE[::parser::semantic_type]],
[AT_API_PREFIX[STYPE]])]) [AT_API_PREFIX[STYPE]])])
m4_pushdef([AT_YYLTYPE], m4_pushdef([AT_YYLTYPE],
[AT_SKEL_CC_IF([AT_NAME_PREFIX[::parser::location_type]], [AT_SKEL_CC_IF([AT_NAMESPACE[::parser::location_type]],
[AT_API_PREFIX[LTYPE]])]) [AT_API_PREFIX[LTYPE]])])
@@ -299,6 +306,7 @@ m4_popdef([AT_API_prefix])
m4_popdef([AT_VARIANT_IF]) m4_popdef([AT_VARIANT_IF])
m4_popdef([AT_TOKEN_PREFIX]) m4_popdef([AT_TOKEN_PREFIX])
m4_popdef([AT_TOKEN_CTOR_IF]) m4_popdef([AT_TOKEN_CTOR_IF])
m4_popdef([AT_NAMESPACE])
m4_popdef([AT_NAME_PREFIX]) m4_popdef([AT_NAME_PREFIX])
m4_popdef([AT_LOCATION_TYPE_IF]) m4_popdef([AT_LOCATION_TYPE_IF])
m4_popdef([AT_LOCATION_IF]) m4_popdef([AT_LOCATION_IF])
@@ -543,7 +551,7 @@ m4_define([AT_YYERROR_DECLARE_EXTERN(c++)], [])
m4_define([AT_YYERROR_DEFINE(c++)], m4_define([AT_YYERROR_DEFINE(c++)],
[[/* A C++ error reporting function. */ [[/* A C++ error reporting function. */
void void
]AT_NAME_PREFIX[::parser::error (]AT_LOCATION_IF([[const location_type& l, ]])[const std::string& m) ]AT_NAMESPACE[::parser::error (]AT_LOCATION_IF([[const location_type& l, ]])[const std::string& m)
{ {
std::cerr << ]AT_LOCATION_IF([l << ": " << ])[m << '\n'; std::cerr << ]AT_LOCATION_IF([l << ": " << ])[m << '\n';
}]]) }]])
@@ -555,7 +563,7 @@ m4_define([AT_MAIN_DEFINE(c++)],
int int
main (int argc, char const* argv[]) main (int argc, char const* argv[])
{ {
]AT_NAME_PREFIX[::parser p;]AT_DEBUG_IF([[ ]AT_NAMESPACE[::parser p;]AT_DEBUG_IF([[
if (getenv("YYDEBUG") if (getenv("YYDEBUG")
|| (argc == 2 || (argc == 2
&& (!strcmp (argv[1], "-d") || !strcmp (argv[1], "--debug")))) && (!strcmp (argv[1], "-d") || !strcmp (argv[1], "--debug"))))