From 361f60b34e30a68b7e62cd2fb891c230c4e5e9bb Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 16 Mar 2000 15:56:57 +0000 Subject: [PATCH] * src/bison.s1: Properly indent the `alloca' CPP section. --- ChangeLog | 4 +++ src/bison.s1 | 82 +++++++++++++++++++++++++++++--------------------------- src/bison.simple | 82 +++++++++++++++++++++++++++++--------------------------- 3 files changed, 88 insertions(+), 80 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0cea74..2602a94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-03-16 Akim Demaille + * src/bison.s1: Properly indent the `alloca' CPP section. + +2000-03-16 Akim Demaille + Do not hard code values of directories in `configure.in'. Update the `configure' tool chain. diff --git a/src/bison.s1 b/src/bison.s1 index e2a88a9..d7e17fe 100644 --- a/src/bison.s1 +++ b/src/bison.s1 @@ -31,51 +31,53 @@ 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) || (defined (__sun) && defined (__i386)) -#define YYSTACK_USE_ALLOCA -#include -#else /* not sparc */ -/* 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 -#endif -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -/* I don't know what this was needed for, but it pollutes the namespace. - So I turned it off. rms, 2 May 1997. */ -/* #include */ +# 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) || (defined (__sun) && defined (__i386)) +# define YYSTACK_USE_ALLOCA +# include +# else /* not sparc */ + /* 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 +# endif +# else /* not MSDOS, or __TURBOC__ */ +# if defined(_AIX) + /* I don't know what this was needed for, but it pollutes the + namespace. So I turned it off. rms, 2 May 1997. */ + /* #include */ #pragma alloca -#define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr 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 */ +# define YYSTACK_USE_ALLOCA +# else /* not MSDOS, or __TURBOC__, or _AIX */ +# if 0 + /* haible@ilog.fr says this works for HPUX 9.05 and up, and on + HPUX 10. Eventually we can turn this on. */ +# ifdef __hpux +# 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 /* YYSTACK_USE_ALLOCA not defined */ #ifdef YYSTACK_USE_ALLOCA -#define YYSTACK_ALLOC alloca +# define YYSTACK_ALLOC alloca #else -#define YYSTACK_ALLOC malloc +# define YYSTACK_ALLOC malloc #endif /* Note: there must be only one dollar sign in this file. diff --git a/src/bison.simple b/src/bison.simple index e2a88a9..d7e17fe 100644 --- a/src/bison.simple +++ b/src/bison.simple @@ -31,51 +31,53 @@ 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) || (defined (__sun) && defined (__i386)) -#define YYSTACK_USE_ALLOCA -#include -#else /* not sparc */ -/* 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 -#endif -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -/* I don't know what this was needed for, but it pollutes the namespace. - So I turned it off. rms, 2 May 1997. */ -/* #include */ +# 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) || (defined (__sun) && defined (__i386)) +# define YYSTACK_USE_ALLOCA +# include +# else /* not sparc */ + /* 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 +# endif +# else /* not MSDOS, or __TURBOC__ */ +# if defined(_AIX) + /* I don't know what this was needed for, but it pollutes the + namespace. So I turned it off. rms, 2 May 1997. */ + /* #include */ #pragma alloca -#define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr 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 */ +# define YYSTACK_USE_ALLOCA +# else /* not MSDOS, or __TURBOC__, or _AIX */ +# if 0 + /* haible@ilog.fr says this works for HPUX 9.05 and up, and on + HPUX 10. Eventually we can turn this on. */ +# ifdef __hpux +# 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 /* YYSTACK_USE_ALLOCA not defined */ #ifdef YYSTACK_USE_ALLOCA -#define YYSTACK_ALLOC alloca +# define YYSTACK_ALLOC alloca #else -#define YYSTACK_ALLOC malloc +# define YYSTACK_ALLOC malloc #endif /* Note: there must be only one dollar sign in this file. -- 2.7.4