Merge branch 'maint'

* maint:
  maint: post-release administrivia
  version 3.3.1
  yacc: issue warnings, not errors, for Bison extensions
  style: formatting changes in NEWS and complain.c
  tests: don't depend on the user's definition of SHELL
This commit is contained in:
Akim Demaille
2019-01-27 16:44:56 +01:00
7 changed files with 43 additions and 31 deletions

View File

@@ -421,8 +421,10 @@ duplicate_rule_directive (char const *directive,
location first, location second)
{
unsigned i = 0;
complain_indent (&second, complaint, &i, _("only one %s allowed per rule"), directive);
complain_indent (&second, complaint, &i,
_("only one %s allowed per rule"), directive);
i += SUB_INDENT;
complain_indent (&first, complaint, &i, _("previous declaration"));
complain_indent (&first, complaint, &i,
_("previous declaration"));
fixits_register (&second, "");
}

View File

@@ -708,7 +708,7 @@ getargs (int argc, char *argv[])
break;
case 'y':
warning_argmatch ("error=yacc", 0, 6);
warning_argmatch ("yacc", 0, 0);
yacc_loc = command_line_location ();
break;