diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 30 | ||||
| -rw-r--r-- | src/kernel.c | 4 | ||||
| -rw-r--r-- | src/parse.y | 2 | ||||
| -rw-r--r-- | src/vm.c | 2 |
4 files changed, 32 insertions, 6 deletions
diff --git a/src/class.c b/src/class.c index 4e2af8e99..a07cf17e4 100644 --- a/src/class.c +++ b/src/class.c @@ -380,6 +380,7 @@ to_hash(mrb_state *mrb, mrb_value val) string mruby type C type note ---------------------------------------------------------------------------------------------- o: Object [mrb_value] + C: class/module [mrb_value] S: String [mrb_value] A: Array [mrb_value] H: Hash [mrb_value] @@ -434,6 +435,29 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) } } break; + case 'C': + { + mrb_value *p; + + p = va_arg(ap, mrb_value*); + if (i < argc) { + mrb_value ss; + + ss = *sp++; + switch (mrb_type(ss)) { + case MRB_TT_CLASS: + case MRB_TT_MODULE: + case MRB_TT_SCLASS: + break; + default: + mrb_raisef(mrb, E_TYPE_ERROR, "%S is not class/module", ss); + break; + } + *p = ss; + i++; + } + } + break; case 'S': { mrb_value *p; @@ -732,7 +756,7 @@ mrb_mod_append_features(mrb_state *mrb, mrb_value mod) mrb_value klass; mrb_check_type(mrb, mod, MRB_TT_MODULE); - mrb_get_args(mrb, "o", &klass); + mrb_get_args(mrb, "C", &klass); mrb_include_module(mrb, mrb_class_ptr(klass), mrb_class_ptr(mod)); return mod; } @@ -780,7 +804,7 @@ mrb_mod_include_p(mrb_state *mrb, mrb_value mod) mrb_value mod2; struct RClass *c = mrb_class_ptr(mod); - mrb_get_args(mrb, "o", &mod2); + mrb_get_args(mrb, "C", &mod2); mrb_check_type(mrb, mod2, MRB_TT_MODULE); while (c) { @@ -1059,7 +1083,7 @@ mrb_class_new_class(mrb_state *mrb, mrb_value cv) mrb_value super, blk; mrb_value new_class; - if (mrb_get_args(mrb, "|o&", &super, &blk) == 0) { + if (mrb_get_args(mrb, "|C&", &super, &blk) == 0) { super = mrb_obj_value(mrb->object_class); } new_class = mrb_obj_value(mrb_class_new(mrb, mrb_class_ptr(super))); diff --git a/src/kernel.c b/src/kernel.c index 05ad37fa7..f07fbbab1 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -542,7 +542,7 @@ obj_is_instance_of(mrb_state *mrb, mrb_value self) mrb_value arg; mrb_bool instance_of_p; - mrb_get_args(mrb, "o", &arg); + mrb_get_args(mrb, "C", &arg); instance_of_p = mrb_obj_is_instance_of(mrb, self, mrb_class_ptr(arg)); return mrb_bool_value(instance_of_p); @@ -715,7 +715,7 @@ mrb_obj_is_kind_of_m(mrb_state *mrb, mrb_value self) mrb_value arg; mrb_bool kind_of_p; - mrb_get_args(mrb, "o", &arg); + mrb_get_args(mrb, "C", &arg); kind_of_p = mrb_obj_is_kind_of(mrb, self, mrb_class_ptr(arg)); return mrb_bool_value(kind_of_p); diff --git a/src/parse.y b/src/parse.y index 7cac9b0c5..3ffc683f9 100644 --- a/src/parse.y +++ b/src/parse.y @@ -37,6 +37,7 @@ static void yyerror(parser_state *p, const char *s); static void yywarn(parser_state *p, const char *s); static void yywarning(parser_state *p, const char *s); static void backref_error(parser_state *p, node *n); +static void tokadd(parser_state *p, int c); #ifndef isascii #define isascii(c) (((c) & ~0x7f) == 0) @@ -3338,6 +3339,7 @@ nextc(parser_state *p) if (cxt->partial_hook(p) < 0) return -1; p->cxt = NULL; + tokadd(p, '\n'); c = nextc(p); p->cxt = cxt; return c; @@ -595,7 +595,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) if (!mrb->c->stack) { stack_init(mrb); } - stack_extend(mrb, irep->nregs, irep->nregs); + stack_extend(mrb, irep->nregs, mrb->c->ci->argc + 2); /* argc + 2 (receiver and block) */ mrb->c->ci->err = pc; mrb->c->ci->proc = proc; mrb->c->ci->nregs = irep->nregs + 1; |