gnulib: update

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 2eba77695e82ce087f86c037b13de49a3c513e20..9c1d00bcff3d7b45f43830b8cc64e8199bb8fb35 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-2015 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
 
 ## ----------------- ##


@@ -124,15 +111,17 @@ AT_CLEANUP
 
 AT_SETUP([Several parsers])
 
 
 AT_SETUP([Several parsers])
 

-# AT_DATA_GRAMMAR_SEVERAL([PREFIX], [DIRECTIVES])
-# -----------------------------------------------
-# Generate and compile to *.o.  Make sure there is no YY* nor yy* in
-# the header (but YYDEBUG and YYPARSE_PARAM).
-m4_define([AT_DATA_GRAMMAR_SEVERAL],
-[AT_BISON_OPTION_PUSHDEFS([%define api.prefix "$1_" $2])
-AT_DATA_GRAMMAR([$1.AT_SKEL_CC_IF([yy], [y])],
-[[%define api.prefix "$1_"
+# AT_TEST([PREFIX], [DIRECTIVES])
+# -------------------------------
+# Generate and compile to *.o.  Make sure there is no (allowed) YY*
+# nor yy* identifiers in the header.  Check that headers are
+# self-contained, and can be compiled by a C++ compiler.
+m4_pushdef([AT_TEST],
+[AT_BISON_OPTION_PUSHDEFS([%define api.prefix {$1_} $2])
+AT_DATA_GRAMMAR([$1.y],
+[[%define api.prefix {$1_}

 $2
 $2

+%error-verbose

 %union
 {
   int integer;
 %union
 {
   int integer;


@@ -150,6 +139,8 @@ exp:
 | 'x' '4' { printf ("x4\n"); }
 | 'x' '5' { printf ("x5\n"); }
 | 'x' '6' { printf ("x6\n"); }
 | 'x' '4' { printf ("x4\n"); }
 | 'x' '5' { printf ("x5\n"); }
 | 'x' '6' { printf ("x6\n"); }

+| 'x' '7' { printf ("x7\n"); }
+| 'x' '8' { printf ("x8\n"); }

 ;
 
 %%
 ;
 
 %%


@@ -157,62 +148,122 @@ exp:
 ]AT_YYLEX_DEFINE(["$1"])[
 ]])
 
 ]AT_YYLEX_DEFINE(["$1"])[
 ]])
 

-AT_BISON_CHECK([-d -o AT_SKEL_CC_IF([$1.cc $1.yy], [$1.c $1.y])])
-# C++ output relies on namespaces and still uses yy a lot.
-AT_SKEL_CC_IF([],
-  [AT_CHECK([$EGREP -i yy $1.h | $EGREP -v 'YY(DEBUG|PARSE_PARAM)'], [1])])
+AT_BISON_CHECK([-d -o $1.AT_SKEL_CC_IF([cc], [c]) $1.y])
+

 AT_LANG_COMPILE([$1.o])
 AT_LANG_COMPILE([$1.o])

+AT_CHECK([[echo "$1" >>expout]])
+

 AT_BISON_OPTION_POPDEFS
 AT_BISON_OPTION_POPDEFS

-])
+])# AT_TEST

 
 AT_DATA([main.cc],
 [AT_DATA_SOURCE_PROLOGUE
 
 AT_DATA([main.cc],
 [AT_DATA_SOURCE_PROLOGUE

-[extern "C"
+[// If we are compiling with CC=$CXX, then do not load the C headers
+// inside extern "C", since they were _not_ compiled this way.
+#if ! CC_IS_CXX
+extern "C"

 {
 {

+#endif

   #include "x1.h"
   #include "x2.h"
   #include "x3.h"
   #include "x4.h"
   #include "x1.h"
   #include "x2.h"
   #include "x3.h"
   #include "x4.h"

+  #include "x6.h"
+  #include "x7.h"
+  #include "x8.h"
+#if ! CC_IS_CXX

 }
 }

+#endif

 #include "x5.hh"
 //#include "x6.hh"
 
 #include "x5.hh"
 //#include "x6.hh"
 

-#define ECHO(S) std::cerr << #S": " << S << std::endl;
+#define RUN(S)                                  \
+  do {                                          \
+    int res = S;                                \
+    if (res)                                    \
+      std::cerr << #S": " << res << std::endl;  \
+  } while (false)

 
 int
 main (void)
 {
 
 int
 main (void)
 {

-  ECHO(x1_parse());
-  ECHO(x2_parse());
-  ECHO(x3_parse());
-  ECHO(x4_parse());
+  RUN(x1_parse());
+  RUN(x2_parse());
+  RUN(x3_parse());
+  RUN(x4_parse());

   x5_::parser p5;
   x5_::parser p5;

-  ECHO(p5.parse());
-//  ECHO(x6_parse());
+  RUN(p5.parse());
+  RUN(x6_parse());
+  RUN(x7_parse());
+  RUN(x8_parse());
+//  x6_::parser p6;
+//  RUN(p6.parse());

   return 0;
 }
   return 0;
 }

-]])
-
-AT_DATA_GRAMMAR_SEVERAL([x1], [])
-AT_DATA_GRAMMAR_SEVERAL([x2], [%locations %debug])
-AT_DATA_GRAMMAR_SEVERAL([x3], [%glr-parser])
-AT_DATA_GRAMMAR_SEVERAL([x4], [%locations %debug %glr-parser])
-AT_DATA_GRAMMAR_SEVERAL([x5], [%locations %debug %language "c++"])
-#AT_DATA_GRAMMAR_SEVERAL([x6], [%locations %language "c++"])
-
-AT_COMPILE_CXX([parser], [x1.o x2.o x3.o x4.o x5.o main.cc])
-AT_CHECK([./parser], [0],
-[[x1
-x2
-x3
-x4
-x5
-]],
-[[x1_parse(): 0
-x2_parse(): 0
-x3_parse(): 0
-x4_parse(): 0
-p5.parse(): 0
-]])
+]])# main.cc
+
+AT_TEST([x1], [])
+AT_TEST([x2], [%locations %debug])
+AT_TEST([x3], [%glr-parser])
+AT_TEST([x4], [%locations %debug %glr-parser])
+AT_TEST([x5], [%locations %debug %language "c++"])
+AT_TEST([x6], [%define api.pure])
+AT_TEST([x7], [%define api.push-pull both])
+AT_TEST([x8], [%define api.pure %define api.push-pull both])
+#AT_TEST([x5], [%locations %language "c++" %glr-parser])
+
+# Check there is no 'yy' left.
+# C++ output relies on namespaces and still uses yy a lot.
+#
+# Check there is no 'YY' left.
+# Ignore comments, YYChar (template parameter), YYPUSH_MORE(_DEFINED)?
+# (constant definition), YY_\w+_INCLUDED (header guards).
+# YYDEBUG (not renamed) can be read, but not changed.
+AT_CHECK([[$PERL -n -0777 -e '
+  s{/\*.*?\*/}{}gs;
+  s{//.*}{}g;
+  s{\b(YYChar
+      |YYPUSH_MORE(?:_DEFINED)?
+      |YYUSE
+      |YY_ATTRIBUTE(?:_PURE|_UNUSED)?
+      |YY_IGNORE_MAYBE_UNINITIALIZED_(?:BEGIN|END)
+      |YY_INITIAL_VALUE
+      |YY_\w+_INCLUDED
+      |YY_NULLPTR
+      |(defined|if)\ YYDEBUG
+      )\b}{}gx;
+  while (/^(.*YY.*)$/gm)
+  {
+    print "$ARGV: invalid exported YY: $1\n";
+  }
+  if ($ARGV =~ /\.h$/)
+  {
+    while (/^(.*yy.*)$/gm)
+    {
+      print "$ARGV: invalid exported yy: $1\n";
+    }
+  }
+' -- *.hh *.h]])
+
+# Check that the headers are self-contained, and protected against
+# multiple inclusions.  While at it, check they are sane for C++.
+for h in *.h *.hh
+do
+  # No shell expansion with AT_DATA.
+  cat >$h.cc <<EOF
+AT_DATA_SOURCE_PROLOGUE
+#include "$h"
+#include "$h"
+EOF
+  AT_COMPILE_CXX([$h.o])
+done
+
+# Do this late, so that other checks have been performed.
+AT_SKIP_IF_CANNOT_LINK_C_AND_CXX
+
+AT_COMPILE_CXX([parser], [[x[1-8].o -DCC_IS_CXX=$CC_IS_CXX main.cc]])
+AT_PARSER_CHECK([./parser], [0], [[expout]])
+
+m4_popdef([AT_TEST])

 
 AT_CLEANUP
 
 AT_CLEANUP