X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/60aa04a236004d3d03f00aeaf07b643a52ef0760..f6df83b4e80b2a53c08b5dc654e247076a3b9b03:/tests/headers.at?ds=sidebyside

diff --git a/tests/headers.at b/tests/headers.at
index 8475a090..6be1c7a6 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -126,11 +126,12 @@ AT_SETUP([Several parsers])
 
 # AT_TEST([PREFIX], [DIRECTIVES])
 # -------------------------------
-# Generate and compile to *.o.  Make sure there is no YY* nor yy* in
-# the header (but YYDEBUG and YYPARSE_PARAM).
+# 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.AT_SKEL_CC_IF([yy], [y])],
+AT_DATA_GRAMMAR([$1.y],
 [[%define api.prefix "$1_"
 $2
 %error-verbose
@@ -160,22 +161,9 @@ exp:
 ]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 yy $1.h], [1])])
+AT_BISON_CHECK([-d -o $1.AT_SKEL_CC_IF([cc], [c]) $1.y])
 
-# Ignore comments. Ignore YYPARSE_PARAM (obsolete) and
-# YYPUSH_MORE(_DEFINED)? (whose definition is constant).
-#
-# YYDEBUG (not renamed) can be read, but not changed.
-AT_CHECK([[$PERL -0777 -e 's{/\*.*?\*/}{}sg;s,//.*,,;' \
-            ]$1.AT_SKEL_CC_IF([hh], [h])[ |
-         grep 'YY' |
-     $EGREP -wv 'YY(PARSE_PARAM|PUSH_MORE(_DEFINED)?)|(defined|if) YYDEBUG']],
-         [1])
 AT_LANG_COMPILE([$1.o])
-
 AT_CHECK([[echo "$1" >>expout]])
 
 AT_BISON_OPTION_POPDEFS
@@ -183,8 +171,12 @@ AT_BISON_OPTION_POPDEFS
 
 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"
@@ -192,7 +184,9 @@ AT_DATA([main.cc],
   #include "x6.h"
   #include "x7.h"
   #include "x8.h"
+#if ! CC_IS_CXX
 }
+#endif
 #include "x5.hh"
 //#include "x6.hh"
 
@@ -231,8 +225,53 @@ 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])
 
-AT_COMPILE_CXX([parser], [[x[1-8].o main.cc]])
-AT_CHECK([./parser], [0], [[expout]])
+# 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)?
+      |YY_\w+_INCLUDED
+      |YY_NULL
+      |(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])