Have the GLR tests be `warning' checked, and fix the warnings.

* data/glr.c (YYFPRINTF): Always define it, not only when YYDEBUG (yyuserAction, yyreportAmbiguity): `Use' all the arguments. (yyremoveDeletes): `yyi' and `yyj' are size_t. Use YYFPRINTF when under if (YYDEBUG) to avoid empty `if' bodies. (yyaddDeferredAction): static. (yyglrReduce): yyi, yyk, amd yyposn are size_t. (yyreportParseError): yyprefix is const. yytokenp is used only when verbose. (yy__GNUC__): Replace with __GNUC__. (yypdumpstack): yyi is size_t. (yypreference): Un-yy local variables and arguments, to avoid clashes with `yyr1'. Anyway, we are not in the user name space. (yytname_size): be an int, as is compared with ints. * tests/testsuite.at (AT_COMPILE, AT_PARSER_CHECK): New. Use them. * tests/cxx-gram.at: Use quotation to protect $1. Use AT_COMPILE to enable warnings hunts. Prototype yylex and yyerror. `Use' argc. Include `string.h', not `strings.h'. Produce and prototype stmtMerge only when used. yylex takes a location.
2026-03-12 13:53:03 +00:00 · 2002-06-30 17:35:06 +00:00
parent 97650f4efc
commit 1154ccedaf
11 changed files with 238 additions and 120 deletions
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -73,8 +73,8 @@ main (void)
 ]])

 AT_CHECK([bison input.y -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 0,
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 0,
 [[0123456789
 ]])

@@ -144,8 +144,8 @@ main (void)
 ]])

 AT_CHECK([bison input.y -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 0,
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 0,
 [[15
 ]])

@@ -296,8 +296,8 @@ main (void)
 ]])

 AT_CHECK([bison input.y --location -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 1,
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 1,
 [[sending: 'x' (value = 0, line 0)
 thing(0): 'x'(0)
 sending: 'x' (value = 1, line 10)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -290,7 +290,7 @@ m4_define([_AT_CHECK_CALC],
 [AT_DATA([[input]],
 [[$2
 ]])
-AT_CHECK([./calc input], 0, [], [stderr])dnl
+AT_PARSER_CHECK([./calc input], 0, [], [stderr])dnl
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
         [m4_bmatch([$1], [--debug],
                    [$3], [0])
@@ -317,11 +317,11 @@ AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
 # of expected lines on stderr.
 m4_define([_AT_CHECK_CALC_ERROR],
 [m4_bmatch([$2], [^/],
-           [AT_CHECK([./calc $2], 0, [], [stderr])],
+           [AT_PARSER_CHECK([./calc $2], 0, [], [stderr])],
           [AT_DATA([[input]],
 [[$2
 ]])
-AT_CHECK([./calc input], 0, [], [stderr])])
+AT_PARSER_CHECK([./calc input], 0, [], [stderr])])

 m4_bmatch([$1], [--debug],
 [AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$3
@@ -372,7 +372,7 @@ AT_DATA_CALC_Y([$1])
 AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
         [0], [], [])

-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [ignore])
+AT_COMPILE([calc])

 # Test the priorities.
 _AT_CHECK_CALC([$1],
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -102,22 +102,22 @@ main (int argc, const char *argv[])

 # Specify the output files to avoid problems on different file systems.
 AT_CHECK([bison input.y -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
+AT_COMPILE([input])

-AT_CHECK([./input '0<0'])
+AT_PARSER_CHECK([./input '0<0'])
 # FIXME: This is an actual bug, but a new one, in the sense that
 # no one has ever spotted it!  The messages are *wrong*: there should
 # be nothing there, it should be expected eof.
-AT_CHECK([./input '0<0<0'], [1], [],
+AT_PARSER_CHECK([./input '0<0<0'], [1], [],
         [parse error, unexpected '<', expecting '<' or '>'
 ])

-AT_CHECK([./input '0>0'])
-AT_CHECK([./input '0>0>0'], [1], [],
+AT_PARSER_CHECK([./input '0>0'])
+AT_PARSER_CHECK([./input '0>0>0'], [1], [],
         [parse error, unexpected '>', expecting '<' or '>'
 ])

-AT_CHECK([./input '0<0>0'], [1], [],
+AT_PARSER_CHECK([./input '0<0>0'], [1], [],
         [parse error, unexpected '>', expecting '<' or '>'
 ])

--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -1,5 +1,5 @@
-# Checking the output filenames.                         -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Checking GLR Parsing.                         -*- Autotest -*-
+# Copyright 2002 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,22 +18,34 @@

 AT_BANNER([[C++ Type Syntax (GLR).]])

-# _AT_TEST_GLR_CALC(`$1',DECL, RESOLVE1, RESOLVE2) 
-# (first argument is a literal $1; it's a trick).  
+# _AT_TEST_GLR_CALC(DECL, RESOLVE1, RESOLVE2)
+# -------------------------------------------
 # Store into types.y the calc program, with DECL inserted as a declaration,
 # and with RESOLVE1 and RESOLVE2 as annotations on the conflicted rule for
 # stmt.  Then compile the result.
 m4_define([_AT_TEST_GLR_CALC],
 [AT_DATA([types.y],
-[[/* Simplified C++ Type and Expression Grammar */
+[[/* Simplified C++ Type and Expression Grammar.  */

-$2
+$1

 %{
  #include <stdio.h>
  #define YYSTYPE const char*
-  static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);
+  #define YYLTYPE int
+]m4_bmatch([$2], [stmtMerge],
+[ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[
  #define YYINITDEPTH 10
+  int yyerror (const char *s);
+
+  #if YYPURE
+]m4_bmatch([$1], [location],
+[  int yylex (YYSTYPE *lvalp, YYLTYPE *llocp);],
+[  int yylex (YYSTYPE *lvalp);])[
+  #else
+  int yylex (void);
+  #endif
+
 %}

 %token TYPENAME ID
@@ -45,53 +57,65 @@ $2

 %%

-prog : 
+prog :
     | prog stmt   { printf ("\n"); }
     ;

-stmt : expr ';'  $3
-     | decl      $4
+stmt : expr ';'  $2
+     | decl      $3
     | error ';'
     | '@'  { YYACCEPT; }
     ;

 expr : ID 		{ printf ("%s ", $$); }
-     | TYPENAME '(' expr ')'  
-			{ printf ("%s <cast> ", $1); }
+     | TYPENAME '(' expr ')'
+			{ printf ("%s <cast> ", ]$[1); }
     | expr '+' expr	{ printf ("+ "); }
     | expr '=' expr	{ printf ("= "); }
     ;

-decl : TYPENAME declarator ';' 
-			{ printf ("%s <declare> ", $1); }
+decl : TYPENAME declarator ';'
+			{ printf ("%s <declare> ", ]$[1); }
     | TYPENAME declarator '=' expr ';'
-			{ printf ("%s <init-declare> ", $1); }
+			{ printf ("%s <init-declare> ", ]$[1); }
     ;

-declarator : ID		{ printf ("\"%s\" ", $1); }
+declarator : ID		{ printf ("\"%s\" ", ]$[1); }
     | '(' declarator ')'
     ;

 %%

+#include <assert.h>
 #include <ctype.h>
-#include <strings.h>
+#include <string.h>

-main (int argc, char** argv) 
+int
+main (int argc, char** argv)
 {
-  freopen (argv[1], "r", stdin);
+  assert (argc = 2);
+  assert (freopen (argv[1], "r", stdin));
  exit (yyparse ());
 }

 #if YYPURE
-int yylex (YYSTYPE *lvalp)
-#define yylval (*lvalp)
+int
+]m4_bmatch([$1], [location],
+[yylex (YYSTYPE *lvalp, YYLTYPE *llocp)],
+[yylex (YYSTYPE *lvalp)])[
 #else
-int yylex ()
+int
+yylex ()
 #endif
 {
  char buffer[256];
  int c;
+
+#if YYPURE
+# define yylval (*lvalp)
+]m4_bmatch([$1], [location],[  (void) llocp;])[
+#endif
+
  while (1) {
    c = getchar ();
    switch (c) {
@@ -118,12 +142,19 @@ yyerror (const char *s)
  return 0;
 }

-static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1)
+]]
+m4_bmatch([$2], [stmtMerge],
+[[static YYSTYPE
+stmtMerge (YYSTYPE x0, YYSTYPE x1)
 {
+  /* Use the arguments. */
+  (void) x0;
+  (void) x1;
  printf ("<OR> ");
  return "";
 }
 ]])
+)

 AT_DATA([test-input],
 [[
@@ -151,8 +182,8 @@ z + q;
 This is total garbage, but it should be ignored.
 ]])

-AT_CHECK([bison types.y], 0, [], ignore)
-AT_CHECK([gcc -o types types.tab.c], 0, [], ignore)
+AT_CHECK([bison types.y -o types.c], 0, [], ignore)
+AT_COMPILE([types])
 ])

 m4_define([_AT_RESOLVED_GLR_OUTPUT],
@@ -168,22 +199,22 @@ z q +
 ]])

 m4_define([_AT_AMBIG_GLR_OUTPUT],
-[[z q + 
-"x" T <declare> 
-"x" y T <init-declare> 
-x y = 
-x T <cast> y + 
-"x" T <declare> x T <cast> <OR> 
-"y" z q + T <init-declare> y T <cast> z q + = <OR> 
+[[z q +
+"x" T <declare>
+"x" y T <init-declare>
+x y =
+x T <cast> y +
+"x" T <declare> x T <cast> <OR>
+"y" z q + T <init-declare> y T <cast> z q + = <OR>
 y
 z q +
 ]])

-m4_define([_AT_GLR_STDERR], 
+m4_define([_AT_GLR_STDERR],
 [[parse error
 ]])

-m4_define([_AT_VERBOSE_GLR_STDERR], 
+m4_define([_AT_VERBOSE_GLR_STDERR],
 [[parse error, unexpected ID, expecting '=' or '+' or ')'
 ]])

@@ -192,57 +223,63 @@ m4_define([_AT_VERBOSE_GLR_STDERR],
 ## ---------------------------------------------------- ##

 AT_SETUP([GLR: Resolve ambiguity, impure, no locations])
-_AT_TEST_GLR_CALC([$1],[],[%dprec 1],[%dprec 2])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT, 
+_AT_TEST_GLR_CALC([],[%dprec 1],[%dprec 2])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT,
 	 _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Resolve ambiguity, impure, locations])
-_AT_TEST_GLR_CALC([$1],[%locations],[%dprec 1],[%dprec 2])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT, 
+_AT_TEST_GLR_CALC([%locations],[%dprec 1],[%dprec 2])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT,
 	_AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Resolve ambiguity, pure, no locations])
-_AT_TEST_GLR_CALC([$1],[%pure-parser],[%dprec 1],[%dprec 2])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT,
+_AT_TEST_GLR_CALC([%pure-parser],[%dprec 1],[%dprec 2])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT,
 	 _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Resolve ambiguity, pure, locations])
-_AT_TEST_GLR_CALC([$1],[%pure-parser
+_AT_TEST_GLR_CALC([%pure-parser
 %locations],[%dprec 1],[%dprec 2])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT, 
-	 _AT_GLR_STDERR)
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_RESOLVED_GLR_OUTPUT,
+	        _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Merge conflicting parses, impure, no locations])
-_AT_TEST_GLR_CALC([$1],[],[%merge <stmtMerge>],[%merge <stmtMerge>])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_AMBIG_GLR_OUTPUT, 
-	 _AT_GLR_STDERR)
+_AT_TEST_GLR_CALC([],[%merge <stmtMerge>],[%merge <stmtMerge>])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_AMBIG_GLR_OUTPUT,
+ 	        _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Merge conflicting parses, impure, locations])
-_AT_TEST_GLR_CALC([$1],[%locations],[%merge <stmtMerge>],[%merge <stmtMerge>])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_AMBIG_GLR_OUTPUT, 
-	 _AT_GLR_STDERR)
+_AT_TEST_GLR_CALC([%locations],[%merge <stmtMerge>],[%merge <stmtMerge>])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_AMBIG_GLR_OUTPUT,
+	        _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Merge conflicting parses, pure, no locations])
-_AT_TEST_GLR_CALC([$1],[%pure-parser],[%merge <stmtMerge>],[%merge <stmtMerge>])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_AMBIG_GLR_OUTPUT, 
-	 _AT_GLR_STDERR)
+_AT_TEST_GLR_CALC([%pure-parser],[%merge <stmtMerge>],[%merge <stmtMerge>])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_AMBIG_GLR_OUTPUT,
+	        _AT_GLR_STDERR)
 AT_CLEANUP
 AT_SETUP([GLR: Merge conflicting parses, pure, locations])
-_AT_TEST_GLR_CALC([$1],[%pure-parser
+_AT_TEST_GLR_CALC([%pure-parser
 %locations],[%merge <stmtMerge>],[%merge <stmtMerge>])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_AMBIG_GLR_OUTPUT, 
-	 _AT_GLR_STDERR)
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_AMBIG_GLR_OUTPUT,
+	        _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])
-_AT_TEST_GLR_CALC([$1],[%error-verbose],
+_AT_TEST_GLR_CALC([%error-verbose],
 [%merge <stmtMerge>],[%merge <stmtMerge>])
-AT_CHECK([[./types test-input | sed 's/  *$//']], 0, 
-	 _AT_AMBIG_GLR_OUTPUT, _AT_VERBOSE_GLR_STDERR)
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+	        _AT_AMBIG_GLR_OUTPUT,
+                _AT_VERBOSE_GLR_STDERR)
 AT_CLEANUP
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -123,7 +123,7 @@ main (void)

 # Link and execute, just to make sure everything is fine (and in
 # particular, that MY_LLOC is indeed defined somewhere).
-AT_CHECK([$CC $CFLAGS $CPPFLAGS caller.c input.c -o caller], 0, [], [ignore])
-AT_CHECK([./caller])
+AT_COMPILE([caller], [caller.c input.c])
+AT_PARSER_CHECK([./caller])

 AT_CLEANUP
--- a/tests/input.at
+++ b/tests/input.at
@@ -182,8 +182,8 @@ main (void)
 ]])

 AT_CHECK([bison input.y -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS main.c input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 0,
+AT_COMPILE([input], [input.c main.c])
+AT_PARSER_CHECK([./input], 0,
 [[[1],
 ]])

--- a/tests/regression.at
+++ b/tests/regression.at
@@ -51,7 +51,7 @@ exp: MY_TOKEN;
 ]])

 AT_CHECK([bison input.y -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -c])
