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

cex: fix reporting of null nonterminals

Browse Source 
I implemented this to print A ::= [ ], but A ::= [ %empty ] might be
clearer.

* src/parse-simulation.c (nullable_closure): Don't generate null
nonterminal derivations as leaves.
* src/derivation.c (derivation_print_impl): Don't print seperator
spaces for null nonterminal.
* tests/counterexample.at: Update test results.
This commit is contained in:
Vincent Imbimbo
2020-06-21 16:20:45 -04:00
committed by Akim Demaille
parent 3dd8f2305a
commit 69e3b405d9
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/derivation.c
View File

@@ -126,11 +126,12 @@ derivation_size (const derivation *deriv)
return size;
}
/* Print DERIV, colored according to COUNTER. */
static void
/* Print DERIV, colored according to COUNTER.
Return false if nothing is printed. */
static bool
derivation_print_impl (const derivation *deriv, FILE *f,
bool leaves_only,
int *counter)
int *counter, const char *prefix)
{
if (deriv->children)
{
@@ -142,41 +143,54 @@ derivation_print_impl (const derivation *deriv, FILE *f,
if (!leaves_only)
{
fputs (prefix, f);
begin_use_class ("cex-step", f);
fprintf (f, "%s ::=[ ", sym->tag);
end_use_class ("cex-step", f);
prefix = "";
}
const char *sep = "";
bool res = false;
derivation *child;
for (gl_list_iterator_t it = gl_list_iterator (deriv->children);
derivation_list_next (&it, &child);
)
{
fputs (sep, f);
sep = " ";
derivation_print_impl (child, f, leaves_only, counter);
if (derivation_print_impl (child, f, leaves_only, counter, prefix))
{
prefix = " ";
res = true;
}
else if (!leaves_only)
prefix = " ";
}
if (!leaves_only)
{
begin_use_class ("cex-step", f);
fputs (" ]", f);
if (res)
fputs (" ]", f);
else
fputs ("]", f);
end_use_class ("cex-step", f);
}
end_use_class (style, f);
return res;
}
else if (deriv == &d_dot)
{
fputs (prefix, f);
begin_use_class ("cex-dot", f);
print_dot (f);
end_use_class ("cex-dot", f);
}
else // leaf.
{
fputs (prefix, f);
const symbol *sym = symbols[deriv->sym];
begin_use_class ("cex-leaf", f);
fprintf (f, "%s", sym->tag);
end_use_class ("cex-leaf", f);
}
return true;
}
void
@@ -184,7 +198,7 @@ derivation_print (const derivation *deriv, FILE *out, const char *prefix)
{
int counter = 0;
fputs (prefix, out);
derivation_print_impl (deriv, out, false, &counter);
derivation_print_impl (deriv, out, false, &counter, "");
fputc ('\n', out);
}
@@ -194,6 +208,6 @@ derivation_print_leaves (const derivation *deriv, FILE *out, const char *prefix)
{
int counter = 0;
fputs (prefix, out);
derivation_print_impl (deriv, out, true, &counter);
derivation_print_impl (deriv, out, true, &counter, "");
fputc ('\n', out);
}

2
src/parse-simulation.c
View File

@@ -426,7 +426,7 @@ nullable_closure (parse_state *ps, state_item *si, parse_state_list state_list)
state_item *nsi = state_items + sin;
current_ps = copy_parse_state (false, current_ps);
ps_si_append (current_ps, nsi);
ps_derivs_append (current_ps, derivation_new_leaf (sp));
ps_derivs_append (current_ps, derivation_new (sp, derivation_list_new ()));
parse_state_list_append (state_list, current_ps);
}
}