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

bistromathic: promote yytoken_kind_t

Browse Source 
* examples/c/bistromathic/parse.y: Use yytoken_kind_t rather than int.
This commit is contained in:
Akim Demaille
2020-07-11 13:51:57 +02:00
parent 38a169bec1
commit dab23c4a21
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
examples/c/bistromathic/parse.y
View File

@@ -74,7 +74,7 @@
# define __attribute__(Spec) /* empty */ # define __attribute__(Spec) /* empty */
# endif # endif
# endif # endif
int yylex (const char **line, YYSTYPE *yylval, YYLTYPE *yylloc); yytoken_kind_t yylex (const char **line, YYSTYPE *yylval, YYLTYPE *yylloc);
void yyerror (YYLTYPE *loc, char const *format, ...) void yyerror (YYLTYPE *loc, char const *format, ...)
__attribute__ ((__format__ (__printf__, 2, 3))); __attribute__ ((__format__ (__printf__, 2, 3)));
} }
@@ -257,7 +257,7 @@ symbol_count (void)
| Scanner. | | Scanner. |
`----------*/ `----------*/
int yytoken_kind_t
yylex (const char **line, YYSTYPE *yylval, YYLTYPE *yylloc) yylex (const char **line, YYSTYPE *yylval, YYLTYPE *yylloc)
{ {
int c; int c;
@@ -453,7 +453,8 @@ process_line (YYLTYPE *lloc, const char *line)
int status = 0; int status = 0;
do { do {
YYSTYPE lval; YYSTYPE lval;
status = yypush_parse (ps, yylex (&line, &lval, lloc), &lval, lloc); yytoken_kind_t token = yylex (&line, &lval, lloc);
status = yypush_parse (ps, token, &lval, lloc);
} while (status == YYPUSH_MORE); } while (status == YYPUSH_MORE);
yypstate_delete (ps); yypstate_delete (ps);
lloc->last_line++; lloc->last_line++;
@@ -475,9 +476,9 @@ expected_tokens (const char *input,
do { do {
YYLTYPE lloc = { 1, 1, 1, 1 }; YYLTYPE lloc = { 1, 1, 1, 1 };
YYSTYPE lval; YYSTYPE lval;
int token = yylex (&input, &lval, &lloc); yytoken_kind_t token = yylex (&input, &lval, &lloc);
// Don't let the parse know when we reach the end of input. // Don't let the parser know when we reach the end of input.
if (!token) if (token == TOK_YYEOF)
break; break;
status = yypush_parse (ps, token, &lval, &lloc); status = yypush_parse (ps, token, &lval, &lloc);
} while (status == YYPUSH_MORE); } while (status == YYPUSH_MORE);