+AT_COMPILE([input], [-c input.c])

 AT_CLEANUP

@@ -329,7 +329,7 @@ exp: "a";
 ]])

 AT_CHECK([bison input.y -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -c])
+AT_COMPILE([input], [input.c -c])
 AT_CLEANUP


--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -21,6 +21,21 @@
 # We need a recent Autotest.
 m4_version_prereq([2.52g])

+
+# AT_COMPILE(OUTPUT, [SOURCES = OUTPUT.c])
+# ----------------------------------------
+#
+m4_define([AT_COMPILE],
+[AT_CHECK([$CC $CFLAGS $CPPFLAGS m4_default([$2], [$1.c]) -o $1], 0,
+          [], [ignore])])
+
+
+# AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR)
+# -----------------------------------------------------
+# So that we can run `./testsuite PREPARSER='valgrind -q' for instance.
+m4_define([AT_PARSER_CHECK],
+[AT_CHECK([$PREPARSER $1], [$2], [$3], [$4])])
+
 AT_INIT

 AT_TESTED([bison])
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -132,8 +132,8 @@ AT_SETUP([Big triangle])
 # it gets killed too.  Of course the parser is to be cleaned.
 AT_DATA_TRIANGULAR_GRAMMAR([input.y], [200])
 AT_CHECK([bison input.y -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input])

 AT_CLEANUP

