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

warnings: address -Wnull-dereference in reader.c

Browse Source 
Based on a patch by David Michael.
http://lists.gnu.org/archive/html/bison-patches/2018-07/msg00000.html

* src/reader.c (find_start): New, extracted from...
(check_and_convert_grammar): here.
This commit is contained in:
Akim Demaille
2018-08-05 16:29:00 +02:00
parent c699078246
commit 3df32101e7
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
THANKS
View File

@@ -39,6 +39,7 @@ Daniel Galloway dg1751@att.com
Daniel Hagerty hag@gnu.org Daniel Hagerty hag@gnu.org
David J. MacKenzie djm@gnu.org David J. MacKenzie djm@gnu.org
David Kastrup dak@gnu.org David Kastrup dak@gnu.org
David Michael fedora.dm0@gmail.com
Dennis Clarke dclarke@blastwave.org Dennis Clarke dclarke@blastwave.org
Derek Clegg derek@me.com Derek Clegg derek@me.com
Derek M. Jones derek@knosof.co.uk Derek M. Jones derek@knosof.co.uk

35
src/reader.c
View File

@@ -709,6 +709,26 @@ prepare_percent_define_front_end_variables (void)
} }
} }
/* Find the first LHS which is not a dummy. */
static symbol *
find_start_symbol ()
{
symbol_list *res = grammar;
for (;
res != NULL && symbol_is_dummy (res->content.sym);
res = res->next)
{
for (res = res->next;
res != NULL && res->content.sym != NULL;
res = res->next)
continue;
aver (res != NULL);
}
aver (res != NULL);
return res->content.sym;
}
/*-------------------------------------------------------------. /*-------------------------------------------------------------.
| Check the grammar that has just been read, and convert it to | | Check the grammar that has just been read, and convert it to |
@@ -738,19 +758,8 @@ check_and_convert_grammar (void)
/* Find the start symbol if no %start. */ /* Find the start symbol if no %start. */
if (!start_flag) if (!start_flag)
{ {
symbol_list *node; symbol *start = find_start_symbol ();
for (node = grammar; grammar_start_symbol_set (start, start->location);
node != NULL && symbol_is_dummy (node->content.sym);
node = node->next)
{
for (node = node->next;
node != NULL && node->content.sym != NULL;
node = node->next)
continue;
}
aver (node != NULL);
grammar_start_symbol_set (node->content.sym,
node->content.sym->location);
} }
/* Insert the initial rule, whose line is that of the first rule /* Insert the initial rule, whose line is that of the first rule