[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/11] tests: fix definition for parser class name
From: |
Akim Demaille |
Subject: |
[PATCH 01/11] tests: fix definition for parser class name |
Date: |
Sun, 10 Jan 2021 17:59:00 +0100 |
* tests/local.at (AT_PARSER_CLASS): Fix it.
And use it.
---
tests/glr-regression.at | 2 +-
tests/local.at | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 83715146..adf0aa00 100644
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -30,7 +30,7 @@ m4_pushdef([AT_YYPARSE_DEFINE],
static int
yyparse ()
{
- ]AT_NAMESPACE[::parser p;]AT_DEBUG_IF([[
+ ]AT_NAMESPACE[::]AT_PARSER_CLASS[ p;]AT_DEBUG_IF([[
int debug = !!getenv ("YYDEBUG");
p.set_debug_level (debug);]])[
return p.parse ();
diff --git a/tests/local.at b/tests/local.at
index 9c939675..6390e562 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -281,7 +281,7 @@ m4_ifndef([AT_PARSE_PARAMS],
m4_pushdef([AT_PARSER_CLASS],
[m4_bmatch([$3], [%define *api\.parser\.class {\([^\}]*\)}],
[m4_bregexp([$3], [%define *api\.parser\.class {\([^\}]*\)}],
[\1])],
- [AT_API_PREFIX[]Parser])])
+ [AT_JAVA_IF([AT_API_PREFIX[]Parser], [parser])])])
m4_pushdef([AT_PURE_IF],
[m4_bmatch([$3], [%define *api\.pure\|%pure-parser],
@@ -358,22 +358,22 @@ m4_pushdef([AT_TOKEN_TRANSLATE_IF],
[AT_ERROR_CUSTOM_IF([$1], [AT_ERROR_DETAILED_IF([$1], [$2])])])
m4_pushdef([AT_TOKEN],
-
[AT_CXX_IF([AT_CXX_IF([AT_NAMESPACE::parser::token::])[]AT_TOKEN_PREFIX[$1]],
+
[AT_CXX_IF([AT_CXX_IF([AT_NAMESPACE::AT_PARSER_CLASS::token::])[]AT_TOKEN_PREFIX[$1]],
[AT_TOKEN_PREFIX[$1]])])
m4_pushdef([AT_YYSTYPE],
-[AT_CXX_IF([AT_NAMESPACE[::parser::semantic_type]],
+[AT_CXX_IF([AT_NAMESPACE[::]AT_PARSER_CLASS[::semantic_type]],
[AT_API_PREFIX[STYPE]])])
m4_pushdef([AT_YYLTYPE],
-[AT_CXX_IF([AT_NAMESPACE[::parser::location_type]],
+[AT_CXX_IF([AT_NAMESPACE[::]AT_PARSER_CLASS[::location_type]],
[AT_API_PREFIX[LTYPE]])])
AT_TOKEN_CTOR_IF(
[m4_pushdef([AT_LOC], [[(]AT_NAME_PREFIX[lloc)]])
m4_pushdef([AT_VAL], [[(]AT_NAME_PREFIX[lval)]])
m4_pushdef([AT_YYLEX_FORMALS], [])
- m4_pushdef([AT_YYLEX_RETURN], [AT_NAMESPACE::parser::symbol_type])
+ m4_pushdef([AT_YYLEX_RETURN],
[AT_NAMESPACE::AT_PARSER_CLASS::symbol_type])
m4_pushdef([AT_YYLEX_ARGS], [])
m4_pushdef([AT_USE_LEX_ARGS], [])
m4_pushdef([AT_YYLEX_PRE_FORMALS], [])
@@ -778,14 +778,14 @@ m4_define([AT_YYERROR_DECLARE_EXTERN(c++)], [])
m4_define([AT_YYERROR_DEFINE(c++)],
[[/* A C++ error reporting function. */
void
-]AT_NAMESPACE[::parser::error (]AT_LOCATION_IF([[const location_type& l,
]])[const std::string& m)
+]AT_NAMESPACE[::]AT_PARSER_CLASS[::error (]AT_LOCATION_IF([[const
location_type& l, ]])[const std::string& m)
{]m4_bmatch(m4_defn([AT_PARSE_PARAMS]), [nerrs], [[
++global_nerrs;
++*nerrs;]])[
std::cerr << ]AT_LOCATION_IF([l << ": " << ])[m << '\n';
}]AT_ERROR_CUSTOM_IF([[
void
-]AT_NAMESPACE[::parser::report_syntax_error (const context& ctx) const
+]AT_NAMESPACE[::]AT_PARSER_CLASS[::report_syntax_error (const context& ctx)
const
{]AT_PARAM_IF([m4_bpatsubst(m4_defn([AT_PARSE_PARAMS]),
[[^,]+[^A-Za-z_0-9]\([A-Za-z_][A-Za-z_0-9]*\),* *], [
YY_USE (\1);])])[]m4_bmatch(m4_defn([AT_PARSE_PARAMS]), [nerrs], [[
@@ -826,7 +826,7 @@ m4_define([AT_MAIN_DEFINE(c++)],
int
main (int argc, char const* argv[])
{
- ]AT_NAMESPACE[::parser p;]AT_DEBUG_IF([[
+ ]AT_NAMESPACE[::]AT_PARSER_CLASS[ p;]AT_DEBUG_IF([[
int debug = !!getenv ("YYDEBUG");
for (int i = 1; i < argc; ++i)
if (!strcmp (argv[i], "-p")
--
2.30.0
- [PATCH 00/11] glr2.cc: add support for token constructors, Akim Demaille, 2021/01/10
- [PATCH 01/11] tests: fix definition for parser class name,
Akim Demaille <=
- [PATCH 02/11] glr: tests: formatting changes, Akim Demaille, 2021/01/10
- [PATCH 03/11] glr: tests: more macros, Akim Demaille, 2021/01/10
- [PATCH 04/11] glr: examples: fix locations, Akim Demaille, 2021/01/10
- [PATCH 05/11] glr2.cc: fix memory leak, Akim Demaille, 2021/01/10
- [PATCH 06/11] glr2.cc: use references to print symbols, Akim Demaille, 2021/01/10
- [PATCH 07/11] glr2.cc: example: style changes, Akim Demaille, 2021/01/10
- [PATCH 08/11] glr2.cc: rely on symbol kinds rather than token kinds, Akim Demaille, 2021/01/10
- [PATCH 09/11] glr2.cc: tests: simplify, Akim Demaille, 2021/01/10
- [PATCH 11/11] glr2.cc: add support for api.token.constructor, Akim Demaille, 2021/01/10
- [PATCH 10/11] glr2.cc: introduce the yytranslate_ member function, Akim Demaille, 2021/01/10