github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Use rb_node_opt_arg_t and rb_node_kw_arg_t instead of NODE

This commit is contained in:
yui-knk 2023-09-30 17:18:50 +09:00 коммит произвёл Yuichiro Kaneko
Родитель c9e28ea2f9
Коммит cecd1de2eb
6 изменённых файлов: 54 добавлений и 49 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
ast.c
Просмотреть файл

@ -625,14 +625,14 @@ node_children(rb_ast_t *ast, const NODE *node)
return rb_ary_new_from_args(10, return rb_ary_new_from_args(10,
INT2NUM(ainfo->pre_args_num), INT2NUM(ainfo->pre_args_num),
NEW_CHILD(ast, ainfo->pre_init), NEW_CHILD(ast, ainfo->pre_init),
NEW_CHILD(ast, ainfo->opt_args), NEW_CHILD(ast, (NODE *)ainfo->opt_args),
var_name(ainfo->first_post_arg), var_name(ainfo->first_post_arg),
INT2NUM(ainfo->post_args_num), INT2NUM(ainfo->post_args_num),
NEW_CHILD(ast, ainfo->post_init), NEW_CHILD(ast, ainfo->post_init),
(ainfo->rest_arg == NODE_SPECIAL_EXCESSIVE_COMMA (ainfo->rest_arg == NODE_SPECIAL_EXCESSIVE_COMMA
? ID2SYM(rb_intern("NODE_SPECIAL_EXCESSIVE_COMMA")) ? ID2SYM(rb_intern("NODE_SPECIAL_EXCESSIVE_COMMA"))
: var_name(ainfo->rest_arg)), : var_name(ainfo->rest_arg)),
(ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_args)), (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, (NODE *)ainfo->kw_args)),
(ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_rest_arg)), (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_rest_arg)),
var_name(ainfo->block_arg)); var_name(ainfo->block_arg));
} }

18
compile.c
Просмотреть файл

