* data/glr.c (yyreturn): Use "Cleanup:" rather than "Error:"

[bison.git] / tests / synclines.at

diff --git a/tests/synclines.at b/tests/synclines.at
index 0128e6b84e89ad79fc7012e0ebd758516a1a0535..5ecbdb3cb6ef6ec7f028b10f1c8e5c06e197572f 100644 (file)
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,5 +1,5 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,8 +13,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 AT_BANNER([[User Actions.]])
 
@@ -29,11 +29,13 @@ m4_define([AT_SYNCLINES_COMPILE],
 [AT_CHECK([$CC $CFLAGS $CPPFLAGS -c $1], [ignore], [], [stderr])
 # In case GCC displays column information, strip it down.
 #
-#   input.y:4:2: #error "4"    or input.y:4.2: #error "4"
+#   input.y:4:2: #error "4"    or
+#   input.y:4.2: #error "4"    or
+#   input.y:4:2: error: #error "4"
 # =>
 #   input.y:4: #error "4"
 #
-AT_CHECK([[sed 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' stderr]], 0, [stdout])
+AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' stderr]], 0, [stdout])
 ])
 
 # AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG)
@@ -100,6 +102,7 @@ exp: '0';
 AT_TEST_SYNCLINE([%union synch line],
 [[%union {
 #error "2"
+  char dummy;
 }
 %{
 void yyerror (const char *s);