diagnostics: no longer pretty-print rules in error messages, carets suffice

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 6be1c7a64d0e4abc06af01667aef9aa8dbccff28..11b8c917035c14549da451c507c3dc31e1b4e0c0 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,6 +1,6 @@
 # Bison Parser Headers.                               -*- Autotest -*-
 
 # Bison Parser Headers.                               -*- Autotest -*-
 

-# Copyright (C) 2001-2002, 2006-2007, 2009-2012 Free Software
+# Copyright (C) 2001-2002, 2006-2007, 2009-2013 Free Software

 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify


@@ -41,7 +41,7 @@ AT_DATA_GRAMMAR([$1.y],
 ]AT_YYLEX_DECLARE_EXTERN[
 %}
 %%
 ]AT_YYLEX_DECLARE_EXTERN[
 %}
 %%

-dummy:;
+dummy: /* empty */;

 %%
 #include <$1.h>
 ])
 %%
 #include <$1.h>
 ])


@@ -68,30 +68,21 @@ AT_TEST_CPP_GUARD_H([9foo],        [%glr-parser])
 
 AT_SETUP([export YYLTYPE])
 
 
 AT_SETUP([export YYLTYPE])
 

+AT_BISON_OPTION_PUSHDEFS([%name-prefix "my_"])

 AT_DATA_GRAMMAR([input.y],
 AT_DATA_GRAMMAR([input.y],

-[%locations
+[[%locations

 
 %name-prefix "my_"
 %{
 #include <stdio.h>
 #include <stdlib.h>
 
 
 %name-prefix "my_"
 %{
 #include <stdio.h>
 #include <stdlib.h>
 

-static int
-my_lex (void)
-{
-  return EOF;
-}
-
-static void
-my_error (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[

 %}
 %%
 %}
 %%

-exp:;
-])
+exp: /* empty */;
+]])

 
 AT_BISON_CHECK([--defines -o input.c input.y])
 
 
 AT_BISON_CHECK([--defines -o input.c input.y])
 


@@ -102,11 +93,7 @@ YYLTYPE *my_llocp = &my_lloc;
 
 int my_parse (void);
 
 
 int my_parse (void);
 

-int
-main (void)
-{
-  return my_parse ();
-}
+]AT_MAIN_DEFINE[

 ]])
 
 # Link and execute, just to make sure everything is fine (and in
 ]])
 
 # Link and execute, just to make sure everything is fine (and in


@@ -115,7 +102,7 @@ AT_COMPILE([caller.o])
 AT_COMPILE([input.o])
 AT_COMPILE([caller], [caller.o input.o])
 AT_PARSER_CHECK([./caller])
 AT_COMPILE([input.o])
 AT_COMPILE([caller], [caller.o input.o])
 AT_PARSER_CHECK([./caller])

-
+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 ## ----------------- ##
 AT_CLEANUP
 
 ## ----------------- ##