summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--mrbgems/mruby-enumerator/mrblib/enumerator.rb4
-rw-r--r--src/vm.c1
-rw-r--r--test/driver.c6
3 files changed, 6 insertions, 5 deletions
diff --git a/mrbgems/mruby-enumerator/mrblib/enumerator.rb b/mrbgems/mruby-enumerator/mrblib/enumerator.rb
index 1494c02c5..053b15c2c 100644
--- a/mrbgems/mruby-enumerator/mrblib/enumerator.rb
+++ b/mrbgems/mruby-enumerator/mrblib/enumerator.rb
@@ -118,7 +118,7 @@ class Enumerator
end
@obj = obj
- @meth = meth
+ @meth = meth.to_sym
@args = args.dup
@fib = nil
@dst = nil
@@ -609,7 +609,7 @@ module Kernel
end
module Enumerable
- # use Enumerator to use inifite sequence
+ # use Enumerator to use infinite sequence
def zip(*arg)
ary = []
arg = arg.map{|a|a.each}
diff --git a/src/vm.c b/src/vm.c
index ca1def05f..ad26d9b8c 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -460,6 +460,7 @@ mrb_f_send(mrb_state *mrb, mrb_value self)
ci->mid = name;
ci->target_class = c;
ci->proc = p;
+ ci->nregs = p->body.irep->nregs;
regs = mrb->c->stack+1;
/* remove first symbol from arguments */
if (ci->argc >= 0) {
diff --git a/test/driver.c b/test/driver.c
index 2af1680f4..bcac73d25 100644
--- a/test/driver.c
+++ b/test/driver.c
@@ -32,8 +32,8 @@ check_error(mrb_state *mrb)
{
/* Error check */
/* $ko_test and $kill_test should be 0 */
- mrb_value ko_test = mrb_gv_get(mrb, mrb_intern(mrb, "$ko_test", 8));
- mrb_value kill_test = mrb_gv_get(mrb, mrb_intern(mrb, "$kill_test", 10));
+ mrb_value ko_test = mrb_gv_get(mrb, mrb_intern_lit(mrb, "$ko_test"));
+ mrb_value kill_test = mrb_gv_get(mrb, mrb_intern_lit(mrb, "$kill_test"));
return mrb_fixnum_p(ko_test) && mrb_fixnum(ko_test) == 0 && mrb_fixnum_p(kill_test) && mrb_fixnum(kill_test) == 0;
}
@@ -100,7 +100,7 @@ main(int argc, char **argv)
if (argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v') {
printf("verbose mode: enable\n\n");
- mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_verbose", 16), mrb_true_value());
+ mrb_gv_set(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"), mrb_true_value());
}
krn = mrb->kernel_module;