@ -1805,7 +1805,7 @@ static int
iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
const struct rb_args_info *args, int arg_size) const struct rb_args_info *args, int arg_size)
{ {
const NODE *node = args->kw_args; const rb_node_kw_arg_t *node = args->kw_args;
struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq); struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
struct rb_iseq_param_keyword *keyword; struct rb_iseq_param_keyword *keyword;
const VALUE default_values = rb_ary_hidden_new(1); const VALUE default_values = rb_ary_hidden_new(1);
@ -1817,14 +1817,14 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
while (node) { while (node) {
kw++; kw++;
node = RNODE_KW_ARG(node)->nd_next; node = node->nd_next;
} }
arg_size += kw; arg_size += kw;
keyword->bits_start = arg_size++; keyword->bits_start = arg_size++;
node = args->kw_args; node = args->kw_args;
while (node) { while (node) {
const NODE *val_node = RNODE_LASGN(RNODE_KW_ARG(node)->nd_body)->nd_value; const NODE *val_node = RNODE_LASGN(node->nd_body)->nd_value;
VALUE dv; VALUE dv;
if (val_node == NODE_SPECIAL_REQUIRED_KEYWORD) { if (val_node == NODE_SPECIAL_REQUIRED_KEYWORD) {
@ -1845,7 +1845,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
dv = Qfalse; dv = Qfalse;
break; break;
default: default:
NO_CHECK(COMPILE_POPPED(optargs, "kwarg", node)); /* nd_type_p(node, NODE_KW_ARG) */ NO_CHECK(COMPILE_POPPED(optargs, "kwarg", RNODE(node))); /* nd_type_p(node, NODE_KW_ARG) */
dv = complex_mark; dv = complex_mark;
} }
@ -1853,7 +1853,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
rb_ary_push(default_values, dv); rb_ary_push(default_values, dv);
} }
node = RNODE_KW_ARG(node)->nd_next; node = node->nd_next;
} }
keyword->num = kw; keyword->num = kw;
@ -1910,18 +1910,18 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
block_id = args->block_arg; block_id = args->block_arg;
if (args->opt_args) { if (args->opt_args) {
const NODE *node = args->opt_args; const rb_node_opt_arg_t *node = args->opt_args;
LABEL *label; LABEL *label;
VALUE labels = rb_ary_hidden_new(1); VALUE labels = rb_ary_hidden_new(1);
VALUE *opt_table; VALUE *opt_table;
int i = 0, j; int i = 0, j;
while (node) { while (node) {
label = NEW_LABEL(nd_line(node)); label = NEW_LABEL(nd_line(RNODE(node)));
rb_ary_push(labels, (VALUE)label | 1); rb_ary_push(labels, (VALUE)label | 1);
ADD_LABEL(optargs, label); ADD_LABEL(optargs, label);
NO_CHECK(COMPILE_POPPED(optargs, "optarg", RNODE_OPT_ARG(node)->nd_body)); NO_CHECK(COMPILE_POPPED(optargs, "optarg", node->nd_body));
node = RNODE_OPT_ARG(node)->nd_next; node = node->nd_next;
i += 1; i += 1;
} }

4
ext/ripper/tools/preproc.rb
Просмотреть файл

@ -59,9 +59,9 @@ def prelude(f, out)
when /\A%%/ when /\A%%/
out << "%%\n" out << "%%\n"
return return
when /\A%token/, /\A%type/, /\A} <node>/ when /\A%token/, /\A%type/, /\A} <node(?>_\w+)?>/
# types in %union which have corresponding set_yylval_* macro. # types in %union which have corresponding set_yylval_* macro.
out << line.sub(/<(?:node|num|id)>/, '<val>') out << line.sub(/<(?:node(?>_\w+)?|num|id)>/, '<val>')
when /^enum lex_state_(?:bits|e) \{/ when /^enum lex_state_(?:bits|e) \{/
lex_state_def = true lex_state_def = true
out << line out << line

2
node_dump.c
Просмотреть файл

@ -67,7 +67,7 @@
#define F_MSG(name, ann, desc) SIMPLE_FIELD1(#name, ann) A(desc) #define F_MSG(name, ann, desc) SIMPLE_FIELD1(#name, ann) A(desc)
#define F_NODE(name, type, ann) \ #define F_NODE(name, type, ann) \
COMPOUND_FIELD1(#name, ann) {dump_node(buf, indent, comment, type(node)->name);} COMPOUND_FIELD1(#name, ann) {dump_node(buf, indent, comment, RNODE(type(node)->name));}
#define F_NODE2(name, n, ann) \ #define F_NODE2(name, n, ann) \
COMPOUND_FIELD1(#name, ann) {dump_node(buf, indent, comment, n);} COMPOUND_FIELD1(#name, ann) {dump_node(buf, indent, comment, n);}

67
parse.y
Просмотреть файл

@ -1044,8 +1044,8 @@ static rb_node_error_t *rb_node_error_new(struct parser_params *p, const YYLTYPE
#define NEW_ONCE(b,loc) (NODE *)rb_node_once_new(p,b,loc) #define NEW_ONCE(b,loc) (NODE *)rb_node_once_new(p,b,loc)
#define NEW_ARGS(a,loc) (NODE *)rb_node_args_new(p,a,loc) #define NEW_ARGS(a,loc) (NODE *)rb_node_args_new(p,a,loc)
#define NEW_ARGS_AUX(r,b,loc) (NODE *)rb_node_args_aux_new(p,r,b,loc) #define NEW_ARGS_AUX(r,b,loc) (NODE *)rb_node_args_aux_new(p,r,b,loc)
#define NEW_OPT_ARG(v,loc) (NODE *)rb_node_opt_arg_new(p,v,loc) #define NEW_OPT_ARG(v,loc) rb_node_opt_arg_new(p,v,loc)
#define NEW_KW_ARG(v,loc) (NODE *)rb_node_kw_arg_new(p,v,loc) #define NEW_KW_ARG(v,loc) rb_node_kw_arg_new(p,v,loc)
#define NEW_POSTARG(i,v,loc) (NODE *)rb_node_postarg_new(p,i,v,loc) #define NEW_POSTARG(i,v,loc) (NODE *)rb_node_postarg_new(p,i,v,loc)
#define NEW_ARGSCAT(a,b,loc) (NODE *)rb_node_argscat_new(p,a,b,loc) #define NEW_ARGSCAT(a,b,loc) (NODE *)rb_node_argscat_new(p,a,b,loc)
#define NEW_ARGSPUSH(a,b,loc) (NODE *)rb_node_argspush_new(p,a,b,loc) #define NEW_ARGSPUSH(a,b,loc) (NODE *)rb_node_argspush_new(p,a,b,loc)
@ -1196,8 +1196,8 @@ static NODE *new_command_qcall(struct parser_params* p, ID atype, NODE *recv, ID
static NODE *method_add_block(struct parser_params*p, NODE *m, NODE *b, const YYLTYPE *loc) {RNODE_ITER(b)->nd_iter = m; b->nd_loc = *loc; return b;} static NODE *method_add_block(struct parser_params*p, NODE *m, NODE *b, const YYLTYPE *loc) {RNODE_ITER(b)->nd_iter = m; b->nd_loc = *loc; return b;}
static bool args_info_empty_p(struct rb_args_info *args); static bool args_info_empty_p(struct rb_args_info *args);
static NODE *new_args(struct parser_params*,NODE*,NODE*,ID,NODE*,NODE*,const YYLTYPE*); static NODE *new_args(struct parser_params*,NODE*,rb_node_opt_arg_t*,ID,NODE*,NODE*,const YYLTYPE*);
static NODE *new_args_tail(struct parser_params*,NODE*,ID,ID,const YYLTYPE*); static NODE *new_args_tail(struct parser_params*,rb_node_kw_arg_t*,ID,ID,const YYLTYPE*);
static NODE *new_array_pattern(struct parser_params *p, NODE *constant, NODE *pre_arg, NODE *aryptn, const YYLTYPE *loc); static NODE *new_array_pattern(struct parser_params *p, NODE *constant, NODE *pre_arg, NODE *aryptn, const YYLTYPE *loc);
static NODE *new_array_pattern_tail(struct parser_params *p, NODE *pre_args, int has_rest, NODE *rest_arg, NODE *post_args, const YYLTYPE *loc); static NODE *new_array_pattern_tail(struct parser_params *p, NODE *pre_args, int has_rest, NODE *rest_arg, NODE *post_args, const YYLTYPE *loc);
static NODE *new_find_pattern(struct parser_params *p, NODE *constant, NODE *fndptn, const YYLTYPE *loc); static NODE *new_find_pattern(struct parser_params *p, NODE *constant, NODE *fndptn, const YYLTYPE *loc);
@ -1205,7 +1205,7 @@ static NODE *new_find_pattern_tail(struct parser_params *p, NODE *pre_rest_arg,
static NODE *new_hash_pattern(struct parser_params *p, NODE *constant, NODE *hshptn, const YYLTYPE *loc); static NODE *new_hash_pattern(struct parser_params *p, NODE *constant, NODE *hshptn, const YYLTYPE *loc);
static NODE *new_hash_pattern_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, const YYLTYPE *loc); static NODE *new_hash_pattern_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, const YYLTYPE *loc);
static NODE *new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc); static rb_node_kw_arg_t *new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc);
static NODE *args_with_numbered(struct parser_params*,NODE*,int); static NODE *args_with_numbered(struct parser_params*,NODE*,int);
static VALUE negate_lit(struct parser_params*, VALUE); static VALUE negate_lit(struct parser_params*, VALUE);
@ -1231,8 +1231,8 @@ static NODE *new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NOD
static NODE *const_decl(struct parser_params *p, NODE* path, const YYLTYPE *loc); static NODE *const_decl(struct parser_params *p, NODE* path, const YYLTYPE *loc);
static NODE *opt_arg_append(NODE*, NODE*); static rb_node_opt_arg_t *opt_arg_append(rb_node_opt_arg_t*, rb_node_opt_arg_t*);
static NODE *kwd_append(NODE*, NODE*); static rb_node_kw_arg_t *kwd_append(rb_node_kw_arg_t*, rb_node_kw_arg_t*);
static NODE *new_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc); static NODE *new_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc);
static NODE *new_unique_key_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc); static NODE *new_unique_key_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc);
@ -1838,6 +1838,8 @@ static int looking_at_eol_p(struct parser_params *p);
%union { %union {
VALUE val; VALUE val;
NODE *node; NODE *node;
rb_node_opt_arg_t *node_opt_arg;
rb_node_kw_arg_t *node_kw_arg;
ID id; ID id;
int num; int num;
st_table *tbl; st_table *tbl;
@ -1928,12 +1930,14 @@ static int looking_at_eol_p(struct parser_params *p);
%type <node> command_args aref_args opt_block_arg block_arg var_ref var_lhs %type <node> command_args aref_args opt_block_arg block_arg var_ref var_lhs
%type <node> command_rhs arg_rhs %type <node> command_rhs arg_rhs
%type <node> command_asgn mrhs mrhs_arg superclass block_call block_command %type <node> command_asgn mrhs mrhs_arg superclass block_call block_command
%type <node> f_block_optarg f_block_opt %type <node_opt_arg> f_block_optarg f_block_opt
%type <node> f_arglist f_opt_paren_args f_paren_args f_args f_arg f_arg_item %type <node> f_arglist f_opt_paren_args f_paren_args f_args f_arg f_arg_item
%type <node> f_optarg f_marg f_marg_list f_margs f_rest_marg %type <node_opt_arg> f_optarg
%type <node> f_marg f_marg_list f_margs f_rest_marg
%type <node> assoc_list assocs assoc undef_list backref string_dvar for_var %type <node> assoc_list assocs assoc undef_list backref string_dvar for_var
%type <node> block_param opt_block_param block_param_def f_opt %type <node> block_param opt_block_param block_param_def
%type <node> f_kwarg f_kw f_block_kwarg f_block_kw %type <node_opt_arg> f_opt
%type <node_kw_arg> 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 brace_body do_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
@ -12660,26 +12664,27 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc)
return 0; return 0;
} }
static NODE * static rb_node_opt_arg_t *
opt_arg_append(NODE *opt_list, NODE *opt) opt_arg_append(rb_node_opt_arg_t *opt_list, rb_node_opt_arg_t *opt)
{ {
NODE *opts = opt_list; rb_node_opt_arg_t *opts = opt_list;
opts->nd_loc.end_pos = opt->nd_loc.end_pos; RNODE(opts)->nd_loc.end_pos = RNODE(opt)->nd_loc.end_pos;
while (RNODE_OPT_ARG(opts)->nd_next) { while (opts->nd_next) {
opts = RNODE_OPT_ARG(opts)->nd_next; opts = opts->nd_next;
opts->nd_loc.end_pos = opt->nd_loc.end_pos; RNODE(opts)->nd_loc.end_pos = RNODE(opt)->nd_loc.end_pos;
} }
RNODE_OPT_ARG(opts)->nd_next = opt; opts->nd_next = opt;
return opt_list; return opt_list;
} }
static NODE * static rb_node_kw_arg_t *
kwd_append(NODE *kwlist, NODE *kw) kwd_append(rb_node_kw_arg_t *kwlist, rb_node_kw_arg_t *kw)
{ {
if (kwlist) { if (kwlist) {
opt_arg_append(kwlist, kw); /* Assume rb_node_kw_arg_t and rb_node_opt_arg_t has same structure */
opt_arg_append(RNODE_OPT_ARG(kwlist), RNODE_OPT_ARG(kw));
} }
return kwlist; return kwlist;
} }
@ -12776,7 +12781,7 @@ new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
return node; return node;
} }
static NODE * static rb_node_kw_arg_t *
new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc) new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc)
{ {
if (!k) return 0; if (!k) return 0;
@ -14203,7 +14208,7 @@ args_info_empty_p(struct rb_args_info *args)
} }
static NODE* static NODE*
new_args(struct parser_params *p, NODE *pre_args, NODE *opt_args, ID rest_arg, NODE *post_args, NODE *tail, const YYLTYPE *loc) new_args(struct parser_params *p, NODE *pre_args, rb_node_opt_arg_t *opt_args, ID rest_arg, NODE *post_args, NODE *tail, const YYLTYPE *loc)
{ {
struct rb_args_info *args = RNODE_ARGS(tail)->nd_ainfo; struct rb_args_info *args = RNODE_ARGS(tail)->nd_ainfo;
@ -14238,7 +14243,7 @@ new_args(struct parser_params *p, NODE *pre_args, NODE *opt_args, ID rest_arg, N
} }
static NODE* static NODE*
new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block, const YYLTYPE *kw_rest_loc) new_args_tail(struct parser_params *p, rb_node_kw_arg_t *kw_args, ID kw_rest_arg, ID block, const YYLTYPE *kw_rest_loc)
{ {
NODE *node = NEW_ARGS(0, &NULL_LOC); NODE *node = NEW_ARGS(0, &NULL_LOC);
struct rb_args_info *args = ZALLOC(struct rb_args_info); struct rb_args_info *args = ZALLOC(struct rb_args_info);
@ -14257,21 +14262,21 @@ new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block,
*/ */
ID kw_bits = internal_id(p), *required_kw_vars, *kw_vars; ID kw_bits = internal_id(p), *required_kw_vars, *kw_vars;
struct vtable *vtargs = p->lvtbl->args; struct vtable *vtargs = p->lvtbl->args;
NODE *kwn = kw_args; rb_node_kw_arg_t *kwn = kw_args;
if (block) block = vtargs->tbl[vtargs->pos-1]; if (block) block = vtargs->tbl[vtargs->pos-1];
vtable_pop(vtargs, !!block + !!kw_rest_arg); vtable_pop(vtargs, !!block + !!kw_rest_arg);
required_kw_vars = kw_vars = &vtargs->tbl[vtargs->pos]; required_kw_vars = kw_vars = &vtargs->tbl[vtargs->pos];
while (kwn) { while (kwn) {
if (!NODE_REQUIRED_KEYWORD_P(RNODE_LASGN(RNODE_KW_ARG(kwn)->nd_body))) if (!NODE_REQUIRED_KEYWORD_P(RNODE_LASGN(kwn->nd_body)))
--kw_vars; --kw_vars;
--required_kw_vars; --required_kw_vars;
kwn = RNODE_KW_ARG(kwn)->nd_next; kwn = kwn->nd_next;
} }
for (kwn = kw_args; kwn; kwn = RNODE_KW_ARG(kwn)->nd_next) { for (kwn = kw_args; kwn; kwn = kwn->nd_next) {
ID vid = RNODE_LASGN(RNODE_KW_ARG(kwn)->nd_body)->nd_vid; ID vid = RNODE_LASGN(kwn->nd_body)->nd_vid;
if (NODE_REQUIRED_KEYWORD_P(RNODE_LASGN(RNODE_KW_ARG(kwn)->nd_body))) { if (NODE_REQUIRED_KEYWORD_P(RNODE_LASGN(kwn->nd_body))) {
*required_kw_vars++ = vid; *required_kw_vars++ = vid;
} }
else { else {

8
rubyparser.h
Просмотреть файл

@ -743,14 +743,14 @@ typedef struct RNode_OPT_ARG {
NODE node; NODE node;
struct RNode *nd_body; struct RNode *nd_body;
struct RNode *nd_next; struct RNode_OPT_ARG *nd_next;
} rb_node_opt_arg_t; } rb_node_opt_arg_t;
typedef struct RNode_KW_ARG { typedef struct RNode_KW_ARG {
NODE node; NODE node;
struct RNode *nd_body; struct RNode *nd_body;
struct RNode *nd_next; struct RNode_KW_ARG *nd_next;
} rb_node_kw_arg_t; } rb_node_kw_arg_t;
typedef struct RNode_POSTARG { typedef struct RNode_POSTARG {
@ -1133,10 +1133,10 @@ struct rb_args_info {
ID rest_arg; ID rest_arg;
ID block_arg; ID block_arg;
NODE *kw_args; struct RNode_KW_ARG *kw_args;
NODE *kw_rest_arg; NODE *kw_rest_arg;
NODE *opt_args; struct RNode_OPT_ARG *opt_args;
unsigned int no_kwarg: 1; unsigned int no_kwarg: 1;
unsigned int ruby2_keywords: 1; unsigned int ruby2_keywords: 1;
unsigned int forwarding: 1; unsigned int forwarding: 1;