X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/206fe6a5eccc4461ab749b3514e6ea1e6d82e3c4..9501dc6e69988cd8cf7623278a3894af9479e198:/tests/input.at

diff --git a/tests/input.at b/tests/input.at
index 14bdc796..d0a61ba2 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -33,7 +33,7 @@ exp: { $$ = $1 ; };
 ]])
 
 AT_CHECK([bison input.y], [1], [],
-[[input.y:2.6-14: invalid value: $1
+[[input.y:2.6-14: integer out of range: `$1'
 ]])
 
 AT_CLEANUP
@@ -51,7 +51,7 @@ exp: { @$ = @1 ; };
 ]])
 
 AT_CHECK([bison input.y], [1], [],
-[[input.y:2.6-14: invalid value: @1
+[[input.y:2.6-14: integer out of range: `@1'
 ]])
 
 AT_CLEANUP
@@ -74,8 +74,8 @@ exp: foo {} foo
 ]])
 
 AT_CHECK([bison input.y], [1], [],
-[[input.y:4.4-15: type clash (`bar' `') on default action
-input.y:5.4-8: type clash (`bar' `') on default action
+[[input.y:4.4-15: type clash on default action: <bar> != <>
+input.y:5.4-8: type clash on default action: <bar> != <>
 input.y:6.4: empty rule for typed nonterminal, and no action
 ]])
 
@@ -92,7 +92,7 @@ AT_CLEANUP
 
 AT_SETUP([Torturing the Scanner])
 
-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],
 [[%{
 /* This is seen in GCC: a %{ and %} in middle of a comment. */
 const char *foo = "So %{ and %} can be here too.";
@@ -100,7 +100,6 @@ const char *foo = "So %{ and %} can be here too.";
 #ifdef __STDC__
 /\
 * A comment with backslash-newlines in it. %{ %} *\
-\
 /
 
 char str[] = "\\
@@ -108,7 +107,6 @@ char str[] = "\\
 "";
 
 char apostrophe = '\\
-\
 '\
 ';
 #endif
@@ -151,13 +149,17 @@ static int yylex (void);
 
 %%
 /* Exercise M4 quoting: '@:>@@:>@', @<:@, 1.  */
-exp: '@<:@' '\1' '\x000000000000000000000000000000000000000000000000002'
+exp: '@<:@' '\1' two '$' '@' '{' oline output
   {
     /* Exercise quotes in braces.  */
     char tmp[] = "@<:@%c@:>@,\n";
     printf (tmp, $1);
   }
 ;
+
+two: '\x000000000000000000000000000000000000000000000000000000000000000000002';
+oline: '@' 'o' 'l' 'i' 'n' 'e' '@' '_' '_' 'o' 'l' 'i' 'n' 'e' '_' '_';
+output: '#' 'o' 'u' 't' 'p' 'u' 't' ' ';
 %%
 /* Exercise M4 quoting: '@:>@@:>@', @<:@, 2.  */
 
@@ -172,7 +174,9 @@ value_t_as_yystype (value_t val)
 static int
 yylex (void)
 {
-  static const char *input = "@<:@\1\2";
+  static const char *input = "@<:@\1\2$@{@oline@__@&t@oline__\
+#output "; /* "
+  */
   yylval = value_t_as_yystype (*input);
   return *input++;
 }
@@ -184,6 +188,8 @@ yyerror (const char *msg)
 }
 ]])
 
+# Pacify Emacs'font-lock-mode: "
+
 AT_DATA([main.c],
 [[typedef int value_t;
 #include "input.h"
@@ -198,7 +204,9 @@ main (void)
 ]])
 
 AT_CHECK([bison -d -v -o input.c input.y])
-AT_COMPILE([input], [input.c main.c])
+AT_COMPILE([input.o], [-c input.c])
+AT_COMPILE([main.o], [-c main.c])
+AT_COMPILE([input], [input.o main.o])
 AT_PARSER_CHECK([./input], 0,
 [[[@<:@],
 ]])