diagnostics: no longer pretty-print rules in error messages, carets suffice

[bison.git] / tests / glr-regression.at

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index e5e758cd77fee0fa8186b3086f841f09b051d618..918bc8d8ef89353fb726fe2cc12a923e30e24bab 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1643,10 +1643,10 @@ sym3: %merge<merge> { $$ = 0; } ;
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [],

-[[glr-regr18.y:26.18-24: error: result type clash on merge function 'merge': <type2> != <type1>
-glr-regr18.y:25.18-24:     previous declaration
-glr-regr18.y:27.13-19: error: result type clash on merge function 'merge': <type3> != <type2>
-glr-regr18.y:26.18-24:     previous declaration
+[[glr-regr18.y:28.18-24: error: result type clash on merge function 'merge': <type2> != <type1>
+glr-regr18.y:27.18-24:     previous declaration
+glr-regr18.y:29.13-19: error: result type clash on merge function 'merge': <type3> != <type2>
+glr-regr18.y:28.18-24:     previous declaration

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1658,7 +1658,7 @@ AT_CLEANUP
 
 AT_SETUP([Ambiguity reports])
 
 
 AT_SETUP([Ambiguity reports])
 

-AT_BISON_OPTION_PUSHDEFS
+AT_BISON_OPTION_PUSHDEFS([%debug])

 AT_DATA_GRAMMAR([input.y],
 [[
 %{
 AT_DATA_GRAMMAR([input.y],
 [[
 %{


@@ -1681,12 +1681,7 @@ d: /* nada.  */;
 %%
 ]AT_YYLEX_DEFINE(["abc"])[
 ]AT_YYERROR_DEFINE[
 %%
 ]AT_YYLEX_DEFINE(["abc"])[
 ]AT_YYERROR_DEFINE[

-int
-main (void)
-{
-  yydebug = 1;
-  return !!yyparse ();
-}
+]AT_MAIN_DEFINE[

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS
 


@@ -1695,7 +1690,7 @@ AT_BISON_CHECK([[-o input.c input.y]], 0, [],
 ]])
 AT_COMPILE([input])
 
 ]])
 AT_COMPILE([input])
 

-AT_PARSER_CHECK([[./input]], 1, [],
+AT_PARSER_CHECK([[./input --debug]], 1, [],

 [Starting parse
 Entering state 0
 Reading a token: Next token is token 'a' ()
 [Starting parse
 Entering state 0
 Reading a token: Next token is token 'a' ()


@@ -1704,14 +1699,14 @@ Entering state 1
 Reading a token: Next token is token 'b' ()
 Shifting token 'b' ()
 Entering state 3
 Reading a token: Next token is token 'b' ()
 Shifting token 'b' ()
 Entering state 3

-Reducing stack 0 by rule 3 (line 25):
+Reducing stack 0 by rule 3 (line 27):

    $1 = token 'b' ()
 -> $$ = nterm b ()
 Entering state 4
 Reading a token: Next token is token 'c' ()
 Shifting token 'c' ()
 Entering state 6
    $1 = token 'b' ()
 -> $$ = nterm b ()
 Entering state 4
 Reading a token: Next token is token 'c' ()
 Shifting token 'c' ()
 Entering state 6

-Reducing stack 0 by rule 4 (line 26):
+Reducing stack 0 by rule 4 (line 28):

 -> $$ = nterm d ()
 Entering state 7
 Reading a token: Now at end of input.
 -> $$ = nterm d ()
 Entering state 7
 Reading a token: Now at end of input.