Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / existing.at

diff --git a/tests/existing.at b/tests/existing.at
index b972a1fe4d794f04899e59e238f2a04aaf76615f..f62430c0e334eb461a91f524be3b2cbfeecdc84a 100644 (file)
--- a/tests/existing.at
+++ b/tests/existing.at
@@ -1,6 +1,6 @@
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 

-# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2011 Free Software
+# 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
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify


@@ -1478,7 +1478,7 @@ AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]],
 %token RAND
 %token SRAND
 %token COPY
 %token RAND
 %token SRAND
 %token COPY

-%token THRU
+%token THROUGH

 %token TOP
 %token BOTTOM
 %token UPPER
 %token TOP
 %token BOTTOM
 %token UPPER


@@ -1604,12 +1604,12 @@ placeless_element:
                 {}
           DELIMITED
         | COPY TEXT
                 {}
           DELIMITED
         | COPY TEXT

-        | COPY TEXT THRU
+        | COPY TEXT THROUGH

                 {}
           DELIMITED
                 {}
           until
                 {}
           DELIMITED
                 {}
           until

-        | COPY THRU
+        | COPY THROUGH

                 {}
           DELIMITED
                 {}
                 {}
           DELIMITED
                 {}


@@ -1948,7 +1948,7 @@ dnl without being followed by "of".)
 [[VARIABLE, '=', LABEL, LEFT, DOT_X]],
 
 dnl BISON-STDERR
 [[VARIABLE, '=', LABEL, LEFT, DOT_X]],
 
 dnl BISON-STDERR

-[[input.y:470.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 [-Wother]

 ]],
 
 dnl LAST-STATE
 ]],
 
 dnl LAST-STATE