Replace deprecated YYLEX_PARAM with %lex-param
See http://article.gmane.org/gmane.org.fsf.announce/2006 for details.
Tested with bison 2.5 and bison 3.0.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
// data is a pointer to a 'SParserParam' structure
//#define YYPARSE_PARAM scanner
// data is a pointer to a 'SParserParam' structure
//#define YYPARSE_PARAM scanner
-// the argument for the 'yylex' function
-#define YYLEX_PARAM ((struct ctf_scanner *) scanner)->scanner
-
struct ctf_node;
struct ctf_parser;
struct ctf_node;
struct ctf_parser;
-int yyparse(struct ctf_scanner *scanner);
+int yyparse(struct ctf_scanner *scanner, yyscan_t yyscanner);
-int yylex(union YYSTYPE *yyval, struct ctf_scanner *scanner);
+int yylex(union YYSTYPE *yyval, yyscan_t yyscanner);
BT_HIDDEN
int yylex_init_extra(struct ctf_scanner *scanner, yyscan_t * ptr_yy_globals);
BT_HIDDEN
int yylex_destroy(yyscan_t yyscanner);
BT_HIDDEN
BT_HIDDEN
int yylex_init_extra(struct ctf_scanner *scanner, yyscan_t * ptr_yy_globals);
BT_HIDDEN
int yylex_destroy(yyscan_t yyscanner);
BT_HIDDEN
-void yyrestart(FILE * in_str, yyscan_t scanner);
+void yyrestart(FILE * in_str, yyscan_t yyscanner);
BT_HIDDEN
int yyget_lineno(yyscan_t yyscanner);
BT_HIDDEN
BT_HIDDEN
int yyget_lineno(yyscan_t yyscanner);
BT_HIDDEN
-void yyerror(struct ctf_scanner *scanner, const char *str)
+void yyerror(struct ctf_scanner *scanner, yyscan_t yyscanner, const char *str)
{
printfl_error(yyget_lineno(scanner->scanner),
"token \"%s\": %s\n",
{
printfl_error(yyget_lineno(scanner->scanner),
"token \"%s\": %s\n",
#define reparent_error(scanner, str) \
do { \
#define reparent_error(scanner, str) \
do { \
- yyerror(scanner, YY_("reparent_error: " str)); \
+ yyerror(scanner, scanner->scanner, YY_("reparent_error: " str)); \
int ctf_scanner_append_ast(struct ctf_scanner *scanner)
{
int ctf_scanner_append_ast(struct ctf_scanner *scanner)
{
- return yyparse(scanner);
+ return yyparse(scanner, scanner->scanner);
}
struct ctf_scanner *ctf_scanner_alloc(FILE *input)
}
struct ctf_scanner *ctf_scanner_alloc(FILE *input)
/* %locations */
%error-verbose
%parse-param {struct ctf_scanner *scanner}
/* %locations */
%error-verbose
%parse-param {struct ctf_scanner *scanner}
-%lex-param {struct ctf_scanner *scanner}
+%parse-param {yyscan_t yyscanner}
+%lex-param {yyscan_t yyscanner}
/*
* Expect two shift-reduce conflicts. Caused by enum name-opt : type {}
* vs struct { int :value; } (unnamed bit-field). The default is to
/*
* Expect two shift-reduce conflicts. Caused by enum name-opt : type {}
* vs struct { int :value; } (unnamed bit-field). The default is to