Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/main.c (main): If there are complains after grammar

Browse Source 
reductions, then output the report anyway if requested, then die.
* src/symtab.c (bucket_new): Initialize `value' to -1, not 0.
* src/reader.c (eoftoken): New.
(parse_token_decl): If the token being defined has value `0', it
is the eoftoken.
(packsymbols): No longer hack `tags' to insert `$' by hand.
Be sure to preserve the value of the eoftoken.
(reader): Make sure eoftoken is defined.
Initialize nsyms to 0: now eoftoken is created just like the others.
* src/print.c (print_grammar): Don't special case the eof token.
* src/regression.at: Adjust: `$' has value 0, not -1, which was a
lie anyway, albeit pleasant.
* tests/calc.at: Exercise error messages with eoftoken.
Change the grammar so that empty input is invalid.
Adjust expectations.
When yyungeting, be sure to use a valid yylloc: use last_yylloc.
This commit is contained in:
Akim Demaille
2001-12-27 18:13:09 +00:00
parent ec2da99ffe
commit b7c49edf13
8 changed files with 111 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@@ -1,3 +1,24 @@
2001-12-27 Akim Demaille <akim@epita.fr>
* src/main.c (main): If there are complains after grammar
reductions, then output the report anyway if requested, then die.
* src/symtab.c (bucket_new): Initialize `value' to -1, not 0.
* src/reader.c (eoftoken): New.
(parse_token_decl): If the token being defined has value `0', it
is the eoftoken.
(packsymbols): No longer hack `tags' to insert `$' by hand.
Be sure to preserve the value of the eoftoken.
(reader): Make sure eoftoken is defined.
Initialize nsyms to 0: now eoftoken is created just like the others.
* src/print.c (print_grammar): Don't special case the eof token.
* src/regression.at: Adjust: `$' has value 0, not -1, which was a
lie anyway, albeit pleasant.
* tests/calc.at: Exercise error messages with eoftoken.
Change the grammar so that empty input is invalid.
Adjust expectations.
When yyungeting, be sure to use a valid yylloc: use last_yylloc.
2001-12-27 Akim Demaille <akim@epita.fr> 2001-12-27 Akim Demaille <akim@epita.fr>
* configure.in: Check the protos of strchr ans strspn. * configure.in: Check the protos of strchr ans strspn.

10
NEWS
View File

@@ -3,10 +3,18 @@ Bison News
Changes in version 1.49a: Changes in version 1.49a:
* items overflow * Items overflow
Bison no longer dumps core when there are too many items, it just Bison no longer dumps core when there are too many items, it just
dies. dies.
* Token end-of-file
The token end of file may be specified by the user, in which case,
the user symbol is used in the reports, the graphs, and the verbose
error messages instead of `$', which remains being the defaults.
For instance
%token YYEOF 0
or
%token YYEOF 0 "end of file"
Changes in version 1.30: Changes in version 1.30:

8
src/main.c
View File

@@ -86,15 +86,15 @@ main (int argc, char *argv[])
/* Output file names. */ /* Output file names. */
compute_output_file_names (); compute_output_file_names ();
/* Output the detailed report on the grammar. */
if (verbose_flag)
print_results ();
/* Stop if there were errors, to avoid trashing previous output /* Stop if there were errors, to avoid trashing previous output
files. */ files. */
if (complain_message_count) if (complain_message_count)
exit (1); exit (1);
/* Output the detailed report on the grammar. */
if (verbose_flag)
print_results ();
/* Output the VCG graph. */ /* Output the VCG graph. */
if (graph_flag) if (graph_flag)
print_graph (); print_graph ();

2
src/print.c
View File

