Regen.

[bison.git] / tests / sets.at

diff --git a/tests/sets.at b/tests/sets.at
index 2c447cd232b7d0eedf940ea4fe89b8e78ec73e4d..0cbc3da609f8dde2d1fbc2269c055d7067daeb00 100644 (file)
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -1,5 +1,5 @@
 # Exercising Bison Grammar Sets.                      -*- Autotest -*-
 # Exercising Bison Grammar Sets.                      -*- Autotest -*-

-# Copyright 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002 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
 
 # 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


@@ -16,6 +16,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 

+

 # AT_EXTRACT_SETS(INPUT, OUTPUT)
 # ------------------------------
 # Extract the information about the grammar sets from a bison
 # AT_EXTRACT_SETS(INPUT, OUTPUT)
 # ------------------------------
 # Extract the information about the grammar sets from a bison


@@ -25,28 +26,28 @@ m4_define([AT_EXTRACT_SETS],
 [AT_DATA([extract.sed],
 [[#n
 /^NULLABLE$/ {
 [AT_DATA([extract.sed],
 [[#n
 /^NULLABLE$/ {

-   :nullable
+   :null

    p
    n
    p
    n

-   /^[         ]*$/! b nullable
+   /^[         ]*$/ !b null

 }
 /^FIRSTS$/ {
    :firsts
    p
    n
 }
 /^FIRSTS$/ {
    :firsts
    p
    n

-   /^[         ]*$/! b firsts
+   /^[         ]*$/ !b firsts

 }
 /^FDERIVES$/ {
 }
 /^FDERIVES$/ {

-   :fderives
+   :fderiv

    p
    n
    p
    n

-   /^[         ]*$/! b fderives
+   /^[         ]*$/ !b fderiv

 }
 /^DERIVES$/ {
 }
 /^DERIVES$/ {

-   :derives
+   :deriv

    p
    n
    p
    n

-   /^[         ]*$/! b derives
+   /^[         ]*$/ !b deriv

 }
 ]])
 AT_CHECK([sed -f extract.sed $1], 0, [stdout])
 }
 ]])
 AT_CHECK([sed -f extract.sed $1], 0, [stdout])


@@ -91,10 +92,10 @@ NULLABLE
        e: yes
 FIRSTS
        $axiom firsts
        e: yes
 FIRSTS
        $axiom firsts

-               4 ($axiom)
-               5 (e)
+               $axiom
+               e

        e firsts
        e firsts

-               5 (e)
+               e

 FDERIVES
        $axiom derives
                0: e $
 FDERIVES
        $axiom derives
                0: e $


@@ -163,22 +164,22 @@ h: 'h';
 
 AT_CHECK([[bison --trace input.y]], [], [], [stderr])
 
 
 AT_CHECK([[bison --trace input.y]], [], [], [stderr])
 

-AT_CHECK([[sed -n 's/[  ]*$//;/^TC: Output BEGIN/,/^TC: Output END/p' stderr]], [],
-[[TC: Output BEGIN
+AT_CHECK([[sed -n 's/[  ]*$//;/^RTC: Firsts Output BEGIN/,/^RTC: Firsts Output END/p' stderr]], [],
+[[RTC: Firsts Output BEGIN

 
    012345678
   .---------.
 
    012345678
   .---------.

- 0| 11111111|
- 1|  1111111|
- 2|   111111|
- 3|    11111|
- 4|     1111|
- 5|      111|
- 6|       11|
- 7|        1|
- 8|         |
+ 0|111111111|
+ 1| 11111111|
+ 2|  1111111|
+ 3|   111111|
+ 4|    11111|
+ 5|     1111|
+ 6|      111|
+ 7|       11|
+ 8|        1|

   `---------'
   `---------'

-TC: Output END
+RTC: Firsts Output END

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -226,10 +227,10 @@ NULLABLE
        exp: no
 FIRSTS
        $axiom firsts
        exp: no
 FIRSTS
        $axiom firsts

-               10 ($axiom)
-               11 (exp)
+               $axiom
+               exp

        exp firsts
        exp firsts

-               11 (exp)
+               exp

 FDERIVES
        $axiom derives
                0: exp $
 FDERIVES
        $axiom derives
                0: exp $