X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d40ba6c2725f98cbbf8991f55023dd2e392efec9..dd60572a8b54ebc51421448f09f83f39bc0a4229:/tests/input.at

diff --git a/tests/input.at b/tests/input.at
index e7cf114c..fb571ab6 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -25,33 +25,17 @@ AT_BANNER([[Input Processing.]])
 ## Invalid $n.  ##
 ## ------------ ##
 
-AT_SETUP([Invalid dollar-n])
+AT_SETUP([Invalid \$n and @n])
 
 AT_DATA([input.y],
 [[%%
 exp: { $$ = $1 ; };
-]])
-
-AT_CHECK([bison input.y], [1], [],
-[[input.y:2.13-14: integer out of range: `$1'
-]])
-
-AT_CLEANUP
-
-
-## ------------ ##
-## Invalid @n.  ##
-## ------------ ##
-
-AT_SETUP([Invalid @n])
-
-AT_DATA([input.y],
-[[%%
 exp: { @$ = @1 ; };
 ]])
 
 AT_CHECK([bison input.y], [1], [],
-[[input.y:2.13-14: integer out of range: `@1'
+[[input.y:2.13-14: integer out of range: `$1'
+input.y:3.13-14: integer out of range: `@1'
 ]])
 
 AT_CLEANUP
@@ -64,103 +48,124 @@ AT_CLEANUP
 AT_SETUP([Type Clashes])
 
 AT_DATA([input.y],
-[[%token foo
+[[%union { int bar; }
+%token foo
 %type <bar> exp
 %%
-exp: foo {} foo
+exp: foo { $$; } foo { $2; } foo
    | foo
    | /* Empty. */
    ;
 ]])
 
-AT_CHECK([bison input.y], [], [],
-[[input.y:4.6-15: warning: type clash on default action: <bar> != <>
-input.y:5.6-8: warning: type clash on default action: <bar> != <>
-input.y:6.5: warning: empty rule for typed nonterminal, and no action
+AT_CHECK([bison input.y], [1], [],
+[[input.y:5.12-13: $$ for the midrule at $2 of `exp' has no declared type
+input.y:5.24-25: $2 of `exp' has no declared type
+input.y:5.6-32: warning: type clash on default action: <bar> != <>
+input.y:6.6-8: warning: type clash on default action: <bar> != <>
+input.y:7.5: warning: empty rule for typed nonterminal, and no action
 ]])
 
 AT_CLEANUP
 
 
-## --------------- ##
-## Unused values.  ##
-## --------------- ##
+# _AT_UNUSED_VALUES_DECLARATIONS()
+# --------------------------------------------
+# Generate the token, type, and destructor
+# declarations for the unused values tests.
 
-m4_define([AT_CHECK_UNUSED_VALUES],
-[AT_SETUP([Unused values])
+m4_define([_AT_UNUSED_VALUES_DECLARATIONS],
+[[[%token <integer> INT;
+%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;]]])
 
-AT_DATA([input.y],
-[[%token <integer> INT
-%type <integer> exp
-%destructor { destroy ($$); } INT exp
-%%
-exp:
-  $1
-| INT
-;
-]])
-
-AT_CHECK([bison input.y], [], [],
-[[$2]])
 
-AT_CLEANUP
-])
+# AT_CHECK_UNUSED_VALUES(DECLARATIONS_AFTER)
+# --------------------------------------------
+# Generate a grammar to test unused values,
+# compile it, run it.  If DECLARATIONS_AFTER
+# is set, then the token, type, and destructor
+# declarations are generated after the rules
+# rather than before.
 
-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
-])
+m4_define([AT_CHECK_UNUSED_VALUES],
+[AT_DATA([input.y],
+m4_ifval($1, [
 
-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_UNUSED_VALUES_DECLARATIONS
+])[[%%
+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[ }
+;
 
-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
-])
+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[; };]]m4_ifval($1, [
+_AT_UNUSED_VALUES_DECLARATIONS])
+)
+
+AT_CHECK([bison input.y], [0], [],
+[[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_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
-])
+## --------------- ##
+## Unused values.  ##
+## --------------- ##
 
-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_SETUP([Unused values])
+AT_CHECK_UNUSED_VALUES
+AT_CLEANUP
 
-# AT_CHECK_UNUSED_VALUES([INT { $$ } { $$ = $2 } { }],
-# [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 { $$ = $1 } INT { $$ = $2 + $3 } INT { $$ = $4 + $5 }])
+## ------------------------------------------ ##
+## Unused values before symbol declarations.  ##
+## ------------------------------------------ ##
 
+AT_SETUP([Unused values before symbol declarations])
+AT_CHECK_UNUSED_VALUES([1])
+AT_CLEANUP
 
 
 ## ---------------------- ##
@@ -188,13 +193,13 @@ exp: foo;
 
 AT_CHECK([bison input.y], [1], [],
 [[input.y:8.7-11: %type redeclaration for foo
-input.y:3.7-11: first declaration
+input.y:3.7-11: previous declaration
 input.y:10.13-17: %destructor redeclaration for foo
-input.y:5.13-17: first declaration
-input.y:9.19-23: %printer redeclaration for foo
-input.y:10.13-17: first declaration
+input.y:5.13-17: previous declaration
+input.y:9.10-14: %printer redeclaration for foo
+input.y:4.10-14: previous declaration
 input.y:11.1-5: %left redeclaration for foo
-input.y:6.1-5: first declaration
+input.y:6.1-5: previous declaration
 ]])
 
 AT_CLEANUP
@@ -213,7 +218,15 @@ AT_SETUP([Torturing the Scanner])
 
 AT_DATA([input.y], [])
 AT_CHECK([bison input.y], [1], [],
-[[input.y:1.1: syntax error, unexpected end of file
+[[input.y:1.0: syntax error, unexpected end of file
+]])
+
+
+AT_DATA([input.y],
+[{}
+])
+AT_CHECK([bison input.y], [1], [],
+[[input.y:1.0-1: syntax error, unexpected {...}
 ]])