* data/glr.c, data/lalr1.cc, data/yacc.cc, doc/bison.texinfo,

src/conflicts.c, src/parse-gram.y, src/tables.c, src/tables.h,
tests/action.at, tests/calc.at, tests/conflicts.at,
tests/cxx-type.at, tests/regression.at:
"parse error" -> "syntax error" for POSIX compatibility.
"parsing stack overflow..." -> "parser stack overflow" so
that code matches Bison documentation.
This commit is contained in:
Paul Eggert
2002-11-15 20:32:21 +00:00
parent 0f39aab92a
commit 6e649e659e
15 changed files with 80 additions and 62 deletions

View File

@@ -252,7 +252,7 @@ resolve_sr_conflict (state_t *state, int ruleno,
| Solve the S/R conflicts of STATE using the |
| precedence/associativity, and flag it inconsistent if it still has |
| conflicts. ERRS can be used as storage to compute the list of |
| lookaheads on which this STATE raises a parse error (%nonassoc). |
| lookaheads on which this STATE raises a syntax error (%nonassoc). |
`-------------------------------------------------------------------*/
static void
@@ -302,7 +302,7 @@ void
conflicts_solve (void)
{
state_number_t i;
/* List of lookaheads on which we explicitly raise a parse error. */
/* List of lookaheads on which we explicitly raise a syntax error. */
symbol_t **errs = XMALLOC (symbol_t *, ntokens + 1);
conflicts = XCALLOC (char, nstates);

View File

@@ -40,7 +40,7 @@
#include "reader.h"
#include "conflicts.h"
/* Produce verbose parse errors. */
/* Produce verbose syntax errors. */
#define YYERROR_VERBOSE 1
#define YYLLOC_DEFAULT(Current, Rhs, N) \
do { \
@@ -64,7 +64,7 @@ do { \
correctly typed access to it. */
#define yycontrol ((gram_control_t *) gram_control)
/* Request detailed parse error messages, and pass them to GRAM_ERROR.
/* Request detailed syntax error messages, and pass them to GRAM_ERROR.
FIXME: depends on the undocumented availability of YYLLOC.t */
#undef yyerror
#define yyerror(Msg) \

View File

@@ -82,7 +82,7 @@ static base_t *width = NULL;
/* For a given state, N = ACTROW[SYMBOL]:
If N = 0, stands for `run the default action'.
If N = MIN, stands for `raise a parse error'.
If N = MIN, stands for `raise a syntax error'.
If N > 0, stands for `shift SYMBOL and go to n'.
If N < 0, stands for `reduce -N'. */
typedef short action_t;
@@ -116,7 +116,7 @@ static int conflict_list_free;
static size_t table_size = 32768;
base_t *table = NULL;
base_t *check = NULL;
/* The value used in TABLE to denote explicit parse errors
/* The value used in TABLE to denote explicit syntax errors
(%nonassoc), a negative infinite. First defaults to ACTION_MIN,
but in order to keep small tables, renumbered as TABLE_ERROR, which
is the smallest (non error) value minus 1. */

View File

@@ -105,7 +105,7 @@ extern int conflict_list_cnt;
extern base_t *table;
extern base_t *check;
/* The value used in TABLE to denote explicit parse errors
/* The value used in TABLE to denote explicit syntax errors
(%nonassoc), a negative infinite. */
extern base_t table_ninf;