@@ -389,8 +389,6 @@ print_grammar (FILE *out)
/* TERMINAL (type #) : rule #s terminal is on RHS */ /* TERMINAL (type #) : rule #s terminal is on RHS */
fprintf (out, "%s\n\n", _("Terminals, with rules where they appear")); fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
fprintf (out, "%s (-1)\n", escape (tags[0]));
for (i = 0; i <= max_user_token_number; i++) for (i = 0; i <= max_user_token_number; i++)
if (token_translations[i] != 2) if (token_translations[i] != 2)
{ {

61
src/reader.c
View File

@@ -68,9 +68,9 @@ static int typed;
/* Incremented for each %left, %right or %nonassoc seen */ /* Incremented for each %left, %right or %nonassoc seen */
static int lastprec; static int lastprec;
static bucket *errtoken; static bucket *errtoken = NULL;
static bucket *undeftoken; static bucket *undeftoken = NULL;
static bucket *eoftoken = NULL;
static symbol_list * static symbol_list *
symbol_list_new (bucket *sym) symbol_list_new (bucket *sym)
@@ -441,7 +441,7 @@ copy_definition (void)
{ {
obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"), obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
lineno, quotearg_style (c_quoting_style, lineno, quotearg_style (c_quoting_style,
muscle_find("filename"))); muscle_find ("filename")));
} }
after_percent = 0; after_percent = 0;
@@ -573,6 +573,9 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
else if (symbol && token == tok_number) else if (symbol && token == tok_number)
{ {
symbol->user_token_number = numval; symbol->user_token_number = numval;
/* User defined EOF token? */
if (numval == 0)
eoftoken = symbol;
} }
else else
{ {
@@ -902,8 +905,8 @@ static void
parse_muscle_decl (void) parse_muscle_decl (void)
{ {
int ch = ungetc (skip_white_space (), finput); int ch = ungetc (skip_white_space (), finput);
char* muscle_key; char *muscle_key;
char* muscle_value; char *muscle_value;
/* Read key. */ /* Read key. */
if (!isalpha (ch) && ch != '_') if (!isalpha (ch) && ch != '_')
@@ -1486,7 +1489,7 @@ read_additionnal_code (void)
{ {
obstack_fgrow2 (&el_obstack, muscle_find ("linef"), obstack_fgrow2 (&el_obstack, muscle_find ("linef"),
lineno, quotearg_style (c_quoting_style, lineno, quotearg_style (c_quoting_style,
muscle_find("filename"))); muscle_find ("filename")));
} }
while ((c = getc (finput)) != EOF) while ((c = getc (finput)) != EOF)
@@ -1549,7 +1552,6 @@ packsymbols (void)
bucket *bp = NULL; bucket *bp = NULL;
int tokno = 1; int tokno = 1;
int last_user_token_number; int last_user_token_number;
static char DOLLAR[] = "$";
tags = XCALLOC (char *, nsyms + 1); tags = XCALLOC (char *, nsyms + 1);
user_toknums = XCALLOC (short, nsyms + 1); user_toknums = XCALLOC (short, nsyms + 1);
@@ -1557,10 +1559,6 @@ packsymbols (void)
sprec = XCALLOC (short, nsyms); sprec = XCALLOC (short, nsyms);
sassoc = XCALLOC (short, nsyms); sassoc = XCALLOC (short, nsyms);
/* The EOF token. */
tags[0] = DOLLAR;
user_toknums[0] = 0;
max_user_token_number = 256; max_user_token_number = 256;
last_user_token_number = 256; last_user_token_number = 256;
@@ -1572,11 +1570,18 @@ packsymbols (void)
} }
else if (bp->alias) else if (bp->alias)
{ {
/* this symbol and its alias are a single token defn. /* This symbol and its alias are a single token defn.
allocate a tokno, and assign to both check agreement of Allocate a tokno, and assign to both check agreement of
->prec and ->assoc fields and make both the same */ prec and assoc fields and make both the same */
if (bp->value == 0) if (bp->value == -1)
bp->value = bp->alias->value = tokno++; {
if (bp == eoftoken || bp->alias == eoftoken)
bp->value = bp->alias->value = 0;
else
{
bp->value = bp->alias->value = tokno++;
}
}
if (bp->prec != bp->alias->prec) if (bp->prec != bp->alias->prec)
{ {
@@ -1602,13 +1607,17 @@ packsymbols (void)
bp->assoc = bp->alias->assoc; bp->assoc = bp->alias->assoc;
} }
/* Do not do processing below for SALIASs. */
if (bp->user_token_number == SALIAS) if (bp->user_token_number == SALIAS)
continue; /* do not do processing below for SALIASs */ continue;
} }
else /* bp->class == token_sym */ else /* bp->class == token_sym */
{ {
bp->value = tokno++; if (bp == eoftoken)
bp->value = 0;
else
bp->value = tokno++;
} }
if (bp->class == token_sym) if (bp->class == token_sym)
@@ -1774,7 +1783,7 @@ reader (void)
start_flag = 0; start_flag = 0;
startval = NULL; /* start symbol not specified yet. */ startval = NULL; /* start symbol not specified yet. */
nsyms = 1; nsyms = 0;
nvars = 0; nvars = 0;
nrules = 0; nrules = 0;
nitems = 0; nitems = 0;
@@ -1818,6 +1827,16 @@ reader (void)
TABLE_OBSTACK and FDEFINES file. Also notice any %token, %left, TABLE_OBSTACK and FDEFINES file. Also notice any %token, %left,
etc. found there. */ etc. found there. */
read_declarations (); read_declarations ();
/* If the user did not define her EOFTOKEN, do it now. */
if (!eoftoken)
{
eoftoken = getsym ("$");
eoftoken->class = token_sym;
/* Value specified by POSIX. */
eoftoken->user_token_number = 0;
}
/* Read in the grammar, build grammar in list form. Write out /* Read in the grammar, build grammar in list form. Write out
guards and actions. */ guards and actions. */
readgram (); readgram ();

2
src/symtab.c
View File

@@ -55,7 +55,7 @@ bucket_new (const char *tag, int hashval)
res->next = NULL; res->next = NULL;
res->tag = xstrdup (tag); res->tag = xstrdup (tag);
res->type_name = NULL; res->type_name = NULL;
res->value = 0; res->value = -1;
res->prec = 0; res->prec = 0;
res->assoc = right_assoc; res->assoc = right_assoc;
res->user_token_number = SUNDEF; res->user_token_number = SUNDEF;

49
tests/calc.at
View File

@@ -64,8 +64,8 @@ extern void perror (const char *s);
%} %}
/* Bison Declarations */ /* Bison Declarations */
%token CALC_EOF 0 %token CALC_EOF 0 "end of file"
%token NUM %token NUM "number"
%nonassoc '=' /* comparison */ %nonassoc '=' /* comparison */
%left '-' '+' %left '-' '+'
@@ -78,7 +78,7 @@ extern void perror (const char *s);
/* Grammar follows */ /* Grammar follows */
%% %%
input: input:
/* empty string */ line
| input line | input line
; ;
@@ -118,11 +118,16 @@ yyerror (const char *s)
fprintf (stderr, "%s\n", s); fprintf (stderr, "%s\n", s);
} }
#if YYLSP_NEEDED
static YYLTYPE last_yylloc;
#endif
static int static int
yygetc (void) yygetc (void)
{ {
int res = getc (yyin); int res = getc (yyin);
#if YYLSP_NEEDED #if YYLSP_NEEDED
last_yylloc = yylloc;
if (res == '\n') if (res == '\n')
{ {
yylloc.last_line++; yylloc.last_line++;
@@ -140,7 +145,7 @@ yyungetc (int c)
{ {
#if YYLSP_NEEDED #if YYLSP_NEEDED
/* Wrong when C == `\n'. */ /* Wrong when C == `\n'. */
yylloc.last_column--; yylloc = last_yylloc;
#endif #endif
ungetc (c, yyin); ungetc (c, yyin);
} }
@@ -286,6 +291,9 @@ AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
# ------------------------------------------------------------ # ------------------------------------------------------------
# Run `calc' on INPUT, and expect a `parse error' message. # Run `calc' on INPUT, and expect a `parse error' message.
# #
# If INPUT starts with a slash, it is used as absolute input file name,
# otherwise as contents.
#
# If BISON-OPTIONS contains `--location', then make sure the ERROR-LOCATION # If BISON-OPTIONS contains `--location', then make sure the ERROR-LOCATION
# is correctly output on stderr. # is correctly output on stderr.
# #
@@ -296,11 +304,12 @@ AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
# If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number # If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number
# of expected lines on stderr. # of expected lines on stderr.
m4_define([_AT_CHECK_CALC_ERROR], m4_define([_AT_CHECK_CALC_ERROR],
[AT_DATA([[input]], [m4_bmatch([$2], [^/],
[AT_CHECK([calc $2], 0, [], [stderr])],
[AT_DATA([[input]],
[[$2 [[$2
]]) ]])
AT_CHECK([calc input], 0, [], [stderr])])
AT_CHECK([calc input], 0, [], [stderr])
AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
@@ -362,27 +371,33 @@ _AT_CHECK_CALC([$1],
1 - (2 - 3) = 2 1 - (2 - 3) = 2
2^2^3 = 256 2^2^3 = 256
(2^2)^3 = 64], [491]) (2^2)^3 = 64], [488])
# Some parse errors. # Some parse errors.
_AT_CHECK_CALC_ERROR([$1], [+1], [8], _AT_CHECK_CALC_ERROR([$1], [0 0], [10],
[1.0:1.1],
[unexpected '+'])
_AT_CHECK_CALC_ERROR([$1], [1//2], [17],
[1.2:1.3], [1.2:1.3],
[unexpected '/', expecting NUM or '-' or '(']) [unexpected "number"])
_AT_CHECK_CALC_ERROR([$1], [error], [8], _AT_CHECK_CALC_ERROR([$1], [1//2], [13],
[1.2:1.3],
[unexpected '/', expecting "number" or '-' or '('])
_AT_CHECK_CALC_ERROR([$1], [error], [4],
[1.0:1.1], [1.0:1.1],
[unexpected $undefined.]) [unexpected $undefined., expecting "number" or '-' or '\n' or '('])
_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [23], _AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [19],
[1.6:1.7], [1.6:1.7],
[unexpected '=']) [unexpected '='])
_AT_CHECK_CALC_ERROR([$1], _AT_CHECK_CALC_ERROR([$1],
[ [
+1], +1],
[16], [13],
[2.0:2.1], [2.0:2.1],
[unexpected '+']) [unexpected '+'])
# Exercise error messages with EOF: work on an empty file.
_AT_CHECK_CALC_ERROR([$1],
[/dev/null],
[4],
[1.0:1.1],
[unexpected "end of file", expecting "number" or '-' or '\n' or '('])
AT_CLEANUP AT_CLEANUP
])# AT_CHECK_CALC ])# AT_CHECK_CALC

8
tests/regression.at
View File

@@ -73,7 +73,7 @@ Grammar
Terminals, with rules where they appear Terminals, with rules where they appear
$ (-1) $ (0)
error (256) error (256)
NUM (257) 2 NUM (257) 2
OP (258) 1 OP (258) 1
@@ -177,7 +177,7 @@ Grammar
Terminals, with rules where they appear Terminals, with rules where they appear
$ (-1) $ (0)
error (256) error (256)
NUM (257) 2 NUM (257) 2
OP (258) 1 OP (258) 1
@@ -304,7 +304,7 @@ AT_CHECK([cat input.output], [],
Terminals, with rules where they appear Terminals, with rules where they appear
$ (-1) $ (0)
'a' (97) 2 'a' (97) 2
'b' (98) 2 'b' (98) 2
'c' (99) 4 'c' (99) 4
@@ -652,7 +652,7 @@ AT_CHECK([sed -n 's/ *$//;/^$/!p' input.output], 0,
4 15 @1 -> /* empty */ 4 15 @1 -> /* empty */
5 15 CONST_DEC -> @1 undef_id_tok '=' const_id_tok ';' 5 15 CONST_DEC -> @1 undef_id_tok '=' const_id_tok ';'
Terminals, with rules where they appear Terminals, with rules where they appear
$ (-1) $ (0)
';' (59) 5 ';' (59) 5
'=' (61) 5 '=' (61) 5
error (256) error (256)