X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/cb9ec4fada480554cf47810fee736997d64e7427..f6df83b4e80b2a53c08b5dc654e247076a3b9b03:/src/system.h?ds=sidebyside
diff --git a/src/system.h b/src/system.h
index a56c058a..6355141a 100644
--- a/src/system.h
+++ b/src/system.h
@@ -16,65 +16,61 @@
along with this program. If not, see . */
#ifndef BISON_SYSTEM_H
-#define BISON_SYSTEM_H
+# define BISON_SYSTEM_H
/* flex 2.5.31 gratutiously defines macros like INT8_MIN. But this
runs afoul of pre-C99 compilers that have or
, which are included below if available. It also runs
afoul of pre-C99 compilers that define these macros in . */
-#if ! defined __STDC_VERSION__ || __STDC_VERSION__ < 199901
-# undef INT8_MIN
-# undef INT16_MIN
-# undef INT32_MIN
-# undef INT8_MAX
-# undef INT16_MAX
-# undef UINT8_MAX
-# undef INT32_MAX
-# undef UINT16_MAX
-# undef UINT32_MAX
-#endif
-
-#include
-#include
-#include
-#include
-
-#define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
-#define STREQ(L, R) (strcmp(L, R) == 0)
-#define STRNEQ(L, R) (!STREQ(L, R))
+# if ! defined __STDC_VERSION__ || __STDC_VERSION__ < 199901
+# undef INT8_MIN
+# undef INT16_MIN
+# undef INT32_MIN
+# undef INT8_MAX
+# undef INT16_MAX
+# undef UINT8_MAX
+# undef INT32_MAX
+# undef UINT16_MAX
+# undef UINT32_MAX
+# endif
+
+# include
+# include
+# include
+# include
+
+# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
+# define STREQ(L, R) (strcmp(L, R) == 0)
+# define STRNEQ(L, R) (!STREQ(L, R))
/* Just like strncmp, but the second argument must be a literal string
and you don't specify the length. */
-#define STRNCMP_LIT(S, Literal) \
+# define STRNCMP_LIT(S, Literal) \
strncmp (S, "" Literal "", sizeof (Literal) - 1)
/* Whether Literal is a prefix of S. */
-#define STRPREFIX_LIT(Literal, S) \
+# define STRPREFIX_LIT(Literal, S) \
(STRNCMP_LIT (S, Literal) == 0)
-#if HAVE_SYS_TYPES_H
-# include
-#endif
-
-#include
-#include
+# include
+# include
-#ifndef UINTPTR_MAX
+# ifndef UINTPTR_MAX
/* This isn't perfect, but it's good enough for Bison, which needs
only to hash pointers. */
typedef size_t uintptr_t;
-#endif
+# endif
-// Version mismatch.
-#define EX_MISMATCH 63
+/* Version mismatch. */
+# define EX_MISMATCH 63
/*---------.
| Gnulib. |
`---------*/
-#include
-#include
-#include
+# include
+# include
+# include
/*-----------------.
@@ -93,49 +89,48 @@ typedef size_t uintptr_t;
and safer logic than it would for users. Due to the overhead of M4,
suppressing Code is unlikely to offer any significant improvement in
Bison's performance anyway. */
-#define PACIFY_CC(Code) Code
+# define PACIFY_CC(Code) Code
-#ifndef __attribute__
+# ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */
-# if (! defined __GNUC__ || __GNUC__ < 2 \
+# if (! defined __GNUC__ || __GNUC__ < 2 \
|| (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-# define __attribute__(Spec) /* empty */
+# define __attribute__(Spec) /* empty */
+# endif
# endif
-#endif
/* 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
-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-#endif
+# ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+# endif
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#endif
+# ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# endif
-#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)
/*------.
| NLS. |
`------*/
-#include
+# include
-#include
-#define _(Msgid) gettext (Msgid)
-#define N_(Msgid) (Msgid)
+# include
+# define _(Msgid) gettext (Msgid)
+# define N_(Msgid) (Msgid)
/*-----------.
| Booleans. |
`-----------*/
-#include
+# include
@@ -161,19 +156,21 @@ typedef size_t uintptr_t;
For now, we use assert but we call it aver throughout Bison in case
we later wish to try another scheme.
*/
-#include
-#define aver assert
+# include
+# define aver assert
/*-----------.
| Obstacks. |
`-----------*/
-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free free
-#include
+# define obstack_chunk_alloc xmalloc
+# define obstack_chunk_free free
+# include
-#define obstack_sgrow(Obs, Str) \
+/* String-grow: append Str to Obs. */
+
+# define obstack_sgrow(Obs, Str) \
obstack_grow (Obs, Str, strlen (Str))
/* Output Str escaped for our postprocessing (i.e., escape M4 special
@@ -217,20 +214,23 @@ typedef size_t uintptr_t;
} while (0)
+/* Append the ending 0, finish Obs, and return the string. */
+# define obstack_finish0(Obs) \
+ (obstack_1grow (Obs, '\0'), (char *) obstack_finish (Obs))
/*-----------------------------------------.
| Extensions to use for the output files. |
`-----------------------------------------*/
-#ifndef OUTPUT_EXT
-# define OUTPUT_EXT ".output"
-#endif
+# ifndef OUTPUT_EXT
+# define OUTPUT_EXT ".output"
+# endif
-#ifndef TAB_EXT
-# define TAB_EXT ".tab"
-#endif
+# ifndef TAB_EXT
+# define TAB_EXT ".tab"
+# endif
@@ -238,15 +238,15 @@ typedef size_t uintptr_t;
| Free a linked list. |
`---------------------*/
-#define LIST_FREE(Type, List) \
-do { \
- Type *_node, *_next; \
- for (_node = List; _node; _node = _next) \
- { \
- _next = _node->next; \
- free (_node); \
- } \
-} while (0)
+# define LIST_FREE(Type, List) \
+ do { \
+ Type *_node, *_next; \
+ for (_node = List; _node; _node = _next) \
+ { \
+ _next = _node->next; \
+ free (_node); \
+ } \
+ } while (0)
/*---------------------------------------------.