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

Port to GCC 2.95. First two problems reported by Michael Deutschmann in

Browse Source 
<http://lists.gnu.org/archive/html/bug-bison/2006-09/msg00018.html>.

* src/parse-gram.y (symbol_declaration): Don't put statements
before declarations; it's not portable to C89.
* src/scan-code.l (handle_action_at): Likewise.

* src/scan-code.l: Always initialize braces_level; the old code
left it uninitialized and therefore had undefined behavior.

Don't attempt to redefine 'assert', since it runs afoul of
systems where standard headers (mistakenly) include <assert.h>.
Instead, define and use our own alternative, called 'aver'.
* src/reader.c: Don't include assert.h, since we no longer
use assert.
* src/scan-code.l: Likewise.
* src/system.h (assert): Remove, replacing with....
(aver): New function, taking a bool arg.  All uses changed.
* src/tables.c (pack_vector): Ensure that aver arg is bool,
not merely an integer.
This commit is contained in:
Paul Eggert
2006-09-15 16:34:48 +00:00
parent 3fa3725adb
commit 4f82b42a9d
13 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/reader.c
View File

@@ -22,7 +22,6 @@
#include <config.h>
#include "system.h"
#include <assert.h>
#include <quotearg.h>
@@ -148,7 +147,7 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
merge_function != NULL && merger_find != merger;
merge_function = merge_function->next)
merger_find += 1;
assert (merge_function != NULL && merger_find == merger);
aver (merge_function != NULL && merger_find == merger);
if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
{
complain_at (declaration_loc,
@@ -515,15 +514,15 @@ packgram (void)
}
/* An item ends by the rule number (negated). */
ritem[itemno++] = rule_number_as_item_number (ruleno);
assert (itemno < ITEM_NUMBER_MAX);
aver (itemno < ITEM_NUMBER_MAX);
++ruleno;
assert (ruleno < RULE_NUMBER_MAX);
aver (ruleno < RULE_NUMBER_MAX);
if (p)
p = p->next;
}
assert (itemno == nritems);
aver (itemno == nritems);
if (trace_flag & trace_sets)
ritem_print (stderr);
@@ -614,7 +613,7 @@ check_and_convert_grammar (void)
node = node->next)
;
}
assert (node != NULL);
aver (node != NULL);
grammar_start_symbol_set (node->content.sym,
node->content.sym->location);
}
@@ -635,7 +634,7 @@ check_and_convert_grammar (void)
grammar = p;
}
assert (nsyms <= SYMBOL_NUMBER_MAXIMUM && nsyms == ntokens + nvars);
aver (nsyms <= SYMBOL_NUMBER_MAXIMUM && nsyms == ntokens + nvars);
/* Assign the symbols their symbol numbers. Write #defines for the
token symbols into FDEFINES if requested. */