diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-05-10 21:45:15 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-05-10 21:48:02 +0900 |
commit | aa52464efd558010f4fa5ef5de68d8f684b637aa (patch) | |
tree | 4d5d97aaa6da0eec4756c83359c430ed8826b70b /parse.y | |
parent | d4c8577a14fa272bc9a3e68d4748fdf2f2cf7dee (diff) |
15f45ae4d1 and 56528da3e broke the darwin environment.
Revert "Propagate parser_params to rb_yytnamerr"
This reverts commit 15f45ae4d12f14714ab3021b60887d8c7bf4b095.
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -649,8 +649,8 @@ rb_strterm_mark(VALUE obj) } #endif -#define yytnamerr(yyres, yystr) (YYSIZE_T)rb_yytnamerr(p, yyres, yystr) -size_t rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr); +#define yytnamerr(yyres, yystr) (YYSIZE_T)rb_yytnamerr(yyres, yystr) +size_t rb_yytnamerr(char *yyres, const char *yystr); #define TOKEN2ID(tok) ( \ tTOKEN_LOCAL_BEGIN<(tok)&&(tok)<tTOKEN_LOCAL_END ? TOKEN2LOCALID(tok) : \ @@ -12273,9 +12273,8 @@ count_char(const char *str, int c) * "\"`class' keyword\"" => "`class' keyword" */ RUBY_FUNC_EXPORTED size_t -rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr) +rb_yytnamerr(char *yyres, const char *yystr) { - YYUSE(p); if (*yystr == '"') { size_t yyn = 0, bquote = 0; const char *yyp = yystr; |