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

parse.y: block bodies

Browse Source 
* parse.y (brace_body, do_body): extract block bodies.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-09-21 04:32:03 +00:00
parent 25049e983d
commit 7b4b01bf05
2 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Sep 21 13:32:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (brace_body, do_body): extract block bodies.
Tue Sep 20 23:02:50 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Sep 20 23:02:50 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (gc_start_internal): [DOC] add ObjectSpace.garbage_collect * gc.c (gc_start_internal): [DOC] add ObjectSpace.garbage_collect

74
parse.y
View File

@ -508,6 +508,9 @@ static NODE *new_xstring_gen(struct parser_params *, NODE *);
#define new_xstring(node) new_xstring_gen(parser, node) #define new_xstring(node) new_xstring_gen(parser, node)
#define new_string1(str) (str) #define new_string1(str) (str)
#define new_brace_body(param, stmt) NEW_ITER(param, stmt)
#define new_do_body(param, stmt) NEW_ITER(param, stmt)
static NODE *match_op_gen(struct parser_params*,NODE*,NODE*); static NODE *match_op_gen(struct parser_params*,NODE*,NODE*);
#define match_op(node1,node2) match_op_gen(parser, (node1), (node2)) #define match_op(node1,node2) match_op_gen(parser, (node1), (node2))
@ -572,6 +575,9 @@ static VALUE new_xstring_gen(struct parser_params *, VALUE);
#define new_xstring(str) new_xstring_gen(parser, str) #define new_xstring(str) new_xstring_gen(parser, str)
#define new_string1(str) dispatch1(string_literal, str) #define new_string1(str) dispatch1(string_literal, str)
#define new_brace_body(param, stmt) dispatch2(brace_block, escape_Qundef(param), stmt)
#define new_do_body(param, stmt) dispatch2(do_block, escape_Qundef(param), stmt)
#define const_path_field(w, n) dispatch2(const_path_field, (w), (n)) #define const_path_field(w, n) dispatch2(const_path_field, (w), (n))
#define top_const_field(n) dispatch1(top_const_field, (n)) #define top_const_field(n) dispatch1(top_const_field, (n))
static VALUE const_decl_gen(struct parser_params *parser, VALUE path); static VALUE const_decl_gen(struct parser_params *parser, VALUE path);
@ -903,7 +909,7 @@ static void token_info_pop_gen(struct parser_params*, const char *token, size_t
%type <node> block_param opt_block_param block_param_def f_opt %type <node> block_param opt_block_param block_param_def f_opt
%type <node> f_kwarg f_kw f_block_kwarg f_block_kw %type <node> f_kwarg f_kw f_block_kwarg f_block_kw
%type <node> bv_decls opt_bv_decl bvar %type <node> bv_decls opt_bv_decl bvar
%type <node> lambda f_larglist lambda_body %type <node> lambda f_larglist lambda_body brace_body do_body
%type <node> brace_block cmd_brace_block do_block lhs none fitem %type <node> brace_block cmd_brace_block do_block lhs none fitem
%type <node> mlhs mlhs_head mlhs_basic mlhs_item mlhs_node mlhs_post mlhs_inner %type <node> mlhs mlhs_head mlhs_basic mlhs_item mlhs_node mlhs_post mlhs_inner
%type <id> fsym keyword_variable user_variable sym symbol operation operation2 operation3 %type <id> fsym keyword_variable user_variable sym symbol operation operation2 operation3
@ -1460,23 +1466,17 @@ block_command : block_call
cmd_brace_block : tLBRACE_ARG cmd_brace_block : tLBRACE_ARG
{ {
$<vars>1 = dyna_push();
/*%%%*/ /*%%%*/
$<num>$ = ruby_sourceline; $<num>$ = ruby_sourceline;
/*% /*%
%*/ %*/
} }
opt_block_param brace_body '}'
compstmt
'}'
{ {
/*%%%*/ $$ = $3;
$$ = NEW_ITER($3,$4); /*%%%*/
nd_set_line($$, $<num>2); nd_set_line($$, $<num>2);
/*% /*% %*/
$$ = dispatch2(brace_block, escape_Qundef($3), $4);
%*/
dyna_pop($<vars>1);
} }
; ;
@ -3554,22 +3554,16 @@ lambda_body : tLAMBEG compstmt '}'
do_block : keyword_do_block do_block : keyword_do_block
{ {
$<vars>1 = dyna_push();
/*%%%*/ /*%%%*/
$<num>$ = ruby_sourceline; $<num>$ = ruby_sourceline;
/*% %*/ /*% %*/
} }
opt_block_param do_body keyword_end
compstmt
keyword_end
{ {
/*%%%*/ $$ = $3;
$$ = NEW_ITER($3,$4); /*%%%*/
nd_set_line($$, $<num>2); nd_set_line($$, $<num>2);
/*% /*% %*/
$$ = dispatch2(do_block, escape_Qundef($3), $4);
%*/
dyna_pop($<vars>1);
} }
; ;
@ -3738,44 +3732,42 @@ method_call : fcall paren_args
brace_block : '{' brace_block : '{'
{ {
$<vars>1 = dyna_push();
/*%%%*/ /*%%%*/
$<num>$ = ruby_sourceline; $<num>$ = ruby_sourceline;
/*% /*% %*/
%*/
} }
opt_block_param brace_body '}'
compstmt '}'
{ {
$$ = $3;
/*%%%*/ /*%%%*/
$$ = NEW_ITER($3,$4);
nd_set_line($$, $<num>2); nd_set_line($$, $<num>2);
/*% /*% %*/
$$ = dispatch2(brace_block, escape_Qundef($3), $4);
%*/
dyna_pop($<vars>1);
} }
| keyword_do | keyword_do
{ {
$<vars>1 = dyna_push();
/*%%%*/ /*%%%*/
$<num>$ = ruby_sourceline; $<num>$ = ruby_sourceline;
/*% /*% %*/
%*/
} }
opt_block_param do_body keyword_end
compstmt keyword_end
{ {
$$ = $3;
/*%%%*/ /*%%%*/
$$ = NEW_ITER($3,$4);
nd_set_line($$, $<num>2); nd_set_line($$, $<num>2);
/*% /*% %*/
$$ = dispatch2(do_block, escape_Qundef($3), $4);
%*/
dyna_pop($<vars>1);
} }
; ;
brace_body : {$<vars>$ = dyna_push();}
opt_block_param compstmt
{$$ = new_brace_body($2, $3); dyna_pop($<vars>1);}
;
do_body : {$<vars>$ = dyna_push();}
opt_block_param compstmt
{$$ = new_do_body($2, $3); dyna_pop($<vars>1);}
;
case_body : keyword_when args then case_body : keyword_when args then
compstmt compstmt
cases cases