From: Akim Demaille Date: Tue, 31 Jul 2012 09:50:18 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v2.7.90~368 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/cb9ec4fada480554cf47810fee736997d64e7427?hp=84271837f686cc9bdf2d7483d4493f26b52d133d 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 --- diff --git a/.prev-version b/.prev-version index 5154b3f6..6a6a3d8e 100644 --- a/.prev-version +++ b/.prev-version @@ -1 +1 @@ -2.6 +2.6.1 diff --git a/NEWS b/NEWS index fa1b948f..bd47608b 100644 --- a/NEWS +++ b/NEWS @@ -141,6 +141,9 @@ GNU Bison NEWS * Noteworthy changes in release ?.? (????-??-??) [?] + +* Noteworthy changes in release 2.6.1 (2012-07-30) [stable] + Bison no longer executes user-specified M4 code when processing a grammar. ** Future Changes diff --git a/bootstrap.conf b/bootstrap.conf index 486268d7..e90cf12d 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -24,7 +24,10 @@ gnulib_modules=' gettext git-version-gen gitlog-to-changelog gpl-3.0 hash inttypes isnan javacomp-script javaexec-script ldexpl malloc-gnu - mbswidth obstack perror progname + mbswidth + obstack + obstack-printf + perror progname quote quotearg readme-release realloc-posix diff --git a/cfg.mk b/cfg.mk index f1caf313..af1e09e8 100644 --- a/cfg.mk +++ b/cfg.mk @@ -59,12 +59,14 @@ exclude = \ $(call exclude, \ bindtextdomain=^lib/main.c$$ \ program_name=^lib/main.c$$ \ - prohibit_always-defined_macros=^data/yacc.c|^djgpp/ \ + prohibit_always-defined_macros=^data/yacc.c$$|^djgpp/ \ prohibit_always-defined_macros+=?|^lib/timevar.c$$ \ prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$ \ prohibit_always-defined_macros+=?|^tests/regression.at$$ \ prohibit_defined_have_decl_tests=?|^lib/timevar.c$$ \ prohibit_empty_lines_at_EOF=^src/parse-gram.h$$ \ + prohibit_magic_number_exit=^doc/bison.texi$$ \ + prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$ \ prohibit_strcmp=^doc/bison\.texi$$ \ require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$ \ space_tab=^tests/(input|c\+\+)\.at$$ \ diff --git a/gnulib b/gnulib index dbd91449..678815ea 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit dbd914496c99c52220e5f5ba4121d6cb55fb3beb +Subproject commit 678815ea7c4d95e04a0fa6d3b491b3c872c677a7 diff --git a/lib/.gitignore b/lib/.gitignore index 8e0e2096..a448e841 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -35,6 +35,8 @@ /close.c /closeout.c /closeout.h +/concat-filename.c +/concat-filename.h /config.charset /config.h /config.in.h @@ -62,6 +64,7 @@ /fd-hook.h /fd-safer-flag.c /fd-safer.c +/filename.h /float+.h /float.c /float.h @@ -123,6 +126,7 @@ /nonblocking.h /obstack.c /obstack.h +/obstack_printf.c /open.c /pathmax.h /perror.c @@ -223,6 +227,7 @@ /sys_socket.in.h /sys_stat.h /sys_stat.in.h +/sys_types.in.h /sys_wait.h /sys_wait.in.h /sysexits.in.h @@ -259,14 +264,10 @@ /xalloc-die.c /xalloc-oversized.h /xalloc.h +/xconcat-filename.c /xmalloc.c +/xmemdup0.c +/xmemdup0.h /xsize.h /xstrndup.c /xstrndup.h -/xmemdup0.c -/xmemdup0.h -/sys_types.in.h -/concat-filename.c -/concat-filename.h -/filename.h -/xconcat-filename.c diff --git a/m4/.gitignore b/m4/.gitignore index 875400a9..c6a84ce8 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -181,3 +181,4 @@ /xalloc.m4 /xsize.m4 /xstrndup.m4 +/obstack-printf.m4 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, " ", 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, " ", 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, " ", 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; diff --git a/src/muscle-tab.c b/src/muscle-tab.c index 1168a9c3..bb54bed7 100644 --- a/src/muscle-tab.c +++ b/src/muscle-tab.c @@ -177,7 +177,7 @@ static void muscle_syncline_grow (char const *key, location loc) { char *extension = NULL; - obstack_fgrow1 (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line); + obstack_printf (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line); obstack_quote (&muscle_obstack, quotearg_style (c_quoting_style, loc.start.file)); obstack_sgrow (&muscle_obstack, ")["); @@ -269,9 +269,9 @@ muscle_boundary_grow (char const *key, boundary bound) obstack_sgrow (&muscle_obstack, "[["); obstack_escape (&muscle_obstack, bound.file); obstack_1grow (&muscle_obstack, ':'); - obstack_fgrow1 (&muscle_obstack, "%d", bound.line); + obstack_printf (&muscle_obstack, "%d", bound.line); obstack_1grow (&muscle_obstack, '.'); - obstack_fgrow1 (&muscle_obstack, "%d", bound.column); + obstack_printf (&muscle_obstack, "%d", bound.column); obstack_sgrow (&muscle_obstack, "]]"); obstack_1grow (&muscle_obstack, '\0'); extension = obstack_finish (&muscle_obstack); diff --git a/src/muscle-tab.h b/src/muscle-tab.h index 1f33f8c1..ac852978 100644 --- a/src/muscle-tab.h +++ b/src/muscle-tab.h @@ -42,14 +42,14 @@ extern struct obstack muscle_obstack; #define MUSCLE_INSERT_INT(Key, Value) \ do { \ - obstack_fgrow1 (&muscle_obstack, "%d", Value); \ + obstack_printf (&muscle_obstack, "%d", Value); \ obstack_1grow (&muscle_obstack, 0); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \ } while (0) #define MUSCLE_INSERT_LONG_INT(Key, Value) \ do { \ - obstack_fgrow1 (&muscle_obstack, "%ld", Value); \ + obstack_printf (&muscle_obstack, "%ld", Value); \ obstack_1grow (&muscle_obstack, 0); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \ } while (0) diff --git a/src/output.c b/src/output.c index c227be22..24bb83cd 100644 --- a/src/output.c +++ b/src/output.c @@ -69,7 +69,7 @@ Name (char const *name, \ int i; \ int j = 1; \ \ - obstack_fgrow1 (&format_obstack, "%6d", first); \ + obstack_printf (&format_obstack, "%6d", first); \ for (i = begin; i < end; ++i) \ { \ obstack_1grow (&format_obstack, ','); \ @@ -80,7 +80,7 @@ Name (char const *name, \ } \ else \ ++j; \ - obstack_fgrow1 (&format_obstack, "%6d", table_data[i]); \ + obstack_printf (&format_obstack, "%6d", table_data[i]); \ if (table_data[i] < min) \ min = table_data[i]; \ if (max < table_data[i]) \ @@ -92,10 +92,10 @@ Name (char const *name, \ lmin = min; \ lmax = max; \ /* Build `NAME_min' and `NAME_max' in the obstack. */ \ - obstack_fgrow1 (&format_obstack, "%s_min", name); \ + obstack_printf (&format_obstack, "%s_min", name); \ obstack_1grow (&format_obstack, 0); \ MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), lmin); \ - obstack_fgrow1 (&format_obstack, "%s_max", name); \ + obstack_printf (&format_obstack, "%s_max", name); \ obstack_1grow (&format_obstack, 0); \ MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), lmax); \ } @@ -410,13 +410,13 @@ prepare_symbol_definitions (void) const char *value; #define SET_KEY(Entry) \ - obstack_fgrow2 (&format_obstack, "symbol(%d, %s)", \ + obstack_printf (&format_obstack, "symbol(%d, %s)", \ i, Entry); \ obstack_1grow (&format_obstack, 0); \ key = obstack_finish (&format_obstack); #define SET_KEY2(Entry, Suffix) \ - obstack_fgrow3 (&format_obstack, "symbol(%d, %s_%s)", \ + obstack_printf (&format_obstack, "symbol(%d, %s_%s)", \ i, Entry, Suffix); \ obstack_1grow (&format_obstack, 0); \ key = obstack_finish (&format_obstack); diff --git a/src/print_graph.c b/src/print_graph.c index 61d36512..d37afb2c 100644 --- a/src/print_graph.c +++ b/src/print_graph.c @@ -54,7 +54,7 @@ print_core (struct obstack *oout, state *s) snritems = nitemset; } - obstack_fgrow1 (oout, "%d", s->number); + obstack_printf (oout, "%d", s->number); for (i = 0; i < snritems; i++) { item_number *sp; @@ -68,15 +68,15 @@ print_core (struct obstack *oout, state *s) r = item_number_as_rule_number (*sp); - obstack_fgrow1 (oout, "\n%s -> ", rules[r].lhs->tag); + obstack_printf (oout, "\n%s -> ", rules[r].lhs->tag); for (sp = rules[r].rhs; sp < sp1; sp++) - obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag); + obstack_printf (oout, "%s ", symbols[*sp]->tag); obstack_1grow (oout, '.'); for (/* Nothing */; *sp >= 0; ++sp) - obstack_fgrow1 (oout, " %s", symbols[*sp]->tag); + obstack_printf (oout, " %s", symbols[*sp]->tag); /* Experimental feature: display the lookahead tokens. */ if (report_flag & report_lookahead_tokens @@ -95,7 +95,7 @@ print_core (struct obstack *oout, state *s) obstack_sgrow (oout, "["); BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0) { - obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag); + obstack_printf (oout, "%s%s", sep, symbols[k]->tag); sep = ", "; } obstack_sgrow (oout, "]"); diff --git a/src/scan-code.l b/src/scan-code.l index 2fe880ed..83501475 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -435,30 +435,30 @@ show_sub_messages (const char* cp, bool explicit_bracketing, /* Create the explanation message. */ obstack_init (&msg_buf); - obstack_fgrow1 (&msg_buf, _("possibly meant: %c"), dollar_or_at); + obstack_printf (&msg_buf, _("possibly meant: %c"), dollar_or_at); if (contains_dot_or_dash (id)) - obstack_fgrow1 (&msg_buf, "[%s]", id); + obstack_printf (&msg_buf, "[%s]", id); else obstack_sgrow (&msg_buf, id); obstack_sgrow (&msg_buf, tail); if (var->err & VARIANT_HIDDEN) { - obstack_fgrow1 (&msg_buf, _(", hiding %c"), dollar_or_at); + obstack_printf (&msg_buf, _(", hiding %c"), dollar_or_at); if (contains_dot_or_dash (var->id)) - obstack_fgrow1 (&msg_buf, "[%s]", var->id); + obstack_printf (&msg_buf, "[%s]", var->id); else obstack_sgrow (&msg_buf, var->id); obstack_sgrow (&msg_buf, tail); } - obstack_fgrow1 (&msg_buf, _(" at %s"), at_spec); + obstack_printf (&msg_buf, _(" at %s"), at_spec); if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE) { const char *format = _(", cannot be accessed from mid-rule action at $%d"); - obstack_fgrow1 (&msg_buf, format, midrule_rhs_index); + obstack_printf (&msg_buf, format, midrule_rhs_index); } obstack_1grow (&msg_buf, '\0'); @@ -784,7 +784,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) untyped_var_seen = true; } - obstack_fgrow2 (&obstack_for_string, + obstack_printf (&obstack_for_string, "]b4_rhs_value(%d, %d, ", effective_rule_length, n); obstack_quote (&obstack_for_string, type_name); obstack_sgrow (&obstack_for_string, ")["); @@ -834,7 +834,7 @@ handle_action_at (symbol_list *rule, char *text, location at_loc) break; default: - obstack_fgrow2 (&obstack_for_string, "]b4_rhs_location(%d, %d)[", + obstack_printf (&obstack_for_string, "]b4_rhs_location(%d, %d)[", effective_rule_length, n); break; } diff --git a/src/scan-skel.l b/src/scan-skel.l index b79e5832..32bfe737 100644 --- a/src/scan-skel.l +++ b/src/scan-skel.l @@ -91,7 +91,7 @@ static void fail_for_invalid_at (char const *at); \n out_lineno++; ECHO; [^@\n]+ ECHO; -<> { +<> { if (outname) { free (outname); diff --git a/src/system.h b/src/system.h index 1d0af8fa..a56c058a 100644 --- a/src/system.h +++ b/src/system.h @@ -176,35 +176,6 @@ typedef size_t uintptr_t; #define obstack_sgrow(Obs, Str) \ obstack_grow (Obs, Str, strlen (Str)) -#define obstack_fgrow1(Obs, Format, Arg1) \ - do { \ - char buf[4096]; \ - sprintf (buf, Format, Arg1); \ - obstack_grow (Obs, buf, strlen (buf)); \ - } while (0) - -#define obstack_fgrow2(Obs, Format, Arg1, Arg2) \ - do { \ - char buf[4096]; \ - sprintf (buf, Format, Arg1, Arg2); \ - obstack_grow (Obs, buf, strlen (buf)); \ - } while (0) - -#define obstack_fgrow3(Obs, Format, Arg1, Arg2, Arg3) \ - do { \ - char buf[4096]; \ - sprintf (buf, Format, Arg1, Arg2, Arg3); \ - obstack_grow (Obs, buf, strlen (buf)); \ - } while (0) - -#define obstack_fgrow4(Obs, Format, Arg1, Arg2, Arg3, Arg4) \ - do { \ - char buf[4096]; \ - sprintf (buf, Format, Arg1, Arg2, Arg3, Arg4); \ - obstack_grow (Obs, buf, strlen (buf)); \ - } while (0) - - /* Output Str escaped for our postprocessing (i.e., escape M4 special characters). diff --git a/tests/actions.at b/tests/actions.at index 16711ddd..269bcce5 100644 --- a/tests/actions.at +++ b/tests/actions.at @@ -1281,8 +1281,6 @@ AT_DATA_GRAMMAR([[input.y]], %debug %code requires { -# include - typedef struct sem_type { int ival; @@ -1291,20 +1289,21 @@ AT_DATA_GRAMMAR([[input.y]], # define YYSTYPE sem_type -#ifdef __cplusplus +]AT_SKEL_CC_IF([[ # include static void report (std::ostream& yyo, int ival, float fval) { yyo << "ival: " << ival << ", fval: " << fval; } -#else +]], [[ +# include static void report (FILE* yyo, int ival, float fval) { fprintf (yyo, "ival: %d, fval: %1.1f", ival, fval); } -#endif +]])[ } %code