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

parse.y: simplified compstmt

Browse source 
* parse.y (top_compstmt, compstmt): unified void_stmts with
  ripper.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-16 08:05:57 +00:00
parent 4b6f3bce25
commit 1c0073fa64
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
parse.y
View file

@ -363,7 +363,7 @@ static void void_expr(struct parser_params*,NODE*);
static NODE *remove_begin(NODE*); static NODE *remove_begin(NODE*);
static NODE *remove_begin_all(NODE*); static NODE *remove_begin_all(NODE*);
#define value_expr(node) value_expr_gen(p, (node) = remove_begin(node)) #define value_expr(node) value_expr_gen(p, (node) = remove_begin(node))
static void void_stmts(struct parser_params*,NODE*); static NODE *void_stmts(struct parser_params*,NODE*);
static void reduce_nodes(struct parser_params*,NODE**); static void reduce_nodes(struct parser_params*,NODE**);
static void block_dup_check(struct parser_params*,NODE*,NODE*); static void block_dup_check(struct parser_params*,NODE*,NODE*);
@ -466,6 +466,7 @@ ripper_is_node_yylval(VALUE n)
#define value_expr(node) ((void)(node)) #define value_expr(node) ((void)(node))
#define remove_begin(node) (node) #define remove_begin(node) (node)
#define void_stmts(p,x) (x)
#define rb_dvar_defined(id, base) 0 #define rb_dvar_defined(id, base) 0
#define rb_local_defined(id, base) 0 #define rb_local_defined(id, base) 0
static ID ripper_get_id(VALUE); static ID ripper_get_id(VALUE);
@ -995,11 +996,7 @@ program : {
top_compstmt : top_stmts opt_terms top_compstmt : top_stmts opt_terms
{ {
/*%%%*/ $$ = void_stmts(p, $1);
void_stmts(p, $1);
/*%
%*/
$$ = $1;
} }
; ;
@ -1083,11 +1080,7 @@ bodystmt : compstmt
compstmt : stmts opt_terms compstmt : stmts opt_terms
{ {
/*%%%*/ $$ = void_stmts(p, $1);
void_stmts(p, $1);
/*%
%*/
$$ = $1;
} }
; ;
@ -9653,18 +9646,19 @@ void_expr(struct parser_params *p, NODE *node)
} }
} }
static void static NODE *
void_stmts(struct parser_params *p, NODE *node) void_stmts(struct parser_params *p, NODE *node)
{ {
if (!RTEST(ruby_verbose)) return; NODE *const n = node;
if (!node) return; if (!RTEST(ruby_verbose)) return n;
if (nd_type(node) != NODE_BLOCK) return; if (!node) return n;
if (nd_type(node) != NODE_BLOCK) return n;
for (;;) { while (node->nd_next) {
if (!node->nd_next) return;
void_expr(p, node->nd_head); void_expr(p, node->nd_head);
node = node->nd_next; node = node->nd_next;
} }
return n;
} }
static NODE * static NODE *