X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2bb8f621eb61ef282fadd39232a96589ba1979ad..f6df83b4e80b2a53c08b5dc654e247076a3b9b03:/tests/headers.at

diff --git a/tests/headers.at b/tests/headers.at
index b53ee8a0..6be1c7a6 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -131,7 +131,7 @@ AT_SETUP([Several parsers])
 # 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
@@ -161,7 +161,7 @@ exp:
 ]AT_YYLEX_DEFINE(["$1"])[
 ]])
 
-AT_BISON_CHECK([-d -o AT_SKEL_CC_IF([$1.cc $1.yy], [$1.c $1.y])])
+AT_BISON_CHECK([-d -o $1.AT_SKEL_CC_IF([cc], [c]) $1.y])
 
 AT_LANG_COMPILE([$1.o])
 AT_CHECK([[echo "$1" >>expout]])
@@ -229,14 +229,13 @@ AT_TEST([x8], [%define api.pure %define api.push-pull both])
 # C++ output relies on namespaces and still uses yy a lot.
 #
 # Check there is no 'YY' left.
-# Ignore comments, YYPARSE_PARAM (obsolete), YYPUSH_MORE(_DEFINED)?
+# 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(YYPARSE_PARAM
+  s{\b(YYChar
       |YYPUSH_MORE(_DEFINED)?
       |YY_\w+_INCLUDED
       |YY_NULL
@@ -244,13 +243,13 @@ AT_CHECK([[$PERL -n -0777 -e '
       )\b}{}gx;
   while (/^(.*YY.*)$/gm)
   {
-    print "$ARGV: $1\n";
+    print "$ARGV: invalid exported YY: $1\n";
   }
   if ($ARGV =~ /\.h$/)
   {
     while (/^(.*yy.*)$/gm)
     {
-      print "$ARGV: $1\n";
+      print "$ARGV: invalid exported yy: $1\n";
     }
   }
 ' -- *.hh *.h]])