graphs: fix spacing refactoring

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 91fdb950eb84fa72916cbac70e71efb9d0e7bace..4192c05b68b5b23fed0f6ea792efc68e4080ed67 100644 (file)
--- 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])
 # 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
 [[%define api.prefix "$1_"
 $2
 %error-verbose


@@ -161,7 +161,7 @@ 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])])
+AT_BISON_CHECK([-d -o $1.AT_SKEL_CC_IF([cc], [c]) $1.y])

 
 # Check there is no 'yy' left.
 # C++ output relies on namespaces and still uses yy a lot.
 
 # Check there is no 'yy' left.
 # C++ output relies on namespaces and still uses yy a lot.


@@ -169,13 +169,14 @@ AT_SKEL_CC_IF([],
   [AT_CHECK([$EGREP yy $1.h], [1])])
 
 # Check there is not 'YY' left.
   [AT_CHECK([$EGREP yy $1.h], [1])])
 
 # Check there is not 'YY' left.

-# Ignore comments, YYPARSE_PARAM (obsolete), YYPUSH_MORE(_DEFINED)?
-# (constant definition), YY_\w+_INCLUDED (header guards).
+# Ignore comments, YYPUSH_MORE(_DEFINED)?  (constant definition),
+# YY_\w+_INCLUDED (header guards).

 #
 # YYDEBUG (not renamed) can be read, but not changed.
 #
 # YYDEBUG (not renamed) can be read, but not changed.

-AT_CHECK([[sed -ne 's,/\*[^*]*\*/,,g;s,//.*,,' \
-                -e '/YY/p' ]$1.AT_SKEL_CC_IF([hh], [h])[ |
-     $EGREP -wv 'YY(PARSE_PARAM|PUSH_MORE(_DEFINED)?|_[0-9A-Z_]+_INCLUDED)|(defined|if) YYDEBUG']],
+AT_CHECK([[$PERL -0777 -e 's{/\*.*?\*/}{}sg;s,//.*,,;' \
+            ]$1.AT_SKEL_CC_IF([hh], [h])[ |
+         grep 'YY' |
+     $EGREP -wv 'YY(PUSH_MORE(_DEFINED)?|_[0-9A-Z_]+_INCLUDED)|(defined|if) YYDEBUG']],

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


@@ -249,6 +250,7 @@ for h in *.h *.hh
 do
   # No shell expansion with AT_DATA.
   cat >$h.cc <<EOF
 do
   # No shell expansion with AT_DATA.
   cat >$h.cc <<EOF

+AT_DATA_SOURCE_PROLOGUE

 #include "$h"
 #include "$h"
 EOF
 #include "$h"
 #include "$h"
 EOF