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

diff --git a/tests/input.at b/tests/input.at
index fb571ab6..db73f0f4 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -107,12 +107,12 @@ 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 { };
+g: INT | INT { $<integer>$; } INT { $<integer>$; } INT { };
+h: INT | INT { $<integer>$; } INT { $<integer>$ = $<integer>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, [
+k: INT | INT INT { $<integer>$; } { $<integer>$ = $<integer>3; } { };
+l: INT | INT { $<integer>$ = $<integer>1; } INT { $<integer>$ = $<integer>2 + $<integer>3; } INT { $<integer>$ = $<integer>4 + $<integer>5; };]]m4_ifval($1, [
 _AT_UNUSED_VALUES_DECLARATIONS])
 )
 
@@ -131,22 +131,22 @@ 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:17.10-58: warning: unset value: $]$[
+input.y:17.10-58: warning: unused value: $]1[
+input.y:17.10-58: warning: unused value: $]2[
+input.y:17.10-58: warning: unused value: $]3[
+input.y:17.10-58: warning: unused value: $]4[
+input.y:17.10-58: warning: unused value: $]5[
+input.y:18.10-72: warning: unset value: $]$[
+input.y:18.10-72: warning: unused value: $]1[
+input.y:18.10-72: warning: unused value: $]3[
+input.y:18.10-72: warning: unused value: $]4[
+input.y:18.10-72: 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[
+input.y:21.10-68: warning: unset value: $]$[
+input.y:21.10-68: warning: unused value: $]1[
+input.y:21.10-68: warning: unused value: $]2[
+input.y:21.10-68: warning: unused value: $]4[
 ]])])
 
 
@@ -168,6 +168,65 @@ AT_CHECK_UNUSED_VALUES([1])
 AT_CLEANUP
 
 
+## --------------------------------------------- ##
+## Default %printer and %destructor redeclared.  ##
+## --------------------------------------------- ##
+
+AT_SETUP([Default %printer and %destructor redeclared])
+
+AT_DATA([[input.y]],
+[[%destructor { destroy ($$); }
+%printer { destroy ($$); }
+
+%destructor { destroy ($$); }
+%printer { destroy ($$); }
+
+%%
+
+start: ;
+
+%destructor { destroy ($$); };
+%printer { destroy ($$); };
+]])
+
+AT_CHECK([bison input.y], [1], [],
+[[input.y:4.13-29: redeclaration for default %destructor
+input.y:1.13-29: previous declaration
+input.y:5.10-26: redeclaration for default %printer
+input.y:2.10-26: previous declaration
+input.y:11.13-29: redeclaration for default %destructor
+input.y:4.13-29: previous declaration
+input.y:12.10-26: redeclaration for default %printer
+input.y:5.10-26: previous declaration
+]])
+
+AT_CLEANUP
+
+
+## ---------------------------------------- ##
+## Unused values with default %destructor.  ##
+## ---------------------------------------- ##
+
+AT_SETUP([Unused values with default %destructor])
+
+AT_DATA([[input.y]],
+[[%destructor { destroy ($$); }
+
+%%
+
+start: end end { $1; } ;
+end: { }  ;
+]])
+
+AT_CHECK([bison input.y], [0], [],
+[[input.y:5.8-22: warning: unset value: $$
+input.y:5.8-22: warning: unused value: $2
+input.y:6.6-8: warning: unset value: $$
+]])
+
+AT_CLEANUP
+
+
 ## ---------------------- ##
 ## Incompatible Aliases.  ##
 ## ---------------------- ##
@@ -218,7 +277,7 @@ AT_SETUP([Torturing the Scanner])
 
 AT_DATA([input.y], [])
 AT_CHECK([bison input.y], [1], [],
-[[input.y:1.0: syntax error, unexpected end of file
+[[input.y:1.1: syntax error, unexpected end of file
 ]])
 
 
@@ -226,7 +285,7 @@ AT_DATA([input.y],
 [{}
 ])
 AT_CHECK([bison input.y], [1], [],
-[[input.y:1.0-1: syntax error, unexpected {...}
+[[input.y:1.1-2: syntax error, unexpected {...}
 ]])
 
 
@@ -412,3 +471,24 @@ AT_CHECK_REQUIRE(1.0, 0)
 AT_CHECK_REQUIRE(AT_PACKAGE_VERSION, 0)
 ## FIXME: Some day augment this version number.
 AT_CHECK_REQUIRE(100.0, 63)
+
+
+## ------------------------------------- ##
+## String aliases for character tokens.  ##
+## ------------------------------------- ##
+
+AT_SETUP([String aliases for character tokens])
+
+# Bison once thought a character token and its alias were different symbols
+# with the same user token number.
+
+AT_DATA_GRAMMAR([input.y],
+[[%token 'a' "a"
+%%
+start: 'a';
+%%
+]])
+
+AT_CHECK([bison -o input.c input.y])
+
+AT_CLEANUP