c++: more YY_NULL

Caught by maintainer-check-g++.
* data/glr.c, data/lalr1.cc, data/yacc.c, tests/cxx-type.at,
* tests/glr-regression.at, tests/push.at:
When simple to do, avoid expliciting the null ptr.
Otherwise use YY_NULL.
(cherry picked from commit eeaf1dc646)

Conflicts:

	data/glr.c
	data/lalr1.cc
	tests/cxx-type.at
This commit is contained in:
Akim Demaille
2012-04-01 13:15:41 +02:00
parent 681dda24ba
commit 6557bcce8b
4 changed files with 99 additions and 99 deletions

View File

@@ -60,12 +60,12 @@ main (void)
/* yypstate_delete used to leak ps->yyss if the stack was reallocated but the
parse did not return on success, syntax error, or memory exhaustion. */
ps = yypstate_new ();
assert (yypush_parse (ps, 'a', NULL) == YYPUSH_MORE);
assert (yypush_parse (ps, 'a', YY_NULL) == YYPUSH_MORE);
yypstate_delete (ps);
ps = yypstate_new ();
assert (yypush_parse (ps, 'a', NULL) == YYPUSH_MORE);
assert (yypush_parse (ps, 'b', NULL) == YYPUSH_MORE);
assert (yypush_parse (ps, 'a', YY_NULL) == YYPUSH_MORE);
assert (yypush_parse (ps, 'b', YY_NULL) == YYPUSH_MORE);
yypstate_delete (ps);
return 0;
@@ -124,11 +124,11 @@ main (void)
{
ps = yypstate_new ();
assert (ps);
assert (yypstate_new () == NULL);
assert (yypstate_new () == YY_NULL);
]m4_if([$1], [[both]], [[assert (yyparse () == 2)]])[;
yychar = 0;
assert (yypush_parse (ps) == 0);
assert (yypstate_new () == NULL);
assert (yypstate_new () == YY_NULL);
]m4_if([$1], [[both]], [[assert (yyparse () == 2)]])[;
yypstate_delete (ps);
}