summaryrefslogtreecommitdiffhomepage
path: root/src/vm.c
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-08-05 17:08:35 +0900
committerYukihiro Matsumoto <[email protected]>2012-08-05 17:08:35 +0900
commit722c53c5607f1986b5dd7d9d19e4be7a2ba63954 (patch)
tree3d99c78dc497ba276e3b63fa764f02b01b081729 /src/vm.c
parent7c4bd7fffd66aff4e2c119421f6673323ac777a1 (diff)
parent84acfa89fa5d66f1db84d294be111d312874f3e8 (diff)
downloadmruby-722c53c5607f1986b5dd7d9d19e4be7a2ba63954.tar.gz
mruby-722c53c5607f1986b5dd7d9d19e4be7a2ba63954.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/vm.c')
-rw-r--r--src/vm.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/vm.c b/src/vm.c
index be6ee3944..cbea3ee77 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -905,13 +905,13 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
if (lv == 0) stack = regs + 1;
else {
struct REnv *e = uvenv(mrb, lv-1);
- if (!e) {
- mrb_value exc;
- static const char m[] = "super called outside of method";
- exc = mrb_exc_new(mrb, E_NOMETHOD_ERROR, m, sizeof(m) - 1);
- mrb->exc = (struct RObject*)mrb_object(exc);
- goto L_RAISE;
- }
+ if (!e) {
+ mrb_value exc;
+ static const char m[] = "super called outside of method";
+ exc = mrb_exc_new(mrb, E_NOMETHOD_ERROR, m, sizeof(m) - 1);
+ mrb->exc = (struct RObject*)mrb_object(exc);
+ goto L_RAISE;
+ }
stack = e->stack + 1;
}
if (r == 0) {
@@ -1598,9 +1598,10 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
CASE(OP_TCLASS) {
/* A B R(A) := target_class */
if (!mrb->ci->target_class) {
- mrb_value exc = mrb_exc_new(mrb, E_TYPE_ERROR, "no target class or module", 25);
- mrb->exc = (struct RObject*)mrb_object(exc);
- goto L_RAISE;
+ static const char msg[] = "no target class or module";
+ mrb_value exc = mrb_exc_new(mrb, E_TYPE_ERROR, msg, sizeof(msg) - 1);
+ mrb->exc = (struct RObject*)mrb_object(exc);
+ goto L_RAISE;
}
regs[GETARG_A(i)] = mrb_obj_value(mrb->ci->target_class);
NEXT;