summaryrefslogtreecommitdiffhomepage
path: root/src/vm.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-07-27 02:53:02 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-07-27 02:53:02 +0900
commite488393cbbdd4fd123d71c6c3bd067f1eee5c37a (patch)
treebcdb115f19288cfb5f4af14493c350233b29350f /src/vm.c
parent63e5a3cfb10e238eaab2a77bcc83acd0d41e60fa (diff)
parentf6d686eae0fce7d93426e0eb188cdc9658dfee75 (diff)
downloadmruby-e488393cbbdd4fd123d71c6c3bd067f1eee5c37a.tar.gz
mruby-e488393cbbdd4fd123d71c6c3bd067f1eee5c37a.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/vm.c')
-rw-r--r--src/vm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm.c b/src/vm.c
index d4ab1af46..3cdf57551 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -92,12 +92,12 @@ stack_init(mrb_state *mrb)
{
struct mrb_context *c = mrb->c;
- /* assert(mrb->stack == NULL); */
+ /* mrb_assert(mrb->stack == NULL); */
c->stbase = (mrb_value *)mrb_calloc(mrb, STACK_INIT_SIZE, sizeof(mrb_value));
c->stend = c->stbase + STACK_INIT_SIZE;
c->stack = c->stbase;
- /* assert(ci == NULL); */
+ /* mrb_assert(ci == NULL); */
c->cibase = (mrb_callinfo *)mrb_calloc(mrb, CALLINFO_INIT_SIZE, sizeof(mrb_callinfo));
c->ciend = c->cibase + CALLINFO_INIT_SIZE;
c->ci = c->cibase;
@@ -544,7 +544,7 @@ void mrb_gv_val_set(mrb_state *mrb, mrb_sym sym, mrb_value val);
mrb_value
mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
{
- /* assert(mrb_proc_cfunc_p(proc)) */
+ /* mrb_assert(mrb_proc_cfunc_p(proc)) */
mrb_irep *irep = proc->body.irep;
mrb_code *pc = irep->iseq;
mrb_value *pool = irep->pool;