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

c++: more YY_NULL

Browse Source 
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.
This commit is contained in:
Akim Demaille
2012-04-01 13:15:41 +02:00
parent 3e75a2c92b
commit eeaf1dc646
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/cxx-type.at
View File

@@ -105,19 +105,19 @@ prog :
stmt : expr ';' $2 { $$ = ]$[1; }
| decl $3
| error ';' { $$ = new_nterm ("<error>", 0, 0, 0); }
| error ';' { $$ = new_nterm ("<error>", YY_NULL, YY_NULL, YY_NULL); }
| '@' { YYACCEPT; }
;
expr : ID
| TYPENAME '(' expr ')'
{ $$ = new_nterm ("<cast>(%s,%s)", ]$[3, ]$[1, 0); }
| expr '+' expr { $$ = new_nterm ("+(%s,%s)", ]$[1, ]$[3, 0); }
| expr '=' expr { $$ = new_nterm ("=(%s,%s)", ]$[1, ]$[3, 0); }
{ $$ = new_nterm ("<cast>(%s,%s)", ]$[3, ]$[1, YY_NULL); }
| expr '+' expr { $$ = new_nterm ("+(%s,%s)", ]$[1, ]$[3, YY_NULL); }
| expr '=' expr { $$ = new_nterm ("=(%s,%s)", ]$[1, ]$[3, YY_NULL); }
;
decl : TYPENAME declarator ';'
{ $$ = new_nterm ("<declare>(%s,%s)", ]$[1, ]$[2, 0); }
{ $$ = new_nterm ("<declare>(%s,%s)", ]$[1, ]$[2, YY_NULL); }
| TYPENAME declarator '=' expr ';'
{ $$ = new_nterm ("<init-declare>(%s,%s,%s)", ]$[1,
]$[2, ]$[4); }
@@ -209,7 +209,7 @@ yylex (LEX_PARAMETERS)
{
colNum += 1;
tok = c;
yylval = 0;
yylval = YY_NULL;
}
#if YYLSP_NEEDED
yylloc.last_column = colNum-1;
@@ -314,7 +314,7 @@ m4_bmatch([$2], [stmtMerge],
[[static YYSTYPE
stmtMerge (YYSTYPE x0, YYSTYPE x1)
{
return new_nterm ("<OR>(%s,%s)", x0, x1, 0);
return new_nterm ("<OR>(%s,%s)", x0, x1, YY_NULL);
}
]])
)

2
tests/glr-regression.at
View File

@@ -298,7 +298,7 @@ static void yyerror(char const * s) {
fprintf(stderr,"error: %s\n",s);
}
FILE *input = NULL;
FILE *input = YY_NULL;
int P[] = { P1, P2 };
int O[] = { O1, O2 };

10
tests/push.at
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);
}