ruby-changes:56019
From: Martin <ko1@a...>
Date: Wed, 5 Jun 2019 15:31:47 +0900 (JST)
Subject: [ruby-changes:56019] Martin Drst: f258137083 (trunk): Fix grammar of macro name: ECCESSED -> ECCESSIVE
https://git.ruby-lang.org/ruby.git/commit/?id=f258137083 From f258137083051a7fc2412c62e3fb239f93d1fdf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20D=C3=BCrst?= <duerst@i...> Date: Wed, 5 Jun 2019 14:03:50 +0900 Subject: Fix grammar of macro name: ECCESSED -> ECCESSIVE Fix the name of the macro variable introduced in 0872ea5330 from NODE_SPECIAL_EXCESSED_COMMA to NODE_SPECIAL_EXCESSIVE_COMMA. diff --git a/compile.c b/compile.c index 66b7589..60cdb76 100644 --- a/compile.c +++ b/compile.c @@ -1632,7 +1632,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons https://github.com/ruby/ruby/blob/trunk/compile.c#L1632 debugs(" - argc: %d\n", body->param.lead_num); rest_id = args->rest_arg; - if (rest_id == NODE_SPECIAL_EXCESSED_COMMA) { + if (rest_id == NODE_SPECIAL_EXCESSIVE_COMMA) { last_comma = 1; rest_id = 0; } diff --git a/node.c b/node.c index 8be6f81..e4c4961 100644 --- a/node.c +++ b/node.c @@ -1011,7 +1011,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node) https://github.com/ruby/ruby/blob/trunk/node.c#L1011 F_NODE(nd_ainfo->post_init, "initialization of post-arguments"); F_ID(nd_ainfo->first_post_arg, "first post argument"); F_CUSTOM1(nd_ainfo->rest_arg, "rest argument") { - if (node->nd_ainfo->rest_arg == NODE_SPECIAL_EXCESSED_COMMA) { + if (node->nd_ainfo->rest_arg == NODE_SPECIAL_EXCESSIVE_COMMA) { A("1 (excessed comma)"); } else { diff --git a/node.h b/node.h index 539c372..ebcc49c 100644 --- a/node.h +++ b/node.h @@ -383,7 +383,7 @@ typedef struct RNode { https://github.com/ruby/ruby/blob/trunk/node.h#L383 #define NODE_REQUIRED_KEYWORD_P(node) ((node)->nd_value == NODE_SPECIAL_REQUIRED_KEYWORD) #define NODE_SPECIAL_NO_NAME_REST ((NODE *)-1) #define NODE_NAMED_REST_P(node) ((node) != NODE_SPECIAL_NO_NAME_REST) -#define NODE_SPECIAL_EXCESSED_COMMA ((ID)1) +#define NODE_SPECIAL_EXCESSIVE_COMMA ((ID)1) VALUE rb_node_case_when_optimizable_literal(const NODE *const node); diff --git a/parse.y b/parse.y index 4446a29..6fc098b 100644 --- a/parse.y +++ b/parse.y @@ -3257,7 +3257,7 @@ block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail https://github.com/ruby/ruby/blob/trunk/parse.y#L3257 { /*%%%*/ /* magic number for rest_id in iseq_set_arguments() */ - $$ = new_args(p, $1, Qnone, NODE_SPECIAL_EXCESSED_COMMA, Qnone, new_args_tail(p, Qnone, Qnone, Qnone, &@1), &@$); + $$ = new_args(p, $1, Qnone, NODE_SPECIAL_EXCESSIVE_COMMA, Qnone, new_args_tail(p, Qnone, Qnone, Qnone, &@1), &@$); /*% %*/ /*% ripper: new_args(p, $1, Qnone, excessed_comma!, Qnone, new_args_tail(p, Qnone, Qnone, Qnone, NULL), NULL) %*/ } @@ -11130,7 +11130,7 @@ args_with_numbered(struct parser_params *p, NODE *args, int max_numparam) https://github.com/ruby/ruby/blob/trunk/parse.y#L11130 if (max_numparam > 0) { if (!args) args = new_args_tail(p, 0, 0, 0, 0); args->nd_ainfo->pre_args_num = max_numparam; - args->nd_ainfo->rest_arg = NODE_SPECIAL_EXCESSED_COMMA; + args->nd_ainfo->rest_arg = NODE_SPECIAL_EXCESSIVE_COMMA; } return args; } -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/