* src/bison.simple (YYSTACK_ALLOC, YYSIZE_T): Remove special

cases for non-GNU systems like AIX, HP-UX, SGI, Sun, and
Sparc, as they were causing more porting problems than the
(minor) performance improvement was worth.
Also, catch up with 1.31's YYSTD.

diff --git a/ChangeLog b/ChangeLog
index a0b80994500ea6909a9c93d3c8d1a8ac8cfc7eb5..4509f86423094227097062dad210a34c019edc60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-27  Paul Eggert  <eggert@twinsun.com>
+
+       * src/bison.simple (YYSTACK_ALLOC, YYSIZE_T): Remove special
+       cases for non-GNU systems like AIX, HP-UX, SGI, Sun, and
+       Sparc, as they were causing more porting problems than the
+       (minor) performance improvement was worth.
+
+       Also, catch up with 1.31's YYSTD.
+

 2001-12-27  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (output_gram): Rely on nritems, not the
 2001-12-27  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (output_gram): Rely on nritems, not the

diff --git a/src/bison.simple b/src/bison.simple
index 5403492f5cd685f1509b46fc2bbf0b0b24481cc4..df1ced7c150c67536e3f7bbae36e111da67ddf1b 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -85,8 +85,6 @@ typedef struct yyltype
 /* Line %%skeleton-line of %%skeleton.  */
 #line %%line "%%parser-file-name"
 
 /* Line %%skeleton-line of %%skeleton.  */
 #line %%line "%%parser-file-name"
 

-#include <stdio.h>
-

 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
    variables, as they might otherwise be expanded by user macros.
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
    variables, as they might otherwise be expanded by user macros.


@@ -94,32 +92,28 @@ typedef struct yyltype
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 

-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#ifdef __cplusplus
+# define YYSTD(x) std::x
+#else
+# define YYSTD(x) x
+#endif
+
+#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)

 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # if YYSTACK_USE_ALLOCA
 #  define YYSTACK_ALLOC alloca
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # if YYSTACK_USE_ALLOCA
 #  define YYSTACK_ALLOC alloca

-#  define YYSIZE_T size_t
+#  define YYSIZE_T YYSTD (size_t)

 # else
 #  ifndef YYSTACK_USE_ALLOCA
 #   if defined (alloca) || defined (_ALLOCA_H)
 #    define YYSTACK_ALLOC alloca
 # else
 #  ifndef YYSTACK_USE_ALLOCA
 #   if defined (alloca) || defined (_ALLOCA_H)
 #    define YYSTACK_ALLOC alloca

-#    define YYSIZE_T size_t
+#    define YYSIZE_T YYSTD (size_t)

 #   else
 #   else

-#    if defined (__GNUC__) || defined (_AIX) || defined (__hpux)
+#    ifdef __GNUC__

 #     define YYSTACK_ALLOC __builtin_alloca
 #    endif
 #     define YYSTACK_ALLOC __builtin_alloca
 #    endif

-#    ifndef __GNUC__
-#     ifdef _AIX
- #     pragma alloca
-#     endif
-#     if defined (__sgi) || defined (__sparc__) || defined (__sparc) || defined (__sun)
-#      include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#      define YYSTACK_ALLOC alloca
-#      define YYSIZE_T size_t
-#     endif
-#    endif

 #   endif
 #  endif
 # endif
 #   endif
 #  endif
 # endif


@@ -131,16 +125,14 @@ typedef struct yyltype
 #  ifdef __cplusplus
 #   include <cstdlib> /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T std::size_t
 #  ifdef __cplusplus
 #   include <cstdlib> /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T std::size_t

-#   define YYSTACK_ALLOC std::malloc
-#   define YYSTACK_FREE std::free

 #  else
 #   ifdef __STDC__
 #    include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #    define YYSIZE_T size_t
 #   endif
 #  else
 #   ifdef __STDC__
 #    include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #    define YYSIZE_T size_t
 #   endif

-#   define YYSTACK_ALLOC malloc
-#   define YYSTACK_FREE free

 #  endif
 #  endif

+#  define YYSTACK_ALLOC YYSTD (malloc)
+#  define YYSTACK_FREE YYSTD (free)

 # endif
 
 /* A type that is properly aligned for any stack member.  */
 # endif
 
 /* A type that is properly aligned for any stack member.  */


@@ -400,13 +392,11 @@ while (0)
 # ifndef YYFPRINTF
 #  ifdef __cplusplus
 #   include <cstdio.h> /* INFRINGES ON USER NAME SPACE */
 # ifndef YYFPRINTF
 #  ifdef __cplusplus
 #   include <cstdio.h> /* INFRINGES ON USER NAME SPACE */

-#   define YYFPRINTF std::fprintf
-#   define YYSTDERR std::stderr

 #  else
 #   include <stdio.h> /* INFRINGES ON USER NAME SPACE */
 #  else
 #   include <stdio.h> /* INFRINGES ON USER NAME SPACE */

-#   define YYFPRINTF fprintf
-#   define YYSTDERR stderr

 #  endif
 #  endif

+#  define YYFPRINTF YYSTD (fprintf)
+#  define YYSTDERR YYSTD (stderr)

 # endif
 
 # define YYDPRINTF(Args)                       \
 # endif
 
 # define YYDPRINTF(Args)                       \