Make previous patch more robust.

* src/output.c (ARRAY_CARDINALITY): New macro, copied from
argmatch.h.
(output_skeleton): Use it.
Suggested by Akim Demaille.

Signed-off-by: Eric Blake <ebb9@byu.net>
(cherry picked from commit 1266b63674)
This commit is contained in:
Eric Blake
2009-08-20 16:52:19 -06:00
parent c519609864
commit aa50ba7bff
2 changed files with 23 additions and 14 deletions

View File

@@ -1,5 +1,11 @@
2009-08-20 Eric Blake <ebb9@byu.net>
Make previous patch more robust.
* src/output.c (ARRAY_CARDINALITY): New macro, copied from
argmatch.h.
(output_skeleton): Use it.
Suggested by Akim Demaille.
Import latest m4/m4.m4.
* submodules/autoconf: Update to autoconf 2.64.
* configure.ac (M4_GNU_OPTION): New define.

View File

@@ -21,6 +21,7 @@
#include <config.h>
#include "system.h"
#include <assert.h>
#include <configmake.h>
#include <error.h>
#include <get-errno.h>
@@ -40,6 +41,7 @@
#include "symtab.h"
#include "tables.h"
# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
static struct obstack format_obstack;
@@ -564,6 +566,7 @@ output_skeleton (void)
argv[i++] = full_m4bison;
argv[i++] = full_skeleton;
argv[i++] = NULL;
assert (i <= ARRAY_CARDINALITY (argv));
}
init_subpipe ();