mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 20:33:03 +00:00
e9071366c3
As a consequence, the relation between the grammar scanner and
parser is much simpler. We can also split "composite tokens" back
into simple tokens.
* src/gram.h (ITEM_NUMBER_MAX, RULE_NUMBER_MAX): New.
* src/scan-gram.l (add_column_width, adjust_location): Move to and
rename as...
* src/location.h, src/location.c (add_column_width)
(location_compute): these.
Fix the column count: the initial column is 0.
(location_print): Be robust to ending column being 0.
* src/location.h (boundary_set): New.
* src/main.c: Adjust to scanner_free being renamed as
gram_scanner_free.
* src/output.c: Include scan-code.h.
* src/parse-gram.y: Include scan-gram.h and scan-code.h.
Use boundary_set.
(PERCENT_DESTRUCTOR, PERCENT_PRINTER, PERCENT_INITIAL_ACTION)
(PERCENT_LEX_PARAM, PERCENT_PARSE_PARAM): Remove the {...} part,
which is now, again, a separate token.
Adjust all dependencies.
Whereever actions with $ and @ are used, use translate_code.
(action): Remove this nonterminal which is now useless.
* src/reader.c: Include assert.h, scan-gram.h and scan-code.h.
(grammar_current_rule_action_append): Use translate_code.
(packgram): Bound check ruleno, itemno, and rule_length.
* src/reader.h (gram_in, gram__flex_debug, scanner_cursor)
(last_string, last_braced_code_loc, max_left_semantic_context)
(scanner_initialize, scanner_free, scanner_last_string_free)
(gram_out, gram_lineno, YY_DECL_): Move to...
* src/scan-gram.h: this new file.
(YY_DECL): Rename as...
(GRAM_DECL): this.
* src/scan-code.h, src/scan-code.l, src/scan-code-c.c: New.
* src/scan-gram.l (gram_get_lineno, gram_get_in, gram_get_out):
(gram_get_leng, gram_get_text, gram_set_lineno, gram_set_in):
(gram_set_out, gram_get_debug, gram_set_debug, gram_lex_destroy):
Move these declarations, and...
(obstack_for_string, STRING_GROW, STRING_FINISH, STRING_FREE):
these to...
* src/flex-scanner.h: this new file.
* src/scan-gram.l (rule_length, rule_length_overflow)
(increment_rule_length): Remove.
(last_braced_code_loc): Rename as...
(gram_last_braced_code_loc): this.
Adjust to the changes of the parser.
Move all the handling of $ and @ into...
* src/scan-code.l: here.
* src/scan-gram.l (handle_dollar, handle_at): Remove.
(handle_action_dollar, handle_action_at): Move to...
* src/scan-code.l: here.
* src/Makefile.am (bison_SOURCES): Add flex-scanner.h,
scan-code.h, scan-code-c.c, scan-gram.h.
(EXTRA_bison_SOURCES): Add scan-code.l.
(BUILT_SOURCES): Add scan-code.c.
(yacc): Be robust to white spaces.
* tests/conflicts.at, tests/input.at, tests/reduce.at,
* tests/regression.at: Adjust the column numbers.
* tests/regression.at: Adjust the error message.
234 lines
5.3 KiB
C
234 lines
5.3 KiB
C
/* System-dependent definitions for Bison.
|
|
|
|
Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 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
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
|
|
|
#ifndef 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 <inttypes.h> or
|
|
<stdint.h>, which are included below if available. It also runs
|
|
afoul of pre-C99 compilers that define these macros in <limits.h>. */
|
|
#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 <limits.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "unlocked-io.h"
|
|
|
|
#if HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
|
|
#if HAVE_UNISTD_H
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
#if HAVE_INTTYPES_H
|
|
# include <inttypes.h>
|
|
#endif
|
|
#if HAVE_STDINT_H
|
|
# include <stdint.h>
|
|
#endif
|
|
|
|
#if ! HAVE_UINTPTR_T
|
|
/* This isn't perfect, but it's good enough for Bison, which needs
|
|
only to hash pointers. */
|
|
typedef size_t uintptr_t;
|
|
#endif
|
|
|
|
#include <verify.h>
|
|
#include <xalloc.h>
|
|
|
|
|
|
/*---------------------.
|
|
| Missing prototypes. |
|
|
`---------------------*/
|
|
|
|
#include <stpcpy.h>
|
|
|
|
/* From lib/basename.c. */
|
|
char *base_name (char const *name);
|
|
|
|
|
|
/*-----------------.
|
|
| GCC extensions. |
|
|
`-----------------*/
|
|
|
|
/* Use this to suppress gcc's `...may be used before initialized'
|
|
warnings. */
|
|
#ifdef lint
|
|
# define IF_LINT(Code) Code
|
|
#else
|
|
# define IF_LINT(Code) /* empty */
|
|
#endif
|
|
|
|
#ifndef __attribute__
|
|
/* This feature is available in gcc versions 2.5 and later. */
|
|
# if (! defined __GNUC__ || __GNUC__ < 2 \
|
|
|| (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)
|
|
# 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. */
|
|
#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_UNUSED
|
|
# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
|
|
#endif
|
|
|
|
#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)
|
|
|
|
/*------.
|
|
| NLS. |
|
|
`------*/
|
|
|
|
#include <locale.h>
|
|
|
|
#include <gettext.h>
|
|
#define _(Msgid) gettext (Msgid)
|
|
#define N_(Msgid) (Msgid)
|
|
|
|
|
|
/*-------------------------------.
|
|
| Fix broken compilation flags. |
|
|
`-------------------------------*/
|
|
|
|
#ifndef LOCALEDIR
|
|
# define LOCALEDIR "/usr/local/share/locale"
|
|
#endif
|
|
|
|
|
|
/*-----------.
|
|
| Booleans. |
|
|
`-----------*/
|
|
|
|
#include <stdbool.h>
|
|
|
|
|
|
/*-----------.
|
|
| Obstacks. |
|
|
`-----------*/
|
|
|
|
#define obstack_chunk_alloc xmalloc
|
|
#define obstack_chunk_free free
|
|
#include <obstack.h>
|
|
|
|
#define obstack_sgrow(Obs, Str) \
|
|
obstack_grow (Obs, Str, strlen (Str))
|
|
|
|
#define obstack_fgrow1(Obs, Format, Arg1) \
|
|
do { \
|
|
char buf[4096]; \
|
|
sprintf (buf, Format, Arg1); \
|
|
obstack_grow (Obs, buf, strlen (buf)); \
|
|
} while (0)
|
|
|
|
#define obstack_fgrow2(Obs, Format, Arg1, Arg2) \
|
|
do { \
|
|
char buf[4096]; \
|
|
sprintf (buf, Format, Arg1, Arg2); \
|
|
obstack_grow (Obs, buf, strlen (buf)); \
|
|
} while (0)
|
|
|
|
#define obstack_fgrow3(Obs, Format, Arg1, Arg2, Arg3) \
|
|
do { \
|
|
char buf[4096]; \
|
|
sprintf (buf, Format, Arg1, Arg2, Arg3); \
|
|
obstack_grow (Obs, buf, strlen (buf)); \
|
|
} while (0)
|
|
|
|
#define obstack_fgrow4(Obs, Format, Arg1, Arg2, Arg3, Arg4) \
|
|
do { \
|
|
char buf[4096]; \
|
|
sprintf (buf, Format, Arg1, Arg2, Arg3, Arg4); \
|
|
obstack_grow (Obs, buf, strlen (buf)); \
|
|
} while (0)
|
|
|
|
|
|
|
|
/*-----------------------------------------.
|
|
| Extensions to use for the output files. |
|
|
`-----------------------------------------*/
|
|
|
|
#ifndef OUTPUT_EXT
|
|
# define OUTPUT_EXT ".output"
|
|
#endif
|
|
|
|
#ifndef TAB_EXT
|
|
# define TAB_EXT ".tab"
|
|
#endif
|
|
|
|
#ifndef DEFAULT_TMPDIR
|
|
# define DEFAULT_TMPDIR "/tmp"
|
|
#endif
|
|
|
|
|
|
|
|
/*---------------------.
|
|
| 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)
|
|
|
|
|
|
/* Assertions. <assert.h>'s assertions are too heavyweight, and can
|
|
be disabled too easily, so implement it separately here. */
|
|
#define assert(x) ((void) ((x) || (abort (), 0)))
|
|
|
|
|
|
/*---------------------------------------------.
|
|
| Debugging memory allocation (must be last). |
|
|
`---------------------------------------------*/
|
|
|
|
# if WITH_DMALLOC
|
|
# define DMALLOC_FUNC_CHECK
|
|
# include <dmalloc.h>
|
|
# endif /* WITH_DMALLOC */
|
|
|
|
#endif /* ! BISON_SYSTEM_H */
|