diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-07-31 11:50:18 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-07-31 12:03:55 +0200 |
| commit | cb9ec4fada480554cf47810fee736997d64e7427 (patch) | |
| tree | 9f36a0c5ee15ad02df0bf70f1ef30d6471181341 /src/conflicts.c | |
| parent | 84271837f686cc9bdf2d7483d4493f26b52d133d (diff) | |
| parent | aaf63e45b65d35bb506e431ffa8360f259ee393c (diff) | |
| download | bison-cb9ec4fada480554cf47810fee736997d64e7427.tar.gz | |
Merge branch 'maint'
* maint:
use obstack_printf
scanner: restore a missing start condition
gnulib: update
maint: post-release administrivia
version 2.6.1
gnulib: update
maint: fix some syntax-check issues
tests: do not depend on __cplusplus to decide for C++ or C output
Conflicts:
NEWS
bootstrap.conf
cfg.mk
lib/.gitignore
Diffstat (limited to 'src/conflicts.c')
| -rw-r--r-- | src/conflicts.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/conflicts.c b/src/conflicts.c index ccd50ebf..dad65683 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -73,7 +73,7 @@ log_resolution (rule *r, symbol_number token, { case shift_resolution: case right_resolution: - obstack_fgrow2 (&solved_conflicts_obstack, + obstack_printf (&solved_conflicts_obstack, _(" Conflict between rule %d and token %s" " resolved as shift"), r->number, @@ -82,7 +82,7 @@ log_resolution (rule *r, symbol_number token, case reduce_resolution: case left_resolution: - obstack_fgrow2 (&solved_conflicts_obstack, + obstack_printf (&solved_conflicts_obstack, _(" Conflict between rule %d and token %s" " resolved as reduce"), r->number, @@ -90,7 +90,7 @@ log_resolution (rule *r, symbol_number token, break; case nonassoc_resolution: - obstack_fgrow2 (&solved_conflicts_obstack, + obstack_printf (&solved_conflicts_obstack, _(" Conflict between rule %d and token %s" " resolved as an error"), r->number, @@ -102,33 +102,33 @@ log_resolution (rule *r, symbol_number token, switch (resolution) { case shift_resolution: - obstack_fgrow2 (&solved_conflicts_obstack, + obstack_printf (&solved_conflicts_obstack, " (%s < %s)", r->prec->tag, symbols[token]->tag); break; case reduce_resolution: - obstack_fgrow2 (&solved_conflicts_obstack, + obstack_printf (&solved_conflicts_obstack, " (%s < %s)", symbols[token]->tag, r->prec->tag); break; case left_resolution: - obstack_fgrow1 (&solved_conflicts_obstack, + obstack_printf (&solved_conflicts_obstack, " (%%left %s)", symbols[token]->tag); break; case right_resolution: - obstack_fgrow1 (&solved_conflicts_obstack, + obstack_printf (&solved_conflicts_obstack, " (%%right %s)", symbols[token]->tag); break; case nonassoc_resolution: - obstack_fgrow1 (&solved_conflicts_obstack, + obstack_printf (&solved_conflicts_obstack, " (%%nonassoc %s)", symbols[token]->tag); break; @@ -145,7 +145,7 @@ log_resolution (rule *r, symbol_number token, { case shift_resolution: case right_resolution: - obstack_fgrow2 (&solved_conflicts_xml_obstack, + obstack_printf (&solved_conflicts_xml_obstack, " <resolution rule=\"%d\" symbol=\"%s\"" " type=\"shift\">", r->number, @@ -154,7 +154,7 @@ log_resolution (rule *r, symbol_number token, case reduce_resolution: case left_resolution: - obstack_fgrow2 (&solved_conflicts_xml_obstack, + obstack_printf (&solved_conflicts_xml_obstack, " <resolution rule=\"%d\" symbol=\"%s\"" " type=\"reduce\">", r->number, @@ -162,7 +162,7 @@ log_resolution (rule *r, symbol_number token, break; case nonassoc_resolution: - obstack_fgrow2 (&solved_conflicts_xml_obstack, + obstack_printf (&solved_conflicts_xml_obstack, " <resolution rule=\"%d\" symbol=\"%s\"" " type=\"error\">", r->number, @@ -174,33 +174,33 @@ log_resolution (rule *r, symbol_number token, switch (resolution) { case shift_resolution: - obstack_fgrow2 (&solved_conflicts_xml_obstack, + obstack_printf (&solved_conflicts_xml_obstack, "%s < %s", xml_escape_n (0, r->prec->tag), xml_escape_n (1, symbols[token]->tag)); break; case reduce_resolution: - obstack_fgrow2 (&solved_conflicts_xml_obstack, + obstack_printf (&solved_conflicts_xml_obstack, "%s < %s", xml_escape_n (0, symbols[token]->tag), xml_escape_n (1, r->prec->tag)); break; case left_resolution: - obstack_fgrow1 (&solved_conflicts_xml_obstack, + obstack_printf (&solved_conflicts_xml_obstack, "%%left %s", xml_escape (symbols[token]->tag)); break; case right_resolution: - obstack_fgrow1 (&solved_conflicts_xml_obstack, + obstack_printf (&solved_conflicts_xml_obstack, "%%right %s", xml_escape (symbols[token]->tag)); break; case nonassoc_resolution: - obstack_fgrow1 (&solved_conflicts_xml_obstack, + obstack_printf (&solved_conflicts_xml_obstack, "%%nonassoc %s", xml_escape (symbols[token]->tag)); break; |