X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/dd5611579b3978eff5c4aa22dc8459b8f53c2fc0..3a526f5cc3b45fc68d06de0b5332105113741093:/tests/named-refs.at?ds=sidebyside

diff --git a/tests/named-refs.at b/tests/named-refs.at
index 35c2382b..744eab82 100644
--- a/tests/named-refs.at
+++ b/tests/named-refs.at
@@ -19,10 +19,11 @@
 AT_BANNER([[Named references tests.]])
 
 AT_SETUP([Tutorial calculator])
-
+AT_BISON_OPTION_PUSHDEFS
 AT_DATA_GRAMMAR([test.y],
 [[
 %{
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,8 +33,8 @@ FILE *input;
 static semantic_value global_result = 0;
 static int global_count = 0;
 static int power (int base, int exponent);
-static void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[
 %}
 
 %union
@@ -82,12 +83,7 @@ exp:
 | '-' error          { $$ = 0; YYERROR;     }
 ;
 %%
-
-static void yyerror (const char *s)
-{
-  fprintf (stderr, "%s\n", s);
-}
-
+]AT_YYERROR_DEFINE[
 static int get_char (void)
 {
   int res = getc (input);
@@ -118,7 +114,8 @@ static int read_signed_integer (void)
   return sign * n;
 }
 
-int yylex (void)
+static int
+yylex (void)
 {
   int c;
   /* Skip white space.  */
@@ -165,10 +162,8 @@ int main (int argc, const char **argv)
     }
   status = yyparse ();
   fclose (input);
-  if (global_result != result)
-    abort ();
-  if (global_count != count)
-    abort ();
+  assert (global_result == result);
+  assert (global_count == count);
   return status;
 }
 ]])
@@ -189,6 +184,7 @@ AT_DATA([input.txt],
 AT_BISON_CHECK([-o test.c test.y])
 AT_COMPILE([[test]])
 AT_PARSER_CHECK([./test input.txt], 0, [], [stderr])
+AT_BISON_OPTION_POPDEFS
 AT_CLEANUP
 
 
@@ -197,13 +193,13 @@ AT_CLEANUP
 
 
 AT_SETUP([Undefined and ambiguous references])
-
+AT_BISON_OPTION_PUSHDEFS
 AT_DATA_GRAMMAR([test.y],
 [[
 %{
 static int power (int base, int exponent);
-static void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[
 %}
 
 %union
@@ -267,6 +263,7 @@ test.y:55.3-53:      symbol not found in production: r12
 test.y:56.29-33: invalid reference: '$expo'
 test.y:56.3-46:      symbol not found in production: expo
 ]])
+AT_BISON_OPTION_POPDEFS
 AT_CLEANUP
 
 #######################################################################
@@ -446,14 +443,19 @@ AT_SETUP([Stray symbols in brackets])
 AT_DATA_GRAMMAR([test.y],
 [[
 %%
-start: foo[ /* aaa */ *&-.+ ] bar
+start: foo[ /* aaa */ *&-.+\000\001\002\377 ] bar
   { s = $foo; }
 ]])
+AT_CHECK([[$PERL -pi -e 's/\\(\d{3})/chr(oct($1))/ge' test.y || exit 77]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
 [[test.y:11.23: invalid character in bracketed name: '*'
 test.y:11.24: invalid character in bracketed name: '&'
 test.y:11.25: invalid character in bracketed name: '-'
 test.y:11.27: invalid character in bracketed name: '+'
+test.y:11.28: invalid character in bracketed name: '\0'
+test.y:11.28: invalid character in bracketed name: '\001'
+test.y:11.28: invalid character in bracketed name: '\002'
+test.y:11.28: invalid character in bracketed name: '\377'
 ]])
 AT_CLEANUP