mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-22 02:33:03 +00:00
Merge remote-tracking branch 'origin/maint'
* origin/maint: tests: do not output m4 set up. tests: use the generic yyerror function. tests: use assert instead of plain abort. tests: improve the generic yylex implementation. tests: generalize the compilation macros. tests: fix confusion between api.prefix and name-prefix. maint: gitignores. yacc: work around the ylwrap limitation. Conflicts: NEWS tests/local.at
This commit is contained in:
@@ -45,7 +45,7 @@ m4_define([_AT_DATA_CALC_Y],
|
||||
[m4_fatal([$0: Invalid arguments: $@])])dnl
|
||||
|
||||
m4_pushdef([AT_CALC_MAIN],
|
||||
[#include <stdlib.h> /* abort */
|
||||
[#include <assert.h>
|
||||
#if HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#else
|
||||
@@ -98,10 +98,8 @@ main (int argc, const char **argv)
|
||||
status = ]AT_NAME_PREFIX[parse (]AT_PARAM_IF([[&result, &count]])[);
|
||||
if (fclose (input))
|
||||
perror ("fclose");
|
||||
if (global_result != result)
|
||||
abort ();
|
||||
if (global_count != count)
|
||||
abort ();
|
||||
assert (global_result == result);
|
||||
assert (global_count == count);
|
||||
return status;
|
||||
}
|
||||
]])
|
||||
|
||||
Reference in New Issue
Block a user