X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ed8e1f68e9743c391f4aba148968ea1e5e960973..8d69a1a3ae9c07e97951d98be9576a12e16a7c2b:/tests/sets.at

diff --git a/tests/sets.at b/tests/sets.at
index 7fa8d1f7..872cd872 100644
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -1,5 +1,5 @@
 # Exercising Bison Grammar Sets.                      -*- Autotest -*-
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright 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,45 @@
 # 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
+# trace output (INPUT), and save it in OUTPUT.
+# And remember, there is no alternation in portable sed.
+m4_define([AT_EXTRACT_SETS],
+[AT_DATA([extract.sed],
+[[#n
+/^NULLABLE$/ {
+   :nullable
+   p
+   n
+   /^[ 	]*$/! b nullable
+}
+/^FIRSTS$/ {
+   :firsts
+   p
+   n
+   /^[ 	]*$/! b firsts
+}
+/^FDERIVES$/ {
+   :fderives
+   p
+   n
+   /^[ 	]*$/! b fderives
+}
+/^DERIVES$/ {
+   :derives
+   p
+   n
+   /^[ 	]*$/! b derives
+}
+]])
+AT_CHECK([sed -f extract.sed $1], 0, [stdout])
+AT_CHECK([mv stdout $2])
+])
+
+
+
 AT_BANNER([[Grammar Sets (Firsts etc.).]])
 
 
@@ -38,81 +77,32 @@ AT_DATA([[input.y]],
 e: 'e' | /* Nothing */;
 ]])
 
-AT_CHECK([[bison --trace input.y]], [], [],
-[[RITEM
-  'e'  (rule 1)
-  (rule 2)
-
-
-DERIVES
+AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+AT_EXTRACT_SETS([stderr], [sets])
+AT_CHECK([[cat sets]], [],
+[[DERIVES
+	$axiom derives
+		1: e $ (rule 0)
 	e derives
-		1: 'e' (rule 1)
-		2: (rule 2)
-
-
-Entering set_nullable
+		2: 'e' (rule 1)
+		3: (rule 2)
 NULLABLE
+	$axiom: no
 	e: yes
-
-
-TC: Input BEGIN
-    @&t@
-   0
-  .-.
- 0| |
-  `-'
-TC: Input END
-
-TC: Output BEGIN
-    @&t@
-   0
-  .-.
- 0| |
-  `-'
-TC: Output END
-
 FIRSTS
+	$axiom firsts
+		4 ($axiom)
+		5 (e)
 	e firsts
-		4 (e)
-
-
+		5 (e)
 FDERIVES
+	$axiom derives
+		0: e $
+		1: 'e'
+		2:
 	e derives
 		1: 'e'
 		2:
-
-
-Processing state 0 (reached by $)
-Closure: input
-
-
-Closure: output
-   0: . 'e'  (rule 1)
-   2: .  (rule 2)
-
-
-Entering new_itemsets, state = 0
-Entering append_states, state = 0
-Entering get_state, state = 0, symbol = 3 ('e')
-Entering new_state, state = 0, symbol = 3 ('e')
-Exiting get_state => 1
-Processing state 1 (reached by 'e')
-Closure: input
-   1: .  (rule 1)
-
-
-Closure: output
-   1: .  (rule 1)
-
-
-Entering new_itemsets, state = 1
-Entering append_states, state = 1
-transpose: input
-  0: @&t@
-
-transpose: output
-  0: @&t@
-
 ]])
 
 AT_CLEANUP
@@ -171,23 +161,93 @@ g: h
 h: 'h'
 ]])
 
-AT_CHECK([bison --trace input.y 2>&1 |
-          sed -n '/^TC: Output BEGIN/,/^TC: Output END/p'],
-         [0],
+AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+
+AT_CHECK([[sed -n 's/[	 ]*$//;/^TC: Output BEGIN/,/^TC: Output END/p' stderr]], [],
 [[TC: Output BEGIN
-           @&t@
-   01234567
-  .--------.
- 0| 1111111|
- 1|  111111|
- 2|   11111|
- 3|    1111|
- 4|     111|
- 5|      11|
- 6|       1|
- 7|        |
-  `--------'
+
+   012345678
+  .---------.
+ 0| 11111111|
+ 1|  1111111|
+ 2|   111111|
+ 3|    11111|
+ 4|     1111|
+ 5|      111|
+ 6|       11|
+ 7|        1|
+ 8|         |
+  `---------'
 TC: Output END
 ]])
 
 AT_CLEANUP
+
+
+
+## -------- ##
+## Firsts.  ##
+## -------- ##
+
+AT_SETUP([Firsts])
+
+AT_DATA([input.y],
+[[%nonassoc '<' '>'
+%left '+' '-'
+%right '^' '='
+%%
+exp:
+   exp '<' exp
+ | exp '>' exp
+ | exp '+' exp
+ | exp '-' exp
+ | exp '^' exp
+ | exp '=' exp
+ | "exp"
+ ;
+]])
+
+AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+AT_EXTRACT_SETS([stderr], [sets])
+AT_CHECK([[cat sets]], [],
+[[DERIVES
+	$axiom derives
+		1: exp $ (rule 0)
+	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)
+NULLABLE
+	$axiom: no
+	exp: no
+FIRSTS
+	$axiom firsts
+		10 ($axiom)
+		11 (exp)
+	exp firsts
+		11 (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"
+	exp derives
+		1: exp '<' exp
+		2: exp '>' exp
+		3: exp '+' exp
+		4: exp '-' exp
+		5: exp '^' exp
+		6: exp '=' exp
+		7: "exp"
+]])
+
+AT_CLEANUP