Merge branch 'maint'

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 96a755831b1c84f65939a33cdd1fc72f84b5e379..4192c05b68b5b23fed0f6ea792efc68e4080ed67 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -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])