tests: generalize default main for api.namespace

* tests/local.at (AT_NAME_PREFIX): Also match api.namespace.
(AT_MAIN_DEFINE): Take it into account.
* tests/c++.at, tests/headers.at: Use AT_NAME_PREFIX.
(AT_CHECK_NAMESPACE): Rename as...
(AT_TEST): this.
This commit is contained in:
Akim Demaille
2013-01-21 16:01:53 +01:00
parent f42c012fcf
commit 56b91ae0b1
3 changed files with 33 additions and 50 deletions

View File

@@ -168,9 +168,10 @@ m4_pushdef([AT_PURE_IF],
[m4_bmatch([$3], [%define *api\.pure\|%pure-parser],
[m4_bmatch([$3], [%define *api\.pure *"?false"?], [$2], [$1])],
[$2])])
# AT_NAME_PREFIX: also consider api.namespace.
m4_pushdef([AT_NAME_PREFIX],
[m4_bmatch([$3], [\(%define api\.prefix\|%name-prefix\) ".*"],
[m4_bregexp([$3], [\(%define api\.prefix\|%name-prefix\) "\([^""]*\)"], [\2])],
[m4_bmatch([$3], [\(%define api\.\(namespace\|prefix\)\|%name-prefix\) ".*"],
[m4_bregexp([$3], [\(%define api\.\(namespace\|prefix\)\|%name-prefix\) "\([^""]*\)"], [\3])],
[yy])])
m4_pushdef([AT_TOKEN_CTOR_IF],
[m4_bmatch([$3], [%define api.token.constructor], [$1], [$2])])
@@ -462,7 +463,7 @@ main (int argc, char const* argv[])
yydebug |= 1;]], [[
(void) argc;
(void) argv;]])[
return yyparse ();
return ]AT_NAME_PREFIX[parse ();
}]],
[c++],
[[#include <cstdlib> // getenv.
@@ -470,7 +471,7 @@ main (int argc, char const* argv[])
int
main (int argc, char const* argv[])
{
yy::parser p;]AT_DEBUG_IF([[
]AT_NAME_PREFIX[::parser p;]AT_DEBUG_IF([[
if (getenv("YYDEBUG")
|| (argc == 2
&& (!strcmp (argv[1], "-d") || !strcmp (argv[1], "--debug"))))