[PATCH 5/6] tests: use the generic yyerror function.

[Akim Demaille]

* tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): Factor.
Use AT_YYERROR_DEFINE.
Therefore, instead of using stdout, use and check stderr.
* tests/glr-regression.at (Uninitialized location when reporting ambiguity):
Use AT_YYERROR_DEFINE.
---
 tests/actions.at        | 136 +++++++++++++++++++++++-------------------------
 tests/glr-regression.at |  17 +++---
 2 files changed, 72 insertions(+), 81 deletions(-)

diff --git a/tests/actions.at b/tests/actions.at
index 0cf2e75..3f47928 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -174,11 +174,12 @@ AT_CLEANUP
 ## Printers and Destructors.  ##
 ## -------------------------- ##
 
-# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4, BISON-DIRECTIVE, UNION-FLAG)
-# -----------------------------------------------------------------------------
+# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4,
+#                                  BISON-DIRECTIVE, UNION-FLAG)
+# -------------------------------------------------------------
 m4_define([_AT_CHECK_PRINTER_AND_DESTRUCTOR],
 [# Make sure complex $n work.
-m4_if([$1$2$3], $[1]$[2]$[3], [],
+m4_if([$1$2$3$4], $[1]$[2]$[3]$[4], [],
        [m4_fatal([$0: Invalid arguments: address@hidden)])dnl
 
 # Be sure to pass all the %directives to this macro to have correct
@@ -193,13 +194,16 @@ AT_DATA_GRAMMAR([[input.y]],
 
 #define YYINITDEPTH 10
 #define YYMAXDEPTH 10
-]AT_LALR1_CC_IF(
-  [#define RANGE(Location) (Location).begin.line, (Location).end.line],
-  [#define RANGE(Location) (Location).first_line, (Location).last_line])
-[}
+#define RANGE(Location) ]AT_LALR1_CC_IF([(Location).begin.line, 
(Location).end.line],
+      [(Location).first_line, (Location).last_line])[
+
+/* Display the symbol type Symbol.  */
+#define V(Symbol, Value, Location, Sep) \
+   fprintf (stderr, #Symbol " (address@hidden)" Sep, Value, RANGE(Location))
+}
 
-$5]
-m4_ifval([$6], [%union
+$5
+]m4_ifval([$6], [%union
 {
   int ival;
 }])
@@ -221,28 +225,28 @@ AT_LALR1_CC_IF([typedef yy::location YYLTYPE;])[
   input line thing 'x' 'y'
 
 %destructor
-  { printf ("Freeing nterm input (address@hidden)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing nterm input (address@hidden)\n", $$, RANGE 
(@$)); }
   input
 
 %destructor
-  { printf ("Freeing nterm line (address@hidden)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing nterm line (address@hidden)\n", $$, RANGE (@$)); 
}
   line
 
 %destructor
-  { printf ("Freeing nterm thing (address@hidden)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing nterm thing (address@hidden)\n", $$, RANGE 
(@$)); }
   thing
 
 %destructor
-  { printf ("Freeing token 'x' (address@hidden)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing token 'x' (address@hidden)\n", $$, RANGE (@$)); }
   'x'
 
 %destructor
-  { printf ("Freeing token 'y' (address@hidden)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing token 'y' (address@hidden)\n", $$, RANGE (@$)); }
   'y'
 
 %token END 0
 %destructor
-  { printf ("Freeing token END (address@hidden)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing token END (address@hidden)\n", $$, RANGE (@$)); }
   END
 
 %%
@@ -257,14 +261,15 @@ input:
   /* Nothing. */
     {
       $$ = 0;
-      printf ("input (address@hidden): /* Nothing */\n", $$, RANGE (@$));
+      V(input, $$, @$, ": /* Nothing */\n");
     }
 | line input /* Right recursive to load the stack so that popping at
                END can be exercised.  */
     {
       $$ = 2;
-      printf ("input (address@hidden): line (address@hidden) input 
(address@hidden)\n",
-             $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));
+      V(input, $$, @$, ": ");
+      V(line,  $1, @1, " ");
+      V(input, $2, @2, "\n");
     }
 ;
 
@@ -272,28 +277,36 @@ line:
   thing thing thing ';'
     {
       $$ = $1;
-      printf ("line (address@hidden): thing (address@hidden) thing 
(address@hidden) thing (address@hidden) ';' (address@hidden)\n",
-              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2),
-              $3, RANGE (@3), $4, RANGE (@4));
+      V(line,  $$, @$, ": ");
+      V(thing, $1, @1, " ");
+      V(thing, $2, @2, " ");
+      V(thing, $3, @3, " ");
+      V(;,     $4, @4, "\n");
     }
 | '(' thing thing ')'
     {
       $$ = $1;
-      printf ("line (address@hidden): '(' (address@hidden) thing 
(address@hidden) thing (address@hidden) ')' (address@hidden)\n",
-              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2),
-              $3, RANGE (@3), $4, RANGE (@4));
+      V(line,  $$, @$, ": ");
+      V('(',   $1, @1, " ");
+      V(thing, $2, @2, " ");
+      V(thing, $3, @3, " ");
+      V(')',   $4, @4, "\n");
     }
 | '(' thing ')'
     {
       $$ = $1;
-      printf ("line (address@hidden): '(' (address@hidden) thing 
(address@hidden) ')' (address@hidden)\n",
-              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2), $3, RANGE (@3));
+      V(line,  $$, @$, ": ");
+      V('(',   $1, @1, " ");
+      V(thing, $2, @2, " ");
+      V(')',   $3, @3, "\n");
     }
 | '(' error ')'
     {
       $$ = -1;
-      printf ("line (address@hidden): '(' (address@hidden) error (@%d-%d) ')' 
(address@hidden)\n",
-              $$, RANGE (@$), $1, RANGE (@1), RANGE (@2), $3, RANGE (@3));
+      V(line,  $$, @$, ": ");
+      V('(',   $1, @1, " ");
+      fprintf (stderr, "error (@%d-%d) ", RANGE(@2));
+      V(')',   $3, @3, "\n");
     }
 ;
 
@@ -301,14 +314,16 @@ thing:
   'x'
     {
       $$ = $1;
-      printf ("thing (address@hidden): 'x' (address@hidden)\n",
-              $$, RANGE (@$), $1, RANGE (@1));
+      V(thing, $$, @$, ": ");
+      V('x',   $1, @1, "\n");
     }
 ;
 %%
 /* Alias to ARGV[1]. */
 const char *source = YY_NULL;
 
+]AT_YYERROR_DEFINE[
+
 static
 ]AT_YYLEX_PROTOTYPE[
 {
@@ -316,32 +331,18 @@ static
 
   int c = ]AT_VAL[]m4_ifval([$6], [.ival])[ = counter++;
   /* As in BASIC, line numbers go from 10 to 10.  */
-]AT_LALR1_CC_IF(
-[ AT_LOC.begin.line = AT_LOC.begin.column = 10 * c;
-  AT_LOC.end.line = AT_LOC.end.column = AT_LOC.begin.line + 9;
-],
-[ AT_LOC.first_line = AT_LOC.first_column = 10 * c;
-  AT_LOC.last_line = AT_LOC.last_column = AT_LOC.first_line + 9;
-])[
-
+  ]AT_LOC_FIRST_LINE[ = ]AT_LOC_FIRST_COLUMN[ = 10 * c;
+  ]AT_LOC_LAST_LINE[ = ]AT_LOC_LAST_COLUMN[ = ]AT_LOC_FIRST_LINE[ + 9;
   assert (0 <= c && c <= strlen (source));
   if (source[c])
-    printf ("sending: '%c'", source[c]);
+    fprintf (stderr, "sending: '%c'", source[c]);
   else
-    printf ("sending: END");
-  printf (" (address@hidden)\n", c, RANGE (]AT_LOC[));
+    fprintf (stderr, "sending: END");
+  fprintf (stderr, " (address@hidden)\n", c, RANGE (]AT_LOC[));
   return source[c];
 }
-
 ]AT_LALR1_CC_IF(
-[/* A C++ error reporting function. */
-void
-yy::parser::error (const location& l, const std::string& m)
-{
-  printf ("%d-%d: %s\n", RANGE (l), m.c_str());
-}
-
-static bool yydebug;
+[static bool yydebug;
 int
 yyparse ()
 {
@@ -349,12 +350,7 @@ yyparse ()
   parser.set_debug_level (yydebug);
   return parser.parse ();
 }
-],
-[static void
-yyerror (const char *msg)
-{
-  printf ("%d-%d: %s\n", RANGE (yylloc), msg);
-}])[
+])[
 
 int
 main (int argc, const char *argv[])
@@ -366,9 +362,9 @@ main (int argc, const char *argv[])
   status = yyparse ();
   switch (status)
     {
-      case 0: printf ("Successful parse.\n"); break;
-      case 1: printf ("Parsing FAILED.\n"); break;
-      default: printf ("Parsing FAILED (status %d).\n", status); break;
+      case 0: fprintf (stderr, "Successful parse.\n"); break;
+      case 1: fprintf (stderr, "Parsing FAILED.\n"); break;
+      default: fprintf (stderr, "Parsing FAILED (status %d).\n", status); 
break;
     }
   return status;
 }
@@ -382,7 +378,7 @@ AT_FULL_COMPILE([input])
 # I.e., epsilon-reductions, as in "(x)" which ends by reducing
 # an empty "line" nterm.
 # FIXME: This location is not satisfying.  Depend on the lookahead?
-AT_PARSER_CHECK([./input '(x)'], 0,
+AT_PARSER_CHECK([./input '(x)'], 0, [],
 [[sending: '(' (address@hidden)
 sending: 'x' (address@hidden)
 thing (address@hidden): 'x' (address@hidden)
@@ -401,10 +397,10 @@ Successful parse.
 # ---------------------------------
 # '(y)' is an error, but can be recovered from.  But what's the location
 # of the error itself ('y'), and of the resulting reduction ('(error)').
-AT_PARSER_CHECK([./input '(y)'], 0,
+AT_PARSER_CHECK([./input '(y)'], 0, [],
 [[sending: '(' (address@hidden)
 sending: 'y' (address@hidden)
-10-19: syntax error, unexpected 'y', expecting 'x'
+10.10-19.18: syntax error, unexpected 'y', expecting 'x'
 Freeing token 'y' (address@hidden)
 sending: ')' (address@hidden)
 line (address@hidden): '(' (address@hidden) error (@10-19) ')' (address@hidden)
@@ -431,14 +427,14 @@ Successful parse.
 #     '(', 'x', ')',
 #     '(', 'x', ')',
 #     'y'
-AT_PARSER_CHECK([./input '(xxxxx)(x)(x)y'], 1,
+AT_PARSER_CHECK([./input '(xxxxx)(x)(x)y'], 1, [],
 [[sending: '(' (address@hidden)
 sending: 'x' (address@hidden)
 thing (address@hidden): 'x' (address@hidden)
 sending: 'x' (address@hidden)
 thing (address@hidden): 'x' (address@hidden)
 sending: 'x' (address@hidden)
-30-39: syntax error, unexpected 'x', expecting ')'
+30.30-39.38: syntax error, unexpected 'x', expecting ')'
 Freeing nterm thing (address@hidden)
 Freeing nterm thing (address@hidden)
 Freeing token 'x' (address@hidden)
@@ -463,7 +459,7 @@ input (address@hidden): /* Nothing */
 input (address@hidden): line (address@hidden) input (address@hidden)
 input (address@hidden): line (address@hidden) input (address@hidden)
 input (address@hidden): line (address@hidden) input (address@hidden)
-130-139: syntax error, unexpected 'y', expecting END
+130.130-139.138: syntax error, unexpected 'y', expecting END
 Freeing nterm input (address@hidden)
 Freeing token 'y' (address@hidden)
 Parsing FAILED.
@@ -479,7 +475,7 @@ Parsing FAILED.
 #     '(', 'x', ')',
 #     '(', 'x', ')',
 #     'x'
-AT_PARSER_CHECK([./input '(x)(x)x'], 1,
+AT_PARSER_CHECK([./input '(x)(x)x'], 1, [],
 [[sending: '(' (address@hidden)
 sending: 'x' (address@hidden)
 thing (address@hidden): 'x' (address@hidden)
@@ -493,7 +489,7 @@ line (address@hidden): '(' (address@hidden) thing 
(address@hidden) ')' (address@hidden)
 sending: 'x' (address@hidden)
 thing (address@hidden): 'x' (address@hidden)
 sending: END (address@hidden)
-70-79: syntax error, unexpected END, expecting 'x'
+70.70-79.78: syntax error, unexpected END, expecting 'x'
 Freeing nterm thing (address@hidden)
 Freeing nterm line (address@hidden)
 Freeing nterm line (address@hidden)
@@ -507,7 +503,7 @@ Parsing FAILED.
 # Upon stack overflow, all symbols on the stack should be destroyed.
 # Only check for yacc.c.
 AT_YACC_IF([
-AT_PARSER_CHECK([./input '(x)(x)(x)(x)(x)(x)(x)'], 2,
+AT_PARSER_CHECK([./input '(x)(x)(x)(x)(x)(x)(x)'], 2, [],
 [[sending: '(' (address@hidden)
 sending: 'x' (address@hidden)
 thing (address@hidden): 'x' (address@hidden)
@@ -542,7 +538,7 @@ sending: '(' (address@hidden)
 sending: 'x' (address@hidden)
 thing (address@hidden): 'x' (address@hidden)
 sending: ')' (address@hidden)
-200-209: memory exhausted
+200.200-209.208: memory exhausted
 Freeing nterm thing (address@hidden)
 Freeing nterm line (address@hidden)
 Freeing nterm line (address@hidden)
@@ -1201,7 +1197,7 @@ AT_DATA_GRAMMAR([[input.y]],
 %debug
 
 ]$1[ {
-  printf ("%d\n", @$.first_line);
+  fprintf (stderr, "%d\n", @$.first_line);
 } ]m4_if($1, [%initial-action], [], [[start]])[
 
 %%
diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 288de25..91dedb8 100644
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1550,7 +1550,8 @@ AT_CLEANUP
 
 AT_SETUP([Uninitialized location when reporting ambiguity])
 
-AT_BISON_OPTION_PUSHDEFS
+AT_BISON_OPTION_PUSHDEFS([%glr-parser %locations %define api.pure])
+
 AT_DATA_GRAMMAR([glr-regr17.y],
 [[
 %glr-parser
@@ -1561,8 +1562,8 @@ AT_DATA_GRAMMAR([glr-regr17.y],
 %union { int dummy; }
 
 %{
-  static void yyerror (YYLTYPE *, char const *);
-  static int yylex (YYSTYPE *, YYLTYPE *);
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[
 %}
 
 %initial-action {
@@ -1594,13 +1595,7 @@ empty2: ;
 %%
 # include <assert.h>
 
-static void
-yyerror (YYLTYPE *locp, char const *msg)
-{
-  fprintf (stderr, "%d.%d-%d.%d: %s.\n", locp->first_line,
-           locp->first_column, locp->last_line, locp->last_column, msg);
-}
-
+]AT_YYERROR_DEFINE[
 static int
 yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
 {
@@ -1628,7 +1623,7 @@ AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
 AT_COMPILE([glr-regr17])
 
 AT_PARSER_CHECK([[./glr-regr17]], 0, [],
-[1.1-2.3: syntax is ambiguous.
+[1.1-2.2: syntax is ambiguous
 ])
 
 AT_CLEANUP
-- 
1.7.11.1