Merge remote-tracking branch 'origin/maint'

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

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 98ebdfa6d5c26742cdda049e35bc4269631bc5c7..80248aa4e661a6232f5841ca9473d1688c1dca43 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1545,13 +1545,6 @@ AT_DATA_GRAMMAR([glr-regr17.y],
   ]AT_YYLEX_DECLARE[
 %}
 
   ]AT_YYLEX_DECLARE[
 %}
 

-%initial-action {
-  @$.first_line = 1;
-  @$.first_column = 1;
-  @$.last_line = 1;
-  @$.last_column = 1;
-}
-

 %%
 
 /* Tests the case of an empty RHS that has inherited the location of the
 %%
 
 /* Tests the case of an empty RHS that has inherited the location of the


@@ -1652,11 +1645,11 @@ main (void)
 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: result type clash on merge function 'merge': <type2> != <type1>
-glr-regr18.y:25.18-24: previous declaration
-glr-regr18.y:27.13-19: result type clash on merge function 'merge': <type3> != <type2>
-glr-regr18.y:26.18-24: previous declaration
-])
+[[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
+]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP