* src/tables.h, src/tables.c, src/output.c: Comment changes.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index b1d15424b7a1f2ebfaa82847ec2d634e53846529..18b1377992e7b102fcc98f7f7f14a58d0930bf2c 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,5 @@
 /* system-dependent definitions for Bison.
 /* system-dependent definitions for Bison.

-   Copyright 2000, 2001  Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 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
 
    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


@@ -22,6 +22,23 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

+/* AIX requires this to be the first thing in the file.  */
+#ifdef __GNUC__
+# define alloca(Size) __builtin_alloca (Size)
+#else
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+

 #include <stdio.h>
 
 #include <assert.h>
 #include <stdio.h>
 
 #include <assert.h>


@@ -57,34 +74,27 @@
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 

-#if defined(STDC_HEADERS) || defined(HAVE_CTYPE_H)
-# include <ctype.h>
-#endif
-

 #include <errno.h>
 #ifndef errno
 extern int errno;
 #endif
 
 #include <errno.h>
 #ifndef errno
 extern int errno;
 #endif
 

-/* AIX requires this to be the first thing in the file.  */
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
+#ifndef PARAMS
+# if defined PROTOTYPES || defined __STDC__
+#  define PARAMS(Args) Args

 # else
 # else

-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
+#  define PARAMS(Args) ()

 # endif
 #endif
 
 # endif
 #endif
 

-#if PROTOTYPES
-# define PARAMS(p) p
-#else
-# define PARAMS(p) ()
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifndef SHRT_MIN
+# define SHRT_MIN (-32768)
+#endif
+#ifndef SHRT_MAX
+# define SHRT_MAX 32767

 #endif
 
 # include "xalloc.h"
 #endif
 
 # include "xalloc.h"


@@ -92,6 +102,15 @@ char *alloca ();
 /* From xstrndup.c.  */
 char *xstrndup PARAMS ((const char *s, size_t n));
 
 /* From xstrndup.c.  */
 char *xstrndup PARAMS ((const char *s, size_t n));
 

+
+/*----------------.
+| Using timevar.  |
+`----------------*/
+
+#include "timevar.h"
+extern int time_report;
+
+

 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/


@@ -104,10 +123,6 @@ char *stpcpy PARAMS ((char *dest, const char *src));
 char *strchr(const char *s, int c);
 #endif
 
 char *strchr(const char *s, int c);
 #endif
 

-#if !HAVE_DECL_STRNDUP
-char *strndup PARAMS ((const char *s, size_t size));
-#endif
-

 #if !HAVE_DECL_STRSPN
 size_t strspn(const char *s, const char *accept);
 #endif
 #if !HAVE_DECL_STRSPN
 size_t strspn(const char *s, const char *accept);
 #endif


@@ -117,7 +132,11 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 #endif
 
 #if !HAVE_DECL_MEMCHR
 #endif
 
 #if !HAVE_DECL_MEMCHR

-void *memchr(const void *s, int c, size_t n);
+void *memchr PARAMS ((const void *s, int c, size_t n));
+#endif
+
+#if !HAVE_DECL_MEMRCHR
+void *memrchr PARAMS ((const void *s, int c, size_t n));

 #endif
 
 
 #endif
 
 


@@ -128,17 +147,26 @@ void *memchr(const void *s, int c, size_t n);
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */

-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if !defined (__GNUC__) || __GNUC__ < 2 || \
+(__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__

 #  define __attribute__(Spec) /* empty */
 # endif
 #  define __attribute__(Spec) /* empty */
 # endif

+#endif
+

 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */

-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
-# endif
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# define __format__ format
+# define __printf__ printf

 #endif
 
 #endif
 

+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif

 
 /*------.
 | NLS.  |
 
 /*------.
 | NLS.  |


@@ -151,7 +179,7 @@ void *memchr(const void *s, int c, size_t n);
 # define setlocale(Category, Locale)
 #endif
 
 # define setlocale(Category, Locale)
 #endif
 

-#include "libgettext.h"
+#include "gettext.h"

 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 
 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 


@@ -216,80 +244,37 @@ do {                                                              \
 } while (0)
 
 
 } while (0)
 
 

-/*---------------------------------.
-| Machine-dependencies for Bison.  |
-`---------------------------------*/
-
-#ifdef eta10
-# define       MAXSHORT        2147483647
-# define       MINSHORT        -2147483648
-#else
-# define       MAXSHORT        32767
-# define       MINSHORT        -32768
-#endif
-
-#if defined (MSDOS) && !defined (__GO32__)
-# define       BITS_PER_WORD   16
-# define MAXTABLE      16383
-#else
-# define       BITS_PER_WORD   32
-# define MAXTABLE      32767
-#endif
-
-#define        WORDSIZE(n)     (((n) + BITS_PER_WORD - 1) / BITS_PER_WORD)
-#define        SETBIT(x, i)    ((x)[(i)/BITS_PER_WORD] |= (1<<((i) % BITS_PER_WORD)))
-#define RESETBIT(x, i) ((x)[(i)/BITS_PER_WORD] &= ~(1<<((i) % BITS_PER_WORD)))
-#define BITISSET(x, i) (((x)[(i)/BITS_PER_WORD] & (1<<((i) % BITS_PER_WORD))) != 0)

 
 

-
-/* Extensions to use for the output files. */
+/*-----------------------------------------.
+| Extensions to use for the output files.  |
+`-----------------------------------------*/

 
 #ifdef VMS
   /* VMS. */
 # define EXT_TAB       "_tab"
 # define EXT_OUTPUT    ".output"
 
 #ifdef VMS
   /* VMS. */
 # define EXT_TAB       "_tab"
 # define EXT_OUTPUT    ".output"

-# define EXT_STYPE_H   "_stype"
-# define EXT_GUARD_C   "_guard"

 #else /* ! VMS */
 # ifdef MSDOS
    /* MS DOS. */
 #  define EXT_TAB      "_tab"
 #  define EXT_OUTPUT   ".out"
 #else /* ! VMS */
 # ifdef MSDOS
    /* MS DOS. */
 #  define EXT_TAB      "_tab"
 #  define EXT_OUTPUT   ".out"

-#  define EXT_STYPE_H  ".sth"
-#  define EXT_GUARD_C  ".guc"

 # else /* ! MSDOS */
   /* Standard. */
 #  define EXT_TAB      ".tab"
 #  define EXT_OUTPUT   ".output"
 # else /* ! MSDOS */
   /* Standard. */
 #  define EXT_TAB      ".tab"
 #  define EXT_OUTPUT   ".output"

-#  define EXT_STYPE_H  ".stype"
-#  define EXT_GUARD_C  ".guard"

 # endif /* ! MSDOS */
 #endif /* ! VMS */
 
 # endif /* ! MSDOS */
 #endif /* ! VMS */
 

-#if defined (VMS) & !defined (__VMS_POSIX)
-# ifndef BISON_SIMPLE
-#  define BISON_SIMPLE "GNU_BISON:[000000]BISON.SIMPLE"
-# endif
-# ifndef BISON_HAIRY
-#  define BISON_HARIRY "GNU_BISON:[000000]BISON.HAIRY"
-# endif
+#ifndef DEFAULT_TMPDIR
+# define DEFAULT_TMPDIR "/tmp"

 #endif
 
 #endif
 

-#if defined (_MSC_VER)
-# ifndef BISON_SIMPLE
-#  define BISON_SIMPLE "c:/usr/local/lib/bison.simple"
-# endif
-# ifndef BISON_HAIRY
-#  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
-# endif
-#endif

 
 
 
 

-/* As memcpy, but for shorts.  */
-#define shortcpy(Dest, Src, Num) \
-  memcpy (Dest, Src, Num * sizeof (short))
+/*---------------------.
+| Free a linked list.  |
+`---------------------*/

 
 

-/* Free a linked list. */

 #define LIST_FREE(Type, List)                  \
 do {                                           \
   Type *_node, *_next;                         \
 #define LIST_FREE(Type, List)                  \
 do {                                           \
   Type *_node, *_next;                         \


@@ -300,9 +285,10 @@ do {                                               \
     }                                          \
 } while (0)
 
     }                                          \
 } while (0)
 

-/*---------------------------------.
-| Debugging the memory allocator.  |
-`---------------------------------*/
+
+/*---------------------------------------------.
+| Debugging memory allocation (must be last).  |
+`---------------------------------------------*/

 
 # if WITH_DMALLOC
 #  define DMALLOC_FUNC_CHECK
 
 # if WITH_DMALLOC
 #  define DMALLOC_FUNC_CHECK