* NEWS: Version 2.0b.

[bison.git] / tests / sets.at

diff --git a/tests/sets.at b/tests/sets.at
index e1cf3ff62594f88fb6b55c71dd7ad3c0be2661b8..c33985da208577678de2e9e7e1007aa28b595744 100644 (file)
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -1,5 +1,5 @@
 # Exercising Bison Grammar Sets.                      -*- Autotest -*-
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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_EXTRACT_SETS(INPUT, OUTPUT)
@@ -29,25 +29,25 @@ m4_define([AT_EXTRACT_SETS],
    :null
    p
    n
-   /^[         ]*$/ !b null
+   /^[  ]*$/ !b null
 }
 /^FIRSTS$/ {
    :firsts
    p
    n
-   /^[         ]*$/ !b firsts
+   /^[  ]*$/ !b firsts
 }
 /^FDERIVES$/ {
    :fderiv
    p
    n
-   /^[         ]*$/ !b fderiv
+   /^[  ]*$/ !b fderiv
 }
 /^DERIVES$/ {
    :deriv
    p
    n
-   /^[         ]*$/ !b deriv
+   /^[  ]*$/ !b deriv
 }
 ]])
 AT_CHECK([sed -f extract.sed $1], 0, [stdout])
@@ -78,32 +78,32 @@ AT_DATA([[input.y]],
 e: 'e' | /* Nothing */;
 ]])
 
-AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+AT_CHECK([[bison --trace=sets input.y]], [], [], [stderr])
 AT_EXTRACT_SETS([stderr], [sets])
 AT_CHECK([[cat sets]], [],
 [[DERIVES
-       $axiom derives
-                 0  e $
+       $accept derives
+                 0  e $end
        e derives
                  1  'e'
                  2  /* empty */
 NULLABLE
-       $axiom: no
+       $accept: no
        e: yes
 FIRSTS
-       $axiom firsts
-               $axiom
+       $accept firsts
+               $accept
                e
        e firsts
                e
 FDERIVES
-       $axiom derives
-                 1  e $
-                 2  'e'
-                 3  /* empty */
+       $accept derives
+                 0  e $end
+                 1  'e'
+                 2  /* empty */
        e derives
-                 2  'e'
-                 3  /* empty */
+                 1  'e'
+                 2  /* empty */
 ]])
 
 AT_CLEANUP
@@ -162,7 +162,7 @@ g: h;
 h: 'h';
 ]])
 
-AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+AT_CHECK([[bison --trace=sets input.y]], [], [], [stderr])
 
 AT_CHECK([[sed -n 's/[  ]*$//;/^RTC: Firsts Output BEGIN/,/^RTC: Firsts Output END/p' stderr]], [],
 [[RTC: Firsts Output BEGIN
@@ -208,12 +208,12 @@ exp:
  ;
 ]])
 
-AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+AT_CHECK([[bison --trace=sets input.y]], [], [], [stderr])
 AT_EXTRACT_SETS([stderr], [sets])
 AT_CHECK([[cat sets]], [],
 [[DERIVES
-       $axiom derives
-                 0  exp $
+       $accept derives
+                 0  exp $end
        exp derives
                  1  exp '<' exp
                  2  exp '>' exp
@@ -223,32 +223,32 @@ AT_CHECK([[cat sets]], [],
                  6  exp '=' exp
                  7  "exp"
 NULLABLE
-       $axiom: no
+       $accept: no
        exp: no
 FIRSTS
-       $axiom firsts
-               $axiom
+       $accept firsts
+               $accept
                exp
        exp firsts
                exp
 FDERIVES
-       $axiom derives
-                 1  exp $
-                 2  exp '<' exp
-                 3  exp '>' exp
-                 4  exp '+' exp
-                 5  exp '-' exp
-                 6  exp '^' exp
-                 7  exp '=' exp
-                 8  "exp"
+       $accept derives
+                 0  exp $end
+                 1  exp '<' exp
+                 2  exp '>' exp
+                 3  exp '+' exp
+                 4  exp '-' exp
+                 5  exp '^' exp
+                 6  exp '=' exp
+                 7  "exp"
        exp derives
-                 2  exp '<' exp
-                 3  exp '>' exp
-                 4  exp '+' exp
-                 5  exp '-' exp
-                 6  exp '^' exp
-                 7  exp '=' exp
-                 8  "exp"
+                 1  exp '<' exp
+                 2  exp '>' exp
+                 3  exp '+' exp
+                 4  exp '-' exp
+                 5  exp '^' exp
+                 6  exp '=' exp
+                 7  "exp"
 ]])
 
 AT_CLEANUP