[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
cex: style: prefer res for returned value
From: |
Akim Demaille |
Subject: |
cex: style: prefer res for returned value |
Date: |
Sun, 17 May 2020 17:49:00 +0200 |
commit 55892c2b8bb32597b2def776e27efc984923f760
Author: Akim Demaille <address@hidden>
Date: Sun May 17 17:47:21 2020 +0200
cex: style: prefer res for returned value
* src/lssi.c, src/parse-simulation.c: here.
diff --git a/src/lssi.c b/src/lssi.c
index 9a925311..95261b3f 100644
--- a/src/lssi.c
+++ b/src/lssi.c
@@ -41,12 +41,12 @@ typedef struct lssi
lssi *
new_lssi (state_item_number si, lssi *p, bitset l, bool free_l)
{
- lssi *ret = xmalloc (sizeof (lssi));
- ret->si = si;
- ret->parent = p;
- ret->lookahead = l;
- ret->free_lookahead = free_l;
- return ret;
+ lssi *res = xmalloc (sizeof *res);
+ res->si = si;
+ res->parent = p;
+ res->lookahead = l;
+ res->free_lookahead = free_l;
+ return res;
}
void
@@ -240,10 +240,10 @@ shortest_path_from_start (state_item_number target,
symbol_number next_sym)
fputs ("Cannot find shortest path to conflict state.", stderr);
exit (1);
}
- gl_list_t ret =
+ gl_list_t res =
gl_list_create_empty (GL_LINKED_LIST, NULL, NULL, NULL, true);
for (lssi *sn = n; sn != NULL; sn = sn->parent)
- gl_list_add_first (ret, state_items + sn->si);
+ gl_list_add_first (res, state_items + sn->si);
hash_free (visited);
gl_list_free (queue);
@@ -251,12 +251,12 @@ shortest_path_from_start (state_item_number target,
symbol_number next_sym)
if (trace_flag & trace_cex)
{
puts ("REDUCE ITEM PATH:");
- gl_list_iterator_t it = gl_list_iterator (ret);
+ gl_list_iterator_t it = gl_list_iterator (res);
const void *sip;
while (gl_list_iterator_next (&it, &sip, NULL))
print_state_item ((state_item *) sip, stdout);
}
- return ret;
+ return res;
}
/**
diff --git a/src/parse-simulation.c b/src/parse-simulation.c
index 642ae1e3..5420e44e 100644
--- a/src/parse-simulation.c
+++ b/src/parse-simulation.c
@@ -86,40 +86,40 @@ static int frees = 0;
static parse_state *
empty_parse_state (void)
{
- parse_state *ret = xcalloc (1, sizeof (parse_state));
- ret->state_items.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
+ parse_state *res = xcalloc (1, sizeof (parse_state));
+ res->state_items.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
NULL, NULL, true);
- ret->derivs.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
+ res->derivs.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
NULL, NULL, true);
++allocs;
- return ret;
+ return res;
}
parse_state *
new_parse_state (const state_item *si)
{
- parse_state *ret = empty_parse_state ();
- ps_chunk_append (&ret->state_items, si);
- ps_chunk_append (&ret->derivs, derivation_dot ());
- return ret;
+ parse_state *res = empty_parse_state ();
+ ps_chunk_append (&res->state_items, si);
+ ps_chunk_append (&res->derivs, derivation_dot ());
+ return res;
}
static parse_state *
copy_parse_state (bool prepend, parse_state *parent)
{
- parse_state *ret = xmalloc (sizeof (parse_state));
- memcpy (ret, parent, sizeof (parse_state));
- ret->state_items.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
+ parse_state *res = xmalloc (sizeof (parse_state));
+ memcpy (res, parent, sizeof (parse_state));
+ res->state_items.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
NULL, NULL, true);
- ret->derivs.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
+ res->derivs.contents = gl_list_create_empty (GL_LINKED_LIST, NULL,
NULL, NULL, true);
- ret->parent = parent;
- ret->prepend = prepend;
- ret->reference_count = 0;
- ret->free_contents_early = false;
+ res->parent = parent;
+ res->prepend = prepend;
+ res->reference_count = 0;
+ res->free_contents_early = false;
parse_state_retain (parent);
++allocs;
- return ret;
+ return res;
}
bool
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- cex: style: prefer res for returned value,
Akim Demaille <=