admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1675 from h2so5/node-splat-codegen

Browse Source 
fix NODE_SPLAT codegen
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-01-31 20:30:18 -08:00
parent e12250032f b53d91e6e2
commit 857e3cfa7c
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
-17
View File
@@ -1192,22 +1192,6 @@ mrb_ary_eql(mrb_state *mrb, mrb_value ary1)
return mrb_true_value();
}
static mrb_value
mrb_ary_ceqq(mrb_state *mrb, mrb_value ary)
{
mrb_value v;
mrb_int i, len;
mrb_sym eqq = mrb_intern_lit(mrb, "===");
mrb_get_args(mrb, "o", &v);
len = RARRAY_LEN(ary);
for (i=0; i<len; i++) {
mrb_value c = mrb_funcall_argv(mrb, ary_elt(ary, i), eqq, 1, &v);
if (mrb_test(c)) return mrb_true_value();
}
return mrb_false_value();
}
void
mrb_init_array(mrb_state *mrb)
{
@@ -1250,5 +1234,4 @@ mrb_init_array(mrb_state *mrb)
mrb_define_method(mrb, a, "==", mrb_ary_equal, MRB_ARGS_REQ(1)); /* 15.2.12.5.33 (x) */
mrb_define_method(mrb, a, "eql?", mrb_ary_eql, MRB_ARGS_REQ(1)); /* 15.2.12.5.34 (x) */
mrb_define_method(mrb, a, "<=>", mrb_ary_cmp, MRB_ARGS_REQ(1)); /* 15.2.12.5.36 (x) */
mrb_define_method(mrb, a, "__case_eqq", mrb_ary_ceqq, MRB_ARGS_REQ(1)); /* internal */
}
src/codegen.c
+1 -8
View File
@@ -1515,14 +1515,7 @@ codegen(codegen_scope *s, node *tree, int val)
break;
case NODE_SPLAT:
{
int idx = new_msym(s, mrb_intern_lit(s->mrb, "to_a"));
codegen(s, tree, VAL);
pop();
genop(s, MKOP_ABC(OP_SEND, cursp(), idx, 0));
push();
}
codegen(s, tree, VAL);
break;
case NODE_ASGN:
src/kernel.c
+18
View File
@@ -1108,6 +1108,23 @@ mrb_obj_singleton_methods_m(mrb_state *mrb, mrb_value self)
return mrb_obj_singleton_methods(mrb, recur, self);
}
static mrb_value
mrb_obj_ceqq(mrb_state *mrb, mrb_value self)
{
mrb_value v;
mrb_int i, len;
mrb_sym eqq = mrb_intern_lit(mrb, "===");
mrb_value ary = mrb_ary_splat(mrb, self);
mrb_get_args(mrb, "o", &v);
len = RARRAY_LEN(ary);
for (i=0; i<len; i++) {
mrb_value c = mrb_funcall_argv(mrb, mrb_ary_entry(ary, i), eqq, 1, &v);
if (mrb_test(c)) return mrb_true_value();
}
return mrb_false_value();
}
void
mrb_init_kernel(mrb_state *mrb)
{
@@ -1159,6 +1176,7 @@ mrb_init_kernel(mrb_state *mrb)
mrb_define_method(mrb, krn, "send", mrb_f_send, MRB_ARGS_ANY()); /* 15.3.1.3.44 */
mrb_define_method(mrb, krn, "singleton_methods", mrb_obj_singleton_methods_m, MRB_ARGS_OPT(1)); /* 15.3.1.3.45 */
mrb_define_method(mrb, krn, "to_s", mrb_any_to_s, MRB_ARGS_NONE()); /* 15.3.1.3.46 */
mrb_define_method(mrb, krn, "__case_eqq", mrb_obj_ceqq, MRB_ARGS_REQ(1)); /* internal */
mrb_include_module(mrb, mrb->object_class, mrb->kernel_module);
mrb_alias_method(mrb, mrb->module_class, mrb_intern_lit(mrb, "dup"), mrb_intern_lit(mrb, "clone"));