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

Declare k_class and k_module as ctxt

Browse Source 
So that it is not ncessary to specify the type each time.
This commit is contained in:
Nobuyoshi Nakada 2023-09-10 21:37:44 +09:00
parent 16882d4ebb
commit b8d0ab80bb
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2023-09-10 14:30:31 +00:00 
Merged: https://github.com/ruby/ruby/pull/8410
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
parse.y
View File

@ -1617,7 +1617,7 @@ static int looking_at_eol_p(struct parser_params *p);
%type <id> f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon %type <id> f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon
%type <id> p_kwrest p_kwnorest p_any_kwrest p_kw_label %type <id> p_kwrest p_kwnorest p_any_kwrest p_kw_label
%type <id> f_no_kwarg f_any_kwrest args_forward excessed_comma nonlocal_var %type <id> f_no_kwarg f_any_kwrest args_forward excessed_comma nonlocal_var
%type <ctxt> lex_ctxt /* keep <ctxt> in ripper */ %type <ctxt> lex_ctxt k_class k_module /* keep <ctxt> in ripper */
%token END_OF_INPUT 0 "end-of-input" %token END_OF_INPUT 0 "end-of-input"
%token <id> '.' %token <id> '.'
/* escaped chars, should be ignored otherwise */ /* escaped chars, should be ignored otherwise */
@ -3609,8 +3609,8 @@ primary : literal
/*% %*/ /*% %*/
/*% ripper: class!($2, $3, $5) %*/ /*% ripper: class!($2, $3, $5) %*/
local_pop(p); local_pop(p);
p->ctxt.in_class = $<ctxt>1.in_class; p->ctxt.in_class = $1.in_class;
p->ctxt.shareable_constant_value = $<ctxt>1.shareable_constant_value; p->ctxt.shareable_constant_value = $1.shareable_constant_value;
} }
| k_class tLSHFT expr | k_class tLSHFT expr
{ {
@ -3630,9 +3630,9 @@ primary : literal
/*% %*/ /*% %*/
/*% ripper: sclass!($3, $6) %*/ /*% ripper: sclass!($3, $6) %*/
local_pop(p); local_pop(p);
p->ctxt.in_def = $<ctxt>1.in_def; p->ctxt.in_def = $1.in_def;
p->ctxt.in_class = $<ctxt>1.in_class; p->ctxt.in_class = $1.in_class;
p->ctxt.shareable_constant_value = $<ctxt>1.shareable_constant_value; p->ctxt.shareable_constant_value = $1.shareable_constant_value;
} }
| k_module cpath | k_module cpath
{ {
@ -3654,8 +3654,8 @@ primary : literal
/*% %*/ /*% %*/
/*% ripper: module!($2, $4) %*/ /*% ripper: module!($2, $4) %*/
local_pop(p); local_pop(p);
p->ctxt.in_class = $<ctxt>1.in_class; p->ctxt.in_class = $1.in_class;
p->ctxt.shareable_constant_value = $<ctxt>1.shareable_constant_value; p->ctxt.shareable_constant_value = $1.shareable_constant_value;
} }
| defn_head | defn_head
f_arglist f_arglist
@ -3807,7 +3807,7 @@ k_for : keyword_for
k_class : keyword_class k_class : keyword_class
{ {
token_info_push(p, "class", &@$); token_info_push(p, "class", &@$);
$<ctxt>$ = p->ctxt; $$ = p->ctxt;
/*%%%*/ /*%%%*/
push_end_expect_token_locations(p, &@1.beg_pos); push_end_expect_token_locations(p, &@1.beg_pos);
/*% %*/ /*% %*/
@ -3817,7 +3817,7 @@ k_class : keyword_class
k_module : keyword_module k_module : keyword_module
{ {
token_info_push(p, "module", &@$); token_info_push(p, "module", &@$);
$<ctxt>$ = p->ctxt; $$ = p->ctxt;
/*%%%*/ /*%%%*/
push_end_expect_token_locations(p, &@1.beg_pos); push_end_expect_token_locations(p, &@1.beg_pos);
/*% %*/ /*% %*/