@@ -231,8 +231,8 @@ AT_SETUP([Big horizontal])
 #
 AT_DATA_HORIZONTAL_GRAMMAR([input.y], [1000])
 AT_CHECK([bison input.y -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input])

 AT_CLEANUP

@@ -350,8 +350,8 @@ AT_SETUP([Many lookaheads])

 AT_DATA_LOOKAHEADS_GRAMMAR([input.y], [1000])
 AT_CHECK([bison input.y -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input])

 AT_CLEANUP

@@ -407,7 +407,7 @@ main (int argc, const char **argv)
 }
 ]])
 AT_CHECK([bison input.y -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
+AT_COMPILE([input])
 ])


@@ -420,12 +420,12 @@ AT_SETUP([Exploding the Stack Size with Alloca])
 AT_DATA_STACK_TORTURE

 # Below the limit of 200.
-AT_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 # Two enlargements: 2 * 2 * 200.
-AT_CHECK([./input 900], 0, [], [ignore])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore])
 # Fails: beyond the limit of 10,000 (which we don't reach anyway since we
 # multiply by two starting at 200 => 5120 is the last possible).
-AT_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 1, [], [ignore])

 AT_CLEANUP

@@ -441,11 +441,11 @@ AT_SETUP([Exploding the Stack Size with Malloc])
 AT_DATA_STACK_TORTURE([[#define YYSTACK_USE_ALLOCA 0]])

 # Below the limit of 200.
-AT_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 # Two enlargements: 2 * 2 * 200.
-AT_CHECK([./input 900], 0, [], [ignore])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore])
 # Fails: beyond the limit of 10,000 (which we don't reach anyway since we
 # multiply by two starting at 200 => 5120 is the possible).
-AT_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 1, [], [ignore])

 AT_CLEANUP