1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Propagate parser_params to rb_yytnamerr

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-05-10 16:40:34 +09:00
parent dc65e75101
commit 79931dddba
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
parse.y
View File

@ -649,8 +649,8 @@ rb_strterm_mark(VALUE obj)
} }
#endif #endif
#define yytnamerr(yyres, yystr) (YYSIZE_T)rb_yytnamerr(yyres, yystr) #define yytnamerr(yyres, yystr) (YYSIZE_T)rb_yytnamerr(p, yyres, yystr)
size_t rb_yytnamerr(char *yyres, const char *yystr); size_t rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr);
#define TOKEN2ID(tok) ( \ #define TOKEN2ID(tok) ( \
tTOKEN_LOCAL_BEGIN<(tok)&&(tok)<tTOKEN_LOCAL_END ? TOKEN2LOCALID(tok) : \ tTOKEN_LOCAL_BEGIN<(tok)&&(tok)<tTOKEN_LOCAL_END ? TOKEN2LOCALID(tok) : \
@ -12273,8 +12273,9 @@ count_char(const char *str, int c)
* "\"`class' keyword\"" => "`class' keyword" * "\"`class' keyword\"" => "`class' keyword"
*/ */
RUBY_FUNC_EXPORTED size_t RUBY_FUNC_EXPORTED size_t
rb_yytnamerr(char *yyres, const char *yystr) rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr)
{ {
YYUSE(p);
if (*yystr == '"') { if (*yystr == '"') {
size_t yyn = 0, bquote = 0; size_t yyn = 0, bquote = 0;
const char *yyp = yystr; const char *yyp = yystr;

2
tool/ytab.sed
View File

@ -67,6 +67,8 @@ a\
/^yy_reduce_print/,/^}/{ /^yy_reduce_print/,/^}/{
s/fprintf *(stderr,/YYFPRINTF (p,/g s/fprintf *(stderr,/YYFPRINTF (p,/g
} }
s/^yysyntax_error (/&struct parser_params *p, /
s/ yysyntax_error (/&p, /
s/\( YYFPRINTF *(\)yyoutput,/\1p,/ s/\( YYFPRINTF *(\)yyoutput,/\1p,/
s/\( YYFPRINTF *(\)yyo,/\1p,/ s/\( YYFPRINTF *(\)yyo,/\1p,/
s/\( YYFPRINTF *(\)stderr,/\1p,/ s/\( YYFPRINTF *(\)stderr,/\1p,/