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

cex: more consistent memory allocation/copy

Browse Source 
* src/counterexample.c, src/parse-simulation.c: It is more usual in
Bison to use sizeof on expressions than on types, especially for
allocation.
Let the compiler do it's job instead of calling memcpy ourselves.
This commit is contained in:
Akim Demaille
2020-07-12 14:46:45 +02:00
parent 5bad15d7ea
commit d7f27477f4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/counterexample.c
View File

@@ -84,7 +84,7 @@ static counterexample *
new_counterexample (derivation *d1, derivation *d2,
bool u, bool t)
{
counterexample *res = xmalloc (sizeof (counterexample));
counterexample *res = xmalloc (sizeof *res);
res->d1 = d1;
res->d2 = d2;
res->unifying = u;
@@ -144,7 +144,7 @@ typedef struct si_bfs_node
static si_bfs_node *
si_bfs_new (state_item_number si, si_bfs_node *parent)
{
si_bfs_node *res = xcalloc (1, sizeof (si_bfs_node));
si_bfs_node *res = xcalloc (1, sizeof *res);
res->si = si;
res->parent = parent;
res->reference_count = 1;
@@ -528,7 +528,7 @@ typedef struct
static search_state *
initial_search_state (state_item *conflict1, state_item *conflict2)
{
search_state *res = xmalloc (sizeof (search_state));
search_state *res = xmalloc (sizeof *res);
res->states[0] = new_parse_state (conflict1);
res->states[1] = new_parse_state (conflict2);
parse_state_retain (res->states[0]);
@@ -540,7 +540,7 @@ initial_search_state (state_item *conflict1, state_item *conflict2)
static search_state *
new_search_state (parse_state *ps1, parse_state *ps2, int complexity)
{
search_state *res = xmalloc (sizeof (search_state));
search_state *res = xmalloc (sizeof *res);
res->states[0] = ps1;
res->states[1] = ps2;
parse_state_retain (res->states[0]);
@@ -552,8 +552,8 @@ new_search_state (parse_state *ps1, parse_state *ps2, int complexity)
static search_state *
copy_search_state (search_state *parent)
{
search_state *res = xmalloc (sizeof (search_state));
memcpy (res, parent, sizeof (search_state));
search_state *res = xmalloc (sizeof *res);
*res = *parent;
parse_state_retain (res->states[0]);
parse_state_retain (res->states[1]);
return res;
@@ -709,7 +709,7 @@ ssb_append (search_state *ss)
parse_state_free_contents_early (ss->states[1]);
parse_state_retain (ss->states[0]);
parse_state_retain (ss->states[1]);
search_state_bundle *ssb = xmalloc (sizeof (search_state_bundle));
search_state_bundle *ssb = xmalloc (sizeof *ssb);
ssb->complexity = ss->complexity;
gl_list_node_t n = gl_list_search (ssb_queue, ssb);
if (!n)
@@ -1295,7 +1295,7 @@ counterexample_report_state (const state *s, FILE *out, const char *prefix)
{
item_number conf = *state_items[j].item;
if (item_number_is_symbol_number (conf)
&& bitset_test (reds->lookahead_tokens[i], conf))
&& bitset_test (reds->lookahead_tokens[i], conf))
counterexample_report_shift_reduce (c1, j, conf, out, prefix);
}
for (int j = i+1; j < reds->num; ++j)

2
src/parse-simulation.c
View File

@@ -135,7 +135,7 @@ static parse_state *
copy_parse_state (bool prepend, parse_state *parent)
{
parse_state *res = xmalloc (sizeof *res);
memcpy (res, parent, sizeof *res);
*res = *parent;
res->state_items.contents
= gl_list_create_empty (GL_LINKED_LIST, NULL, NULL, NULL, true);
res->derivs.contents = derivation_list_new ();