summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2012-06-03 09:38:39 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2012-06-03 09:38:39 -0700
commit0719f523048ecd6da1d28e4b2eba7794e419dd36 (patch)
treeedaae964c3e43ed52b21b009aee22860d87ff5fb /src
parent7009a1d8f5271fcd0b06a86645ad28e40c2bc5d9 (diff)
parent0c2d74020a925fa86235ae7c716aa0ede856e6e6 (diff)
downloadmruby-0719f523048ecd6da1d28e4b2eba7794e419dd36.tar.gz
mruby-0719f523048ecd6da1d28e4b2eba7794e419dd36.zip
Merge pull request #240 from bovi/superclass-improvement
Class#superclass improvement
Diffstat (limited to 'src')
-rw-r--r--src/class.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/class.c b/src/class.c
index c689552f5..594ed08bc 100644
--- a/src/class.c
+++ b/src/class.c
@@ -822,10 +822,16 @@ mrb_class_new_class(mrb_state *mrb, mrb_value cv)
mrb_value
mrb_class_superclass(mrb_state *mrb, mrb_value klass)
{
- struct RClass *c, *s;
+ struct RClass *c;
+ mrb_value superclass;
+
c = mrb_class_ptr(klass);
- s = mrb_class_real(c->super);
- return mrb_obj_value(s);
+ if (c->super)
+ superclass = mrb_obj_value(mrb_class_real(c->super));
+ else
+ superclass = mrb_nil_value();
+
+ return superclass;
}
static mrb_value