Adjust to latest gnulib.

[bison.git] / tests / cxx-type.at

diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index ded69471ec14517a8e299ec1aeeabbef3e2366e8..89afc58a03d87a93aea0a6cce80df75dbe5bd550 100644 (file)
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -34,12 +34,28 @@ $1
 
 %{
   #include <stdio.h>
-  #define YYSTYPE const char*
+  #define YYSTYPE char const *
 ]m4_bmatch([$2], [stmtMerge],
 [ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[
   #define YYINITDEPTH 10
-  static char* format (const char*,  ...);
-
+  static char *format (char const *, ...);
+  struct YYLTYPE;
+#if YYPURE
+# if YYLSP_NEEDED
+#  define LEX_PARAMETERS YYSTYPE *lvalp, struct YYLTYPE *llocp
+#  define ERROR_PARAMETERS struct YYLTYPE *llocp, char const *s
+# else
+#  define LEX_PARAMETERS YYSTYPE *lvalp
+# endif
+#endif
+#ifndef LEX_PARAMETERS
+# define LEX_PARAMETERS void
+#endif
+#ifndef ERROR_PARAMETERS
+# define ERROR_PARAMETERS char const *s
+#endif
+  int yylex (LEX_PARAMETERS);
+  int yyerror (ERROR_PARAMETERS);
 %}
 
 %token TYPENAME ID
@@ -52,9 +68,9 @@ $1
 %%
 
 prog :
-     | prog stmt   { 
+     | prog stmt   {
 ]AT_LOCATION_IF([
-                       printf ("%d.%d-%d.%d: ", 
+                       printf ("%d.%d-%d.%d: ",
                             @2.first_line, @2.first_column,
                             @2.last_line, @2.last_column);])[
                        printf ("%s\n", ]$[2);
@@ -91,7 +107,7 @@ declarator : ID
 #include <stdarg.h>
 
 int
-main (int argc, char** argv)
+main (int argc, char **argv)
 {
   if (argc != 2)
     abort ();
@@ -101,13 +117,7 @@ main (int argc, char** argv)
 }
 
 int
-#if YYPURE && YYLSP_NEEDED
-  yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
-#elif YYPURE
-  yylex (YYSTYPE *lvalp)
-#else
-  yylex ()
-#endif
+yylex (LEX_PARAMETERS)
 {
   char buffer[256];
   int c;
@@ -134,7 +144,7 @@ int
        case ' ': case '\f':
          colNum += 1;
          break;
-       case '\n': 
+       case '\n':
          lineNum += 1;
          colNum = 1;
          break;
@@ -142,7 +152,7 @@ int
          {
            int tok;
 #if YYLSP_NEEDED
-           yylloc.first_line = yylloc.last_line = lineNum; 
+           yylloc.first_line = yylloc.last_line = lineNum;
            yylloc.first_column = colNum;
 #endif
            if (isalpha (c))
@@ -164,7 +174,7 @@ int
                tok = isupper ((unsigned char) buffer[0]) ? TYPENAME : ID;
                yylval = strcpy (malloc (i), buffer);
              }
-           else 
+           else
              {
                colNum += 1;
                tok = c;
@@ -180,19 +190,20 @@ int
 }
 
 int
-yyerror (
+yyerror (ERROR_PARAMETERS)
+{
 #if YYPURE && YYLSP_NEEDED
-         YYLTYPE *llocp,
+  /* Pacify GCC by using llocp.  */
+  if (! llocp)
+    abort ();
 #endif
-         const char *s
-        )
-{
   fprintf (stderr, "%s\n", s);
   return 0;
 }
 
 
-static char* format (const char* form, ...) 
+static char *
+format (char const *form, ...)
 {
    char buffer[1024];
    va_list args;