From fcb4ab8d1c917b3f2a998f9b6eab3d9cec27670a Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 14 Dec 2015 06:36:50 +0000 Subject: ytab.sed: for bison 2 * tool/ytab.sed: substitute `fprintf`s used directory in yy_reduce_print by bison 2. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 6 ++++++ tool/ytab.sed | 3 +++ 2 files changed, 9 insertions(+) diff --git a/parse.y b/parse.y index 9c3e5f9602..c67e0fcca2 100644 --- a/parse.y +++ b/parse.y @@ -45,6 +45,12 @@ #define YYCALLOC(nelem, size) rb_parser_calloc(parser, (nelem), (size)) #define YYFREE(ptr) rb_parser_free(parser, (ptr)) #define YYFPRINTF rb_parser_printf +#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + rb_parser_printf(parser, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +#endif #undef malloc #undef realloc #undef calloc diff --git a/tool/ytab.sed b/tool/ytab.sed index ce5a942b00..706cf75a9a 100755 --- a/tool/ytab.sed +++ b/tool/ytab.sed @@ -47,6 +47,9 @@ a\ } x } +/^yy_reduce_print/,/^}/{ + s/fprintf *(stderr,/YYFPRINTF (parser,/g +} s/\( YYFPRINTF *(\)yyoutput,/\1parser,/ s/\( YYFPRINTF *(\)stderr,/\1parser,/ s/\( YYDPRINTF *((\)stderr,/\1parser,/ -- cgit v1.2.3