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

vm_insnhelper.c: keyword hash functions

Browse source 
* vm_insnhelper.c (rb_extract_keywords, rb_check_keyword_opthash):
  extract from vm_callee_setup_keyword_arg.

* class.c (rb_scan_args): check if keys of keyword hash are symbols.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-11-30 12:22:17 +00:00
parent adf511efc6
commit c683096c90
3 changed files with 45 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
class.c
View file

@ -1786,8 +1786,11 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
} }
else { else {
hash = rb_check_hash_type(last); hash = rb_check_hash_type(last);
if (!NIL_P(hash)) if (!NIL_P(hash)) {
argc--; VALUE opts = rb_extract_keywords(&hash);
if (!hash) argc--;
hash = opts;
}
} }
} }
/* capture leading mandatory arguments */ /* capture leading mandatory arguments */

2
internal.h
View file

@ -758,6 +758,8 @@ VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv
/* vm_insnhelper.c */ /* vm_insnhelper.c */
VALUE rb_equal_opt(VALUE obj1, VALUE obj2); VALUE rb_equal_opt(VALUE obj1, VALUE obj2);
void rb_check_keyword_opthash(VALUE keyword_hash, const ID *table, int required, int optional);
VALUE rb_extract_keywords(VALUE *orighash);
/* vm_method.c */ /* vm_method.c */
void Init_eval_method(void); void Init_eval_method(void);

73
vm_insnhelper.c
View file

@ -152,14 +152,14 @@ keyword_error(const char *error, VALUE keys)
rb_raise(rb_eArgError, "%s keyword%s: %"PRIsVALUE, error, msg, keys); rb_raise(rb_eArgError, "%s keyword%s: %"PRIsVALUE, error, msg, keys);
} }
NORETURN(static void unknown_keyword_error(const rb_iseq_t *iseq, VALUE hash)); NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keywords));
static void static void
unknown_keyword_error(const rb_iseq_t *iseq, VALUE hash) unknown_keyword_error(VALUE hash, const ID *table, int keywords)
{ {
VALUE keys; VALUE keys;
int i; int i;
for (i = 0; i < iseq->arg_keywords; i++) { for (i = 0; i < keywords; i++) {
rb_hash_delete(hash, ID2SYM(iseq->arg_keyword_table[i])); rb_hash_delete(hash, ID2SYM(table[i]));
} }
keys = rb_funcall(hash, rb_intern("keys"), 0, 0); keys = rb_funcall(hash, rb_intern("keys"), 0, 0);
if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword"); if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword");
@ -1098,8 +1098,8 @@ separate_symbol(st_data_t key, st_data_t value, st_data_t arg)
return ST_CONTINUE; return ST_CONTINUE;
} }
static VALUE VALUE
extract_keywords(VALUE *orighash) rb_extract_keywords(VALUE *orighash)
{ {
VALUE parthash[2] = {0, 0}; VALUE parthash[2] = {0, 0};
VALUE hash = *orighash; VALUE hash = *orighash;
@ -1113,50 +1113,53 @@ extract_keywords(VALUE *orighash)
return parthash[0]; return parthash[0];
} }
void
rb_check_keyword_opthash(VALUE keyword_hash, const ID *table, int required, int optional)
{
int i = 0, j;
VALUE missing = Qnil;
if (required) {
for (; i < required; i++) {
VALUE keyword = ID2SYM(table[i]);
if (keyword_hash && st_lookup(rb_hash_tbl_raw(keyword_hash), (st_data_t)keyword, 0))
continue;
if (NIL_P(missing)) missing = rb_ary_tmp_new(1);
rb_ary_push(missing, keyword);
}
if (!NIL_P(missing)) {
keyword_error("missing", missing);
}
}
if (optional && keyword_hash) {
for (j = i, i = 0; i < optional; i++) {
if (st_lookup(rb_hash_tbl_raw(keyword_hash), ID2SYM(table[required+i]), 0)) j++;
}
if (RHASH_SIZE(keyword_hash) > (unsigned int)j) {
unknown_keyword_error(keyword_hash, table, required+optional);
}
}
}
static inline int static inline int
vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, int m, VALUE *orig_argv, VALUE *kwd) vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, int m, VALUE *orig_argv, VALUE *kwd)
{ {
VALUE keyword_hash, orig_hash; VALUE keyword_hash, orig_hash;
int i, j;
if (argc > m && if (argc > m &&
!NIL_P(orig_hash = rb_check_hash_type(orig_argv[argc-1])) && !NIL_P(orig_hash = rb_check_hash_type(orig_argv[argc-1])) &&
(keyword_hash = extract_keywords(&orig_hash)) != 0) { (keyword_hash = rb_extract_keywords(&orig_hash)) != 0) {
if (!orig_hash) { if (!orig_hash) {
argc--; argc--;
} }
else { else {
orig_argv[argc-1] = orig_hash; orig_argv[argc-1] = orig_hash;
} }
i = 0; rb_check_keyword_opthash(keyword_hash, iseq->arg_keyword_table, iseq->arg_keyword_required,
if (iseq->arg_keyword_required) { iseq->arg_keyword_check ? iseq->arg_keywords - iseq->arg_keyword_required : 0);
VALUE missing = Qnil;
for (; i < iseq->arg_keyword_required; i++) {
VALUE keyword = ID2SYM(iseq->arg_keyword_table[i]);
if (st_lookup(rb_hash_tbl_raw(keyword_hash), (st_data_t)keyword, 0))
continue;
if (NIL_P(missing)) missing = rb_ary_tmp_new(1);
rb_ary_push(missing, keyword);
}
if (!NIL_P(missing)) {
keyword_error("missing", missing);
}
}
if (iseq->arg_keyword_check) {
for (j = i; i < iseq->arg_keywords; i++) {
if (st_lookup(rb_hash_tbl_raw(keyword_hash), ID2SYM(iseq->arg_keyword_table[i]), 0)) j++;
}
if (RHASH_SIZE(keyword_hash) > (unsigned int)j) {
unknown_keyword_error(iseq, keyword_hash);
}
}
} }
else if (iseq->arg_keyword_required) { else if (iseq->arg_keyword_required) {
VALUE missing = rb_ary_tmp_new(iseq->arg_keyword_required); rb_check_keyword_opthash(0, iseq->arg_keyword_table, iseq->arg_keyword_required, 0);
for (i = 0; i < iseq->arg_keyword_required; i++) {
rb_ary_push(missing, ID2SYM(iseq->arg_keyword_table[i]));
}
keyword_error("missing", missing);
} }
else { else {
keyword_hash = rb_hash_new(); keyword_hash = rb_hash_new();