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 remote-tracking branch 'upstream/master' into mrbgems

Browse Source
This commit is contained in:
Daniel Bovensiepen
2012-11-22 16:14:54 +08:00
parent 953cbff65c 276b77021f
commit c794d1c46b
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+17 -3
View File
@@ -151,14 +151,27 @@ uvset(mrb_state *mrb, int up, int idx, mrb_value v)
mrb_write_barrier(mrb, (struct RBasic*)e);
}
static inline int
is_strict(mrb_state *mrb, struct REnv *e)
{
int cioff = e->cioff;
if (cioff >= 0 && mrb->cibase[cioff].proc &&
MRB_PROC_STRICT_P(mrb->cibase[cioff].proc)) {
return 1;
}
return 0;
}
struct REnv*
top_env(struct RProc *proc)
top_env(mrb_state *mrb, struct RProc *proc)
{
struct REnv *e = proc->env;
if (is_strict(mrb, e)) return e;
while (e->c) {
if (!e) return 0;
e = (struct REnv*)e->c;
if (is_strict(mrb, e)) return e;
}
return e;
}
@@ -1165,8 +1178,9 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
break;
case OP_R_RETURN:
if (!proc->env) goto NORMAL_RETURN;
if (MRB_PROC_STRICT_P(proc)) goto NORMAL_RETURN;
else {
struct REnv *e = top_env(proc);
struct REnv *e = top_env(mrb, proc);
if (e->cioff < 0) {
localjump_error(mrb, "return");
test/t/float.rb
+1 -1
View File
@@ -105,7 +105,7 @@ assert('Float#round', '15.2.9.3.12') do
i = 3.423456789.round(3)
a == 3 and b == 4 and c == 3 and d == -3 and e == -4 and
f == 12350 and g == 3 and h == 3.4 and i == 3.423
f == 12350 and g == 3 and check_float(h, 3.4) and check_float(i, 3.423)
end
assert('Float#to_f', '15.2.9.3.13') do