kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fixed passing idNil as a Symbol

Browse source
This commit is contained in:
Nobuyoshi Nakada 2019-10-19 00:50:17 +09:00
parent 9cb809cfef
commit bf934e4812
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
parse.y
View file

@ -864,7 +864,7 @@ new_hash_pattern_tail(struct parser_params *p, VALUE kw_args, VALUE kw_rest_arg,
static VALUE heredoc_dedent(struct parser_params*,VALUE); static VALUE heredoc_dedent(struct parser_params*,VALUE);
#else #else
#define ID2VAL(id) ((VALUE)(id)) #define ID2VAL(id) (id)
#define TOKEN2VAL(t) ID2VAL(t) #define TOKEN2VAL(t) ID2VAL(t)
#define KWD2EID(t, v) keyword_##t #define KWD2EID(t, v) keyword_##t
#endif /* RIPPER */ #endif /* RIPPER */
@ -3298,7 +3298,7 @@ block_args_tail : f_block_kwarg ',' f_kwrest opt_f_block_arg
} }
| f_no_kwarg opt_f_block_arg | f_no_kwarg opt_f_block_arg
{ {
$$ = new_args_tail(p, Qnone, ID2SYM(idNil), $2, &@1); $$ = new_args_tail(p, Qnone, ID2VAL(idNil), $2, &@1);
} }
| f_block_arg | f_block_arg
{ {
@ -4014,11 +4014,11 @@ p_kwargs : p_kwarg ',' p_kwrest
} }
| p_kwarg ',' p_kwnorest | p_kwarg ',' p_kwnorest
{ {
$$ = new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), ID2SYM(idNil), &@$); $$ = new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), ID2VAL(idNil), &@$);
} }
| p_kwnorest | p_kwnorest
{ {
$$ = new_hash_pattern_tail(p, new_hash(p, Qnone, &@$), ID2SYM(idNil), &@$); $$ = new_hash_pattern_tail(p, new_hash(p, Qnone, &@$), ID2VAL(idNil), &@$);
} }
; ;
@ -4788,7 +4788,7 @@ args_tail : f_kwarg ',' f_kwrest opt_f_block_arg
} }
| f_no_kwarg opt_f_block_arg | f_no_kwarg opt_f_block_arg
{ {
$$ = new_args_tail(p, Qnone, ID2SYM(idNil), $2, &@1); $$ = new_args_tail(p, Qnone, ID2VAL(idNil), $2, &@1);
} }
| f_block_arg | f_block_arg
{ {
@ -11273,7 +11273,7 @@ new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block,
args->kw_rest_arg = NEW_DVAR(kw_rest_arg, loc); args->kw_rest_arg = NEW_DVAR(kw_rest_arg, loc);
args->kw_rest_arg->nd_cflag = kw_bits; args->kw_rest_arg->nd_cflag = kw_bits;
} }
else if (kw_rest_arg == ID2SYM(idNil)) { else if (kw_rest_arg == idNil) {
args->no_kwarg = 1; args->no_kwarg = 1;
} }
else if (kw_rest_arg) { else if (kw_rest_arg) {
@ -11358,7 +11358,7 @@ new_hash_pattern_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, co
int saved_line = p->ruby_sourceline; int saved_line = p->ruby_sourceline;
NODE *node, *kw_rest_arg_node; NODE *node, *kw_rest_arg_node;
if (kw_rest_arg == ID2SYM(idNil)) { if (kw_rest_arg == idNil) {
kw_rest_arg_node = NODE_SPECIAL_NO_REST_KEYWORD; kw_rest_arg_node = NODE_SPECIAL_NO_REST_KEYWORD;
} }
else if (kw_rest_arg) { else if (kw_rest_arg) {
@ -13101,6 +13101,6 @@ InitVM_ripper(void)
/* /*
* Local variables: * Local variables:
* mode: c * mode: c
* c-file-style: ruby * c-file-style: "ruby"
* End: * End:
*/ */