summaryrefslogtreecommitdiffhomepage
path: root/src/vm.c
diff options
context:
space:
mode:
authorMasaki Muranaka <[email protected]>2012-08-04 19:54:21 +0900
committerMasaki Muranaka <[email protected]>2012-08-04 19:54:21 +0900
commitb231bcb812c586d5823ea4d5dd4df12da5a237b1 (patch)
treebe4b2e3eff82565e82c3780484dd1df2599e4e60 /src/vm.c
parent472d214a71f69fe25e681d9fea6a04fa12e60fb0 (diff)
downloadmruby-b231bcb812c586d5823ea4d5dd4df12da5a237b1.tar.gz
mruby-b231bcb812c586d5823ea4d5dd4df12da5a237b1.zip
load_exec(): Fix message lenghtes in mrb_exc_new().
mrb_run(): Fix not to use a magic number but sizeof.
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;