From edfcca84812402d1b59207ab5a4adfce43bf76e7 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Wed, 30 Dec 2020 08:25:39 +0100
Subject: [PATCH] %merge: clearer tests on diagnostics

* tests/glr-regression.at: Use caret errors.
---
 tests/glr-regression.at | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 2de9e616..49451daf 100644
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1944,11 +1944,19 @@ sym3: %merge<merge> { $$ = 0; } ;
 ]AT_MAIN_DEFINE[
 ]])
 
-AT_BISON_CHECK([[-o glr-regr18.c -rall glr-regr18.y]], 1, [],
+AT_BISON_CHECK([[-o glr-regr18.c -rall -fcaret glr-regr18.y]], 1, [],
 [[glr-regr18.y:30.18-24: error: result type clash on merge function 'merge': <type2> != <type1>
+   30 | sym2: sym3 %merge<merge> { $$ = $][1; } ;
+      |                  ^~~~~~~
 glr-regr18.y:29.18-24: note: previous declaration
+   29 | sym1: sym2 %merge<merge> { $$ = $][1; } ;
+      |                  ^~~~~~~
 glr-regr18.y:31.13-19: error: result type clash on merge function 'merge': <type3> != <type2>
+   31 | sym3: %merge<merge> { $$ = 0; } ;
+      |             ^~~~~~~
 glr-regr18.y:30.18-24: note: previous declaration
+   30 | sym2: sym3 %merge<merge> { $$ = $][1; } ;
+      |                  ^~~~~~~
 ]])
 
 AT_BISON_OPTION_POPDEFS
-- 
2.11.4.GIT