Instead of attaching lookaheads and duplicating the rules being

[bison.git] / tests / sets.at

diff --git a/tests/sets.at b/tests/sets.at
index 7203dca13532bd58fdd5e35a2f711c7ee7b5fc9f..373271dc1a81e961499feaee0c870c469f098517 100644 (file)
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -1,5 +1,5 @@
 # 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
@@ -16,6 +16,7 @@
 # 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
@@ -25,28 +26,28 @@ m4_define([AT_EXTRACT_SETS],
 [AT_DATA([extract.sed],
 [[#n
 /^NULLABLE$/ {
-   :nullable
+   :null
    p
    n
-   /^[         ]*$/! b nullable
+   /^[         ]*$/ !b null
 }
 /^FIRSTS$/ {
    :firsts
    p
    n
-   /^[         ]*$/! b firsts
+   /^[         ]*$/ !b firsts
 }
 /^FDERIVES$/ {
-   :fderives
+   :fderiv
    p
    n
-   /^[         ]*$/! b fderives
+   /^[         ]*$/ !b fderiv
 }
 /^DERIVES$/ {
-   :derives
+   :deriv
    p
    n
-   /^[         ]*$/! b derives
+   /^[         ]*$/ !b deriv
 }
 ]])
 AT_CHECK([sed -f extract.sed $1], 0, [stdout])
@@ -77,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
-               1: e $ (rule 0)
+       $accept derives
+                 0  e $end
        e derives
-               2: 'e' (rule 1)
-               3: (rule 2)
+                 1  'e'
+                 2  /* empty */
 NULLABLE
-       $axiom: no
+       $accept: no
        e: yes
 FIRSTS
-       $axiom firsts
-               4 ($axiom)
-               5 (e)
+       $accept firsts
+               $accept
+               e
        e firsts
-               5 (e)
+               e
 FDERIVES
-       $axiom derives
-               0: e $
-               1: 'e'
-               2:
+       $accept derives
+                 0  e $end
+                 1  'e'
+                 2  /* empty */
        e derives
-               1: 'e'
-               2:
+                 1  'e'
+                 2  /* empty */
 ]])
 
 AT_CLEANUP
@@ -161,10 +162,10 @@ 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: Output BEGIN/,/^RTC: Output END/p' stderr]], [],
-[[RTC: Output BEGIN
+AT_CHECK([[sed -n 's/[  ]*$//;/^RTC: Firsts Output BEGIN/,/^RTC: Firsts Output END/p' stderr]], [],
+[[RTC: Firsts Output BEGIN
 
    012345678
   .---------.
@@ -178,7 +179,7 @@ AT_CHECK([[sed -n 's/[       ]*$//;/^RTC: Output BEGIN/,/^RTC: Output END/p' stderr]]
  7|       11|
  8|        1|
   `---------'
-RTC: Output END
+RTC: Firsts Output END
 ]])
 
 AT_CLEANUP
@@ -207,47 +208,47 @@ 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
-               1: exp $ (rule 0)
+       $accept derives
+                 0  exp $end
        exp derives
-               2: exp '<' exp (rule 1)
-               3: exp '>' exp (rule 2)
-               4: exp '+' exp (rule 3)
-               5: exp '-' exp (rule 4)
-               6: exp '^' exp (rule 5)
-               7: exp '=' exp (rule 6)
-               8: "exp" (rule 7)
+                 1  exp '<' exp
+                 2  exp '>' exp
+                 3  exp '+' exp
+                 4  exp '-' exp
+                 5  exp '^' exp
+                 6  exp '=' exp
+                 7  "exp"
 NULLABLE
-       $axiom: no
+       $accept: no
        exp: no
 FIRSTS
-       $axiom firsts
-               10 ($axiom)
-               11 (exp)
+       $accept firsts
+               $accept
+               exp
        exp firsts
-               11 (exp)
+               exp
 FDERIVES
-       $axiom derives
-               0: exp $
-               1: exp '<' exp
-               2: exp '>' exp
-               3: exp '+' exp
-               4: exp '-' exp
-               5: exp '^' exp
-               6: exp '=' exp
-               7: "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
-               1: exp '<' exp
-               2: exp '>' exp
-               3: exp '+' exp
-               4: exp '-' exp
-               5: exp '^' exp
-               6: exp '=' exp
-               7: "exp"
+                 1  exp '<' exp
+                 2  exp '>' exp
+                 3  exp '+' exp
+                 4  exp '-' exp
+                 5  exp '^' exp
+                 6  exp '=' exp
+                 7  "exp"
 ]])
 
 AT_CLEANUP