tests: headers.at: strengthen.

[bison.git] / tests / existing.at

diff --git a/tests/existing.at b/tests/existing.at
index b754f3c69fe914a913cad926f461576227978575..582f6b3df6f7747c2da9a0324998f392c7d35fc0 100644 (file)
--- a/tests/existing.at
+++ b/tests/existing.at
@@ -1,7 +1,7 @@
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 
-# Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2012 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
@@ -42,27 +42,21 @@ AT_CHECK([[diff -u input-lalr.output input.output \
          [[0]], [$1])])
 
 AT_TEST_TABLES_AND_PARSE([$2[: LALR(1)]], [[LALR]], [[last-state]],
-                         [[%define lr.type "LALR"
+                         [[%define lr.type lalr
 ]$3],
                          [$4], [$5], [$6], [$7],
-                         [AT_LALR1_DIFF_CHECK([$8])$9]m4_if($#, 8, [],
-                                                            $#, 9, [],
-                                                            [, m4_shiftn(9,
-                                                                         $@)]))
+                         [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12])
 AT_TEST_TABLES_AND_PARSE([$2[: IELR(1)]], [[IELR]], [[last-state]],
-                         [[%define lr.type "IELR"
+                         [[%define lr.type ielr
 ]$3],
                          [$4], [$5], [$6], [$7],
-                         [AT_LALR1_DIFF_CHECK([$8])$9]m4_if($#, 8, [],
-                                                            $#, 9, [],
-                                                            [, m4_shiftn(9,
-                                                                         $@)]))
+                         [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12])
 AT_TEST_TABLES_AND_PARSE([$2[: Canonical LR(1)]], [[canonical LR]],
                          [[last-state,no-xml]],
-                         [[%define lr.type "canonical LR"
+                         [[%define lr.type canonical-lr
 ]$3],
                          [$4], [$5], [$6], [$7],
-                         [$9]m4_if($#, 8, [], $#, 9, [], [, m4_shiftn(9, $@)]))
+                         [$9], [$10], [$11], [$12])
 
 m4_popdef([AT_LALR1_DIFF_CHECK])
 ])
@@ -784,8 +778,7 @@ dnl In the case of the syntax error, the parser recovers, so it returns 0.
 # It reported 80 SR && 99 RR conflicts instead of 78/10!!!
 
 AT_TEST_EXISTING_GRAMMAR([[GNU Cim Grammar]],
-[[%union {}
-
+[[
 %token
        HACTIVATE HAFTER /*HAND*/ HARRAY HAT
        HBEFORE HBEGIN HBOOLEAN
@@ -1406,7 +1399,6 @@ State 427 conflicts: 9 shift/reduce, 2 reduce/reduce
 
 AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]],
 [[%error-verbose
-%union {}
 
 %token LABEL
 %token VARIABLE
@@ -1486,7 +1478,7 @@ AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]],
 %token RAND
 %token SRAND
 %token COPY
-%token THRU
+%token THROUGH
 %token TOP
 %token BOTTOM
 %token UPPER
@@ -1612,12 +1604,12 @@ placeless_element:
                {}
          DELIMITED
        | COPY TEXT
-       | COPY TEXT THRU
+       | COPY TEXT THROUGH
                {}
          DELIMITED
                {}
          until
-       | COPY THRU
+       | COPY THROUGH
                {}
          DELIMITED
                {}
@@ -1956,7 +1948,7 @@ dnl without being followed by "of".)
 [[VARIABLE, '=', LABEL, LEFT, DOT_X]],
 
 dnl BISON-STDERR
-[[input.y:471.11-48: warning: rule useless in parser due to conflicts: path: ORDINAL LAST object_type relative_path
+[[input.y:470.11-48: warning: rule useless in parser due to conflicts: path: ORDINAL LAST object_type relative_path
 ]],
 
 dnl LAST-STATE