Patches to 2.0.2 for HP-UX and AIX

[Albert Chin]

1. Commas now allowed after last element in an enum (AIX xlc
   compiler errors out).
2. Upgrade src/cfparse.c and src/cfparse.h to get definition
   of alloca() correct on HP-UX 10.20, 11.00, and 11i. We
   generated these with bison 1.28.

-- 
albert chin (address@hidden)

-- snip snip
--- src/cf.defs.h.orig  Mon Jun 17 09:35:34 2002
+++ src/cf.defs.h       Mon Jun 17 09:35:42 2002
@@ -894,7 +894,7 @@
    EditRepos,
    EditUmask,
    EditUseShell,
-   EditFilter,
+   EditFilter
    };
 
 enum RegExpTypes
--- src/cfparse.c.orig  Wed Jun 19 17:31:49 2002
+++ src/cfparse.c       Wed Jun 19 17:32:45 2002
@@ -1,35 +1,34 @@
 
 /*  A Bison parser, made from cfparse.y
- by  GNU Bison version 1.25
-  */
+    by GNU Bison version 1.28  */
 
 #define YYBISON 1  /* Identify Bison output.  */
 
-#define        ID      258
-#define        LIST    259
-#define        ITEM    260
-#define        VARPATH 261
-#define        PATH    262
-#define        LBRACK  263
-#define        RBRACK  264
-#define        CONTROL 265
-#define        GROUPS  266
-#define        ARROW   267
-#define        EQUALS  268
-#define        EDITFILES       269
-#define        QSTRING 270
-#define        VARITEM 271
-#define        WILDCARD        272
-#define        LBRACE  273
-#define        RBRACE  274
-#define        PARSECLASS      275
-#define        LARROW  276
-#define        ACL     277
-#define        ADMIT   278
-#define        DENY    279
-#define        FILTERS 280
-#define        STRATEGIES      281
-#define        ACTIONTYPE      282
+#define        ID      257
+#define        LIST    258
+#define        ITEM    259
+#define        VARPATH 260
+#define        PATH    261
+#define        LBRACK  262
+#define        RBRACK  263
+#define        CONTROL 264
+#define        GROUPS  265
+#define        ARROW   266
+#define        EQUALS  267
+#define        EDITFILES       268
+#define        QSTRING 269
+#define        VARITEM 270
+#define        WILDCARD        271
+#define        LBRACE  272
+#define        RBRACE  273
+#define        PARSECLASS      274
+#define        LARROW  275
+#define        ACL     276
+#define        ADMIT   277
+#define        DENY    278
+#define        FILTERS 279
+#define        STRATEGIES      280
+#define        ACTIONTYPE      281
 
 #line 1 "cfparse.y"
 
@@ -88,7 +87,7 @@
 #define        YYFLAG          -32768
 #define        YYNTBASE        28
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 282 ? yytranslate[x] : 43)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 281 ? yytranslate[x] : 43)
 
 static const char yytranslate[] = {     0,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -116,10 +115,10 @@
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     2,     3,     4,     5,
-     6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-    26,    27
+     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
+     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+    27
 };
 
 #if YYDEBUG != 0
@@ -279,7 +278,8 @@
     67,    68,     6,     0,    10,     9,    45,    46,    47
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/local/gnu/share/bison.simple"
+#line 3 "/opt/TWWfsw/bison/share/bison.simple"
+/* This file comes from bison-1.28.  */
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -296,46 +296,66 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
-#ifndef alloca
+/* This is the parser code that is written into each bison parser
+  when the %semantic_parser declaration is not specified in the grammar.
+  It was written by Richard Stallman by simplifying the hairy parser
+  used when %semantic_parser is specified.  */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
 #ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
 #define alloca __builtin_alloca
 #else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined 
(__sparc) || defined (__sgi)
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined 
(__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
 #include <alloca.h>
 #else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
+/* We think this test detects Watcom and Microsoft C.  */
+/* This used to test MSDOS, but that is a bad idea
+   since that symbol is in the user namespace.  */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+        instead, just don't use alloca.  */
 #include <malloc.h>
+#endif
 #else /* not MSDOS, or __TURBOC__ */
 #if defined(_AIX)
-#include <malloc.h>
+/* I don't know what this was needed for, but it pollutes the namespace.
+   So I turned it off.   rms, 2 May 1997.  */
+/* #include <malloc.h>  */
  #pragma alloca
-#else /* not MSDOS, __TURBOC__, or _AIX */
-#ifdef __hpux
-#ifdef __cplusplus
-extern "C" {
-void *alloca (unsigned int);
-};
-#else /* not __cplusplus */
-void *alloca ();
-#endif /* not __cplusplus */
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* address@hidden says this works for HPUX 9.05 and up,
+                and on HPUX 10.  Eventually we can turn this on.  */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
 #endif /* __hpux */
+#endif
 #endif /* not _AIX */
 #endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc.  */
-#endif /* not GNU C.  */
-#endif /* alloca not defined.  */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
 
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
 
 /* Note: there must be only one dollar sign in this file.
    It is replaced by the list of actions, each action
@@ -345,8 +365,8 @@
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                -2
 #define YYEOF          0
-#define YYACCEPT       return(0)
-#define YYABORT        return(1)
+#define YYACCEPT       goto yyacceptlab
+#define YYABORT        goto yyabortlab
 #define YYERROR                goto yyerrlab1
 /* Like YYERROR except do call yyerror.
    This remains here temporarily to ease the
@@ -427,12 +447,12 @@
 #ifndef YYMAXDEPTH
 #define YYMAXDEPTH 10000
 #endif
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-int yyparse (void);
-#endif
 
+/* Define __yy_memcpy.  Note that the size argument
+   should be passed with type unsigned int, because that is what the non-GCC
+   definitions require.  With GCC, __builtin_memcpy takes an arg
+   of type size_t, but it can handle unsigned int.  */
+
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
 #define __yy_memcpy(TO,FROM,COUNT)     __builtin_memcpy(TO,FROM,COUNT)
 #else                          /* not GNU C or C++ */
@@ -444,7 +464,7 @@
 __yy_memcpy (to, from, count)
      char *to;
      char *from;
-     int count;
+     unsigned int count;
 {
   register char *f = from;
   register char *t = to;
@@ -459,10 +479,10 @@
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
-__yy_memcpy (char *to, char *from, int count)
+__yy_memcpy (char *to, char *from, unsigned int count)
 {
-  register char *f = from;
   register char *t = to;
+  register char *f = from;
   register int i = count;
 
   while (i-- > 0)
@@ -472,7 +492,7 @@
 #endif
 #endif
 
-#line 196 "/local/gnu/share/bison.simple"
+#line 217 "/opt/TWWfsw/bison/share/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -493,6 +513,15 @@
 #define YYPARSE_PARAM_DECL
 #endif /* not YYPARSE_PARAM */
 
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+
 int
 yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
@@ -521,6 +550,7 @@
 #endif
 
   int yystacksize = YYINITDEPTH;
+  int yyfree_stacks = 0;
 
 #ifdef YYPURE
   int yychar;
@@ -605,18 +635,32 @@
       if (yystacksize >= YYMAXDEPTH)
        {
          yyerror("parser stack overflow");
+         if (yyfree_stacks)
+           {
+             free (yyss);
+             free (yyvs);
+#ifdef YYLSP_NEEDED
+             free (yyls);
+#endif
+           }
          return 2;
        }
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
-      yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
-      yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
+#ifndef YYSTACK_USE_ALLOCA
+      yyfree_stacks = 1;
+#endif
+      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1,
+                  size * (unsigned int) sizeof (*yyssp));
+      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+                  size * (unsigned int) sizeof (*yyvsp));
 #ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
+      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1,
+                  size * (unsigned int) sizeof (*yylsp));
 #endif
 #endif /* no yyoverflow */
 
@@ -782,7 +826,7 @@
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/local/gnu/share/bison.simple"
+#line 543 "/opt/TWWfsw/bison/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -977,6 +1021,30 @@
 
   yystate = yyn;
   goto yynewstate;
+
+ yyacceptlab:
+  /* YYACCEPT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 0;
+
+ yyabortlab:
+  /* YYABORT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 1;
 }
 #line 142 "cfparse.y"
 
--- src/cfparse.h.orig  Wed Jun 19 17:31:52 2002
+++ src/cfparse.h       Wed Jun 19 17:32:45 2002
@@ -1,31 +1,31 @@
 #ifndef YYSTYPE
 #define YYSTYPE int
 #endif
-#define        ID      258
-#define        LIST    259
-#define        ITEM    260
-#define        VARPATH 261
-#define        PATH    262
-#define        LBRACK  263
-#define        RBRACK  264
-#define        CONTROL 265
-#define        GROUPS  266
-#define        ARROW   267
-#define        EQUALS  268
-#define        EDITFILES       269
-#define        QSTRING 270
-#define        VARITEM 271
-#define        WILDCARD        272
-#define        LBRACE  273
-#define        RBRACE  274
-#define        PARSECLASS      275
-#define        LARROW  276
-#define        ACL     277
-#define        ADMIT   278
-#define        DENY    279
-#define        FILTERS 280
-#define        STRATEGIES      281
-#define        ACTIONTYPE      282
+#define        ID      257
+#define        LIST    258
+#define        ITEM    259
+#define        VARPATH 260
+#define        PATH    261
+#define        LBRACK  262
+#define        RBRACK  263
+#define        CONTROL 264
+#define        GROUPS  265
+#define        ARROW   266
+#define        EQUALS  267
+#define        EDITFILES       268
+#define        QSTRING 269
+#define        VARITEM 270
+#define        WILDCARD        271
+#define        LBRACE  272
+#define        RBRACE  273
+#define        PARSECLASS      274
+#define        LARROW  275
+#define        ACL     276
+#define        ADMIT   277
+#define        DENY    278
+#define        FILTERS 279
+#define        STRATEGIES      280
+#define        ACTIONTYPE      281
 
 
 extern YYSTYPE yylval;