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

* tests/calc.at: Use m4_match.

Browse Source 
(_AT_DATA_CALC_Y): Check `yyin != NULL', not `stdin != NULL'.
This commit is contained in:
Akim Demaille
2001-09-10 09:31:50 +00:00
parent 041cad1677
commit 3b14996787
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2001-09-10 Akim Demaille <akim@epita.fr>
* tests/calc.at: Use m4_match.
(_AT_DATA_CALC_Y): Check `yyin != NULL', not `stdin != NULL'.
2001-09-10 Marc Autret <autret_m@epita.fr>, Akim Demaille <akim@epita.fr> 2001-09-10 Marc Autret <autret_m@epita.fr>, Akim Demaille <akim@epita.fr>
* src/vcg.h (graph_s): color, textcolor, bordercolor are now * src/vcg.h (graph_s): color, textcolor, bordercolor are now

33
tests/calc.at
View File

@@ -220,14 +220,16 @@ power (int base, int exponent)
} }
int int
main (int argn, const char **argv) main (int argc, const char **argv)
{ {
if (argn == 2) yyin = NULL;
if (argc == 2)
yyin = fopen (argv[1], "r"); yyin = fopen (argv[1], "r");
else else
yyin = stdin; yyin = stdin;
if (!stdin) if (!yyin)
{ {
perror (argv[1]); perror (argv[1]);
exit (1); exit (1);
@@ -252,9 +254,8 @@ main (int argn, const char **argv)
# Produce `calc.y'. # Produce `calc.y'.
m4_define([AT_DATA_CALC_Y], m4_define([AT_DATA_CALC_Y],
[_AT_DATA_CALC_Y($[1], $[2], $[3], [_AT_DATA_CALC_Y($[1], $[2], $[3],
[m4_if(m4_regexp([$1], [--yyerror-verbose]), [m4_match([$1], [--yyerror-verbose],
[-1], [], [[#define YYERROR_VERBOSE]])])])
[[#define YYERROR_VERBOSE]])])])
@@ -268,12 +269,12 @@ m4_define([_AT_CHECK_CALC],
[AT_DATA([[input]], [AT_DATA([[input]],
[[$2 [[$2
]]) ]])
m4_if(m4_regexp([$1], [--debug]), m4_match([$1], [--debug],
[-1], [AT_CHECK([calc ./input 2>&1 >/dev/null | grep 'parse error' >&2],
[AT_CHECK([./calc <input], [1], [], [])],
[0], [], [])], [AT_CHECK([./calc <input],
[AT_CHECK([calc ./input 2>&1 >/dev/null | grep 'parse error' >&2], [0], [], [])])dnl
[1], [], [])])]) ])
# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT, # _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT,
@@ -286,12 +287,10 @@ m4_define([_AT_CHECK_CALC_ERROR],
]]) ]])
AT_CHECK([./calc <input 2>&1 >/dev/null | grep 'parse error' >&2], 0, AT_CHECK([./calc <input 2>&1 >/dev/null | grep 'parse error' >&2], 0,
[], [],
[m4_if(m4_regexp([$1], [--location]), [m4_match([$1], [--location], [$3: ])[]dnl
[-1], [], [$3: ])[]dnl
parse error[]dnl parse error[]dnl
m4_if(m4_regexp([$1], [--yyerror-verbose]), m4_match([$1], [--yyerror-verbose], [$4])[]dnl
[-1], [], [$4])[]dnl
])]) ])])