* tests/input.at (AT_CHECK_UNUSED_VALUES): Remove. Instead, do

all the test at once.  This makes the output easier to read in the
normal case.

diff --git a/ChangeLog b/ChangeLog
index 324aac412a78312658544bb7a92972e4fb3ab6f9..08759cf8c35ea19f09fe415e554a007256c65822 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-01-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * tests/input.at (AT_CHECK_UNUSED_VALUES): Remove.  Instead, do
+       all the test at once.  This makes the output easier to read in the
+       normal case.
+
        Fix a longstanding bug uncovered by bro-0.9a9/src/parse.y, which I
        got from <http://bro-ids.org/download.html>.  The bug is that
        when two actions appeared in succession, the second one was

diff --git a/tests/input.at b/tests/input.at
index 3264b24e076d2cd9d5c3754010ad1bd1ea74e1f3..76e12d2d5e3d4011621893e3e1496143ca24487b 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -86,87 +86,68 @@ AT_CLEANUP
 ## Unused values.  ##
 ## --------------- ##
 
-m4_define([AT_CHECK_UNUSED_VALUES],
-[AT_SETUP([Unused values])
+AT_SETUP([Unused values])
 
 AT_DATA([input.y],
 [[%token <integer> INT
-%type <integer> exp
-%destructor { destroy ($$); } INT exp
+%type <integer> a b c d e f g h i j k l
+%destructor { destroy ($$); } INT a b c d e f g h i j k l
 %%
-exp:
-  $1
-| INT
+start:
+  'a' a { $2 } | 'b' b { $2 } | 'c' c { $2 } | 'd' d { $2 } | 'e' e { $2 }
+| 'f' f { $2 } | 'g' g { $2 } | 'h' h { $2 } | 'i' i { $2 } | 'j' j { $2 }
+| 'k' k { $2 } | 'l' l { $2 }
 ;
+
+a: INT | INT { } INT { } INT { };
+b: INT | /* empty */;
+c: INT | INT { $1 } INT { } INT { };
+d: INT | INT { } INT { $1 } INT { };
+e: INT | INT { } INT {  } INT { $1 };
+f: INT | INT { } INT {  } INT { $$ = $1 + $3 + $5; };
+g: INT | INT { $$ } INT { $$ } INT { };
+h: INT | INT { $$ } INT { $$ = $2 } INT { };
+i: INT | INT INT { } { $$ = $1 + $2; };
+j: INT | INT INT { $<integer>$ = 1; } { $$ = $1 + $2; };
+k: INT | INT INT { $$; } { $$ = $3; } { };
+l: INT | INT { $$ = $1; } INT { $$ = $2 + $3; } INT { $$ = $4 + $5; };
+
 ]])
 
 AT_CHECK([bison input.y], [], [],
-[[$2]])
+[[input.y:11.10-32: warning: unset value: $$
+input.y:11.10-32: warning: unused value: $1
+input.y:11.10-32: warning: unused value: $3
+input.y:11.10-32: warning: unused value: $5
+input.y:12.9: warning: empty rule for typed nonterminal, and no action
+input.y:13.10-35: warning: unset value: $$
+input.y:13.10-35: warning: unused value: $3
+input.y:13.10-35: warning: unused value: $5
+input.y:14.10-35: warning: unset value: $$
+input.y:14.10-35: warning: unused value: $3
+input.y:14.10-35: warning: unused value: $5
+input.y:15.10-36: warning: unset value: $$
+input.y:15.10-36: warning: unused value: $3
+input.y:15.10-36: warning: unused value: $5
+input.y:17.10-38: warning: unset value: $$
+input.y:17.10-38: warning: unused value: $1
+input.y:17.10-38: warning: unused value: $2
+input.y:17.10-38: warning: unused value: $3
+input.y:17.10-38: warning: unused value: $4
+input.y:17.10-38: warning: unused value: $5
+input.y:18.10-43: warning: unset value: $$
+input.y:18.10-43: warning: unused value: $1
+input.y:18.10-43: warning: unused value: $3
+input.y:18.10-43: warning: unused value: $4
+input.y:18.10-43: warning: unused value: $5
+input.y:20.10-55: warning: unused value: $3
+input.y:21.10-41: warning: unset value: $$
+input.y:21.10-41: warning: unused value: $1
+input.y:21.10-41: warning: unused value: $2
+input.y:21.10-41: warning: unused value: $4
+]])
 
 AT_CLEANUP
-])
-
-AT_CHECK_UNUSED_VALUES([INT { } INT { } INT { }],
-[input.y:6.3-25: warning: unset value: $$
-input.y:6.3-25: warning: unused value: $1
-input.y:6.3-25: warning: unused value: $3
-input.y:6.3-25: warning: unused value: $5
-])
-
-AT_CHECK_UNUSED_VALUES([INT { $1 } INT { } INT { }],
-[input.y:6.3-28: warning: unset value: $$
-input.y:6.3-28: warning: unused value: $3
-input.y:6.3-28: warning: unused value: $5
-])
-
-AT_CHECK_UNUSED_VALUES([INT { } INT { $1 } INT { }],
-[input.y:6.3-28: warning: unset value: $$
-input.y:6.3-28: warning: unused value: $3
-input.y:6.3-28: warning: unused value: $5
-])
-
-AT_CHECK_UNUSED_VALUES([INT { } INT {  } INT { $1 }],
-[input.y:6.3-29: warning: unset value: $$
-input.y:6.3-29: warning: unused value: $3
-input.y:6.3-29: warning: unused value: $5
-])
-
-AT_CHECK_UNUSED_VALUES([INT { } INT {  } INT { $$ = $1 + $3 + $5; }])
-
-# Checking mid-rule values.
-AT_CHECK_UNUSED_VALUES([INT { $$ } INT { $$ } INT { }],
-[input.y:6.3-31: warning: unset value: $$
-input.y:6.3-31: warning: unused value: $1
-input.y:6.3-31: warning: unused value: $2
-input.y:6.3-31: warning: unused value: $3
-input.y:6.3-31: warning: unused value: $4
-input.y:6.3-31: warning: unused value: $5
-])
-
-AT_CHECK_UNUSED_VALUES([INT { $$ } INT { $$ = $2 } INT { }],
-[input.y:6.3-36: warning: unset value: $$
-input.y:6.3-36: warning: unused value: $1
-input.y:6.3-36: warning: unused value: $3
-input.y:6.3-36: warning: unused value: $4
-input.y:6.3-36: warning: unused value: $5
-])
-
-AT_CHECK_UNUSED_VALUES([INT INT { } { $$ = $1 + $2; }])
-
-AT_CHECK_UNUSED_VALUES([INT INT { $<integer>$ = 1; } { $$ = $1 + $2; }],
-[input.y:6.3-48: warning: unused value: $3
-])
-
-AT_CHECK_UNUSED_VALUES([INT INT { $$; } { $$ = $3; } { }],
-[input.y:6.3-34: warning: unset value: $$
-input.y:6.3-34: warning: unused value: $1
-input.y:6.3-34: warning: unused value: $2
-input.y:6.3-34: warning: unused value: $4
-])
-
-AT_CHECK_UNUSED_VALUES(
-  [INT { $$ = $1; } INT { $$ = $2 + $3; } INT { $$ = $4 + $5; }])
-
 
 
 ## ---------------------- ##