From 005cacf18b8ce2cf854872aa8cb803819478a47d Mon Sep 17 00:00:00 2001
From: Corey Powell <mistdragon100@gmail.com>
Date: Sat, 11 Jul 2015 11:15:18 +0200
Subject: Additional patches to make this work

---
 src/kernel.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/kernel.c')

diff --git a/src/kernel.c b/src/kernel.c
index b5b13f874..bafab6e76 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -248,6 +248,11 @@ mrb_singleton_class_clone(mrb_state *mrb, mrb_value obj)
       clone->c = mrb_singleton_class_clone(mrb, mrb_obj_value(klass));
     }
 
+    if (klass->origin != klass)
+      clone->origin = klass->origin;
+    else
+      clone->origin = clone;
+
     clone->super = klass->super;
     if (klass->iv) {
       mrb_iv_copy(mrb, mrb_obj_value(clone), mrb_obj_value(klass));
@@ -269,6 +274,13 @@ copy_class(mrb_state *mrb, mrb_value dst, mrb_value src)
 {
   struct RClass *dc = mrb_class_ptr(dst);
   struct RClass *sc = mrb_class_ptr(src);
+  /* if the origin is not the same as the class, then the origin and
+     the current class need to be copied */
+  if (sc->origin != sc) {
+    dc->origin = mrb_class_ptr(mrb_obj_dup(mrb, mrb_obj_value(sc->origin)));
+  } else {
+    dc->origin = dc;
+  }
   dc->mt = kh_copy(mt, mrb, sc->mt);
   dc->super = sc->super;
 }
-- 
cgit v1.2.3


From a725cb909333335ad178997795e84c332e555c65 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik <blaz.hrast@gmail.com>
Date: Sun, 12 Jul 2015 22:07:16 +0200
Subject: Include prepended methods in the instance_methods list.

---
 src/kernel.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/kernel.c')

diff --git a/src/kernel.c b/src/kernel.c
index bafab6e76..36ad683ee 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -653,13 +653,19 @@ mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* kl
 {
   khint_t i;
   mrb_value ary;
+  mrb_bool prepended;
   struct RClass* oldklass;
   khash_t(st)* set = kh_init(st, mrb);
 
+  if (!recur && klass->origin != klass) {
+    klass = klass->origin;
+    prepended = 1;
+  }
+
   oldklass = 0;
   while (klass && (klass != oldklass)) {
     method_entry_loop(mrb, klass, set);
-    if ((klass->tt == MRB_TT_ICLASS) ||
+    if ((klass->tt == MRB_TT_ICLASS && !prepended) ||
         (klass->tt == MRB_TT_SCLASS)) {
     }
     else {
-- 
cgit v1.2.3