bison-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

tests: extract AT_LOCATION_PRINT_DECLARE and AT_LOCATION_PRINT_DEFINE


From: Akim Demaille
Subject: tests: extract AT_LOCATION_PRINT_DECLARE and AT_LOCATION_PRINT_DEFINE
Date: Fri, 6 Aug 2021 18:03:55 +0200

commit 9de593aba778dd22dfd42f94276269c0ec84ba42
Author: Akim Demaille <akim.demaille@gmail.com>
Date:   Thu Aug 5 08:59:59 2021 +0200

    tests: extract AT_LOCATION_PRINT_DECLARE and AT_LOCATION_PRINT_DEFINE
    
    * tests/local.at (AT_LOCATION_PRINT_DECLARE)
    (AT_LOCATION_PRINT_DEFINE): New.

diff --git a/tests/local.at b/tests/local.at
index c31569d2..5dde77c2 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -614,31 +614,22 @@ m4_define([AT_DATA_GRAMMAR(c)],
 $2])
 ])
 
-m4_define([AT_YYERROR_FORMALS(c)],
-[AT_YYERROR_ARG_LOC_IF([AT_YYLTYPE const * const llocp, 
])AT_PARAM_IF([AT_PARSE_PARAMS, ])[const char *msg]])
-
-m4_define([AT_YYERROR_PROTOTYPE(c)],
-[[void ]AT_NAME_PREFIX[error (]AT_YYERROR_FORMALS[)]])
-
-m4_define([AT_YYERROR_DECLARE_EXTERN(c)],
-[AT_YYERROR_PROTOTYPE;])
-
-m4_define([AT_YYERROR_DECLARE(c)],
-[[#include <stdio.h>
-]AT_LOCATION_IF([[
+# AT_LOCATION_PRINT_DECLARE
+# -------------------------
+m4_define([AT_LOCATION_PRINT_DECLARE],
+[AT_LOCATION_IF([[
 #if defined ]AT_YYLTYPE[_IS_TRIVIAL && ]AT_YYLTYPE[_IS_TRIVIAL
 static int location_print (FILE *yyo, ]AT_YYLTYPE[ const * const yylocp);
 # ifndef LOCATION_PRINT
 #  define LOCATION_PRINT(File, Loc) location_print (File, &(Loc))
 # endif
 #endif
-]])[
-static ]AT_YYERROR_DECLARE_EXTERN])
-
+]])dnl
+])
 
-# "%define parse.error custom" uses a different format, easy to check.
-# The "verbose" one can be computed from it (see _AT_CHECK_CALC_ERROR).
-m4_define([AT_YYERROR_DEFINE(c)],
+# AT_LOCATION_PRINT_DEFINE
+# ------------------------
+m4_define([AT_LOCATION_PRINT_DEFINE],
 [AT_LOCATION_IF([[
 # if defined ]AT_YYLTYPE[_IS_TRIVIAL && ]AT_YYLTYPE[_IS_TRIVIAL
 /* Print *YYLOCP on YYO. */
@@ -668,7 +659,28 @@ m4_define([AT_YYERROR_DEFINE(c)],
   return res;
 }
 #endif
-]])[
+]])])
+
+
+m4_define([AT_YYERROR_FORMALS(c)],
+[AT_YYERROR_ARG_LOC_IF([AT_YYLTYPE const * const llocp, 
])AT_PARAM_IF([AT_PARSE_PARAMS, ])[const char *msg]])
+
+m4_define([AT_YYERROR_PROTOTYPE(c)],
+[[void ]AT_NAME_PREFIX[error (]AT_YYERROR_FORMALS[)]])
+
+m4_define([AT_YYERROR_DECLARE_EXTERN(c)],
+[AT_YYERROR_PROTOTYPE;])
+
+m4_define([AT_YYERROR_DECLARE(c)],
+[[#include <stdio.h>
+]AT_LOCATION_PRINT_DECLARE[
+static ]AT_YYERROR_DECLARE_EXTERN])
+
+
+# "%define parse.error custom" uses a different format, easy to check.
+# The "verbose" one can be computed from it (see _AT_CHECK_CALC_ERROR).
+m4_define([AT_YYERROR_DEFINE(c)],
+[AT_LOCATION_PRINT_DEFINE[
 
 ]AT_ERROR_CUSTOM_IF([[
 int




reply via email to

[Prev in Thread] Current Thread [Next in Thread]