Merge branch 'maint'

[bison.git] / tests / actions.at

diff --git a/tests/actions.at b/tests/actions.at
index 8531bbc64714d7b8a01a189472867dbbd9c21a1c..269bcce50533a68b3002413d1d54c068e5ba278a 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1277,12 +1277,10 @@ AT_BISON_OPTION_PUSHDEFS([%skeleton "$1"])
 
 AT_DATA_GRAMMAR([[input.y]],
 [[%skeleton "$1"
-%defines   // FIXME: Mandated by lalr1.cc in Bison 2.6.
+%defines   // FIXME: Mandated by glr.cc.
 %debug
 %code requires
 {
-# include <stdio.h>
-
   typedef struct sem_type
   {
     int ival;
@@ -1291,20 +1289,21 @@ AT_DATA_GRAMMAR([[input.y]],
 
 # define YYSTYPE sem_type
 
-#ifdef __cplusplus
+]AT_SKEL_CC_IF([[
 # include <iostream>
   static void
   report (std::ostream& yyo, int ival, float fval)
   {
     yyo << "ival: " << ival << ", fval: " <<  fval;
   }
-#else
+]], [[
+# include <stdio.h>
   static void
   report (FILE* yyo, int ival, float fval)
   {
     fprintf (yyo, "ival: %d, fval: %1.1f", ival, fval);
   }
-#endif
+]])[
 }
 
 %code