Add InheritClass for includeClassNew

allocate.go

@@ -20,6 +20,16 @@ func (mrb *State) AllocSingletonClass() *SingletonClass {
 	}
 }
 
+func (mrb *State) AllocInheritClass() *InheritClass {
+	return &InheritClass{
+		class: class{
+			Object: Object{
+				class: mrb.ClassClass,
+			},
+		},
+	}
+}
+
 func (mrb *State) AllocModule() *Module {
 	return &Module{
 		class: class{

class.go

@@ -21,7 +21,10 @@ var _ RClass = &SingletonClass{}
 type RClass interface {
 	RObject
 	Super() RClass
+	setClass(RClass)
 	setSuper(RClass)
+	getMethodTable() methodTable
+	setMethodTable(methodTable)
 	mtPut(Symbol, Method)
 	mtGet(Symbol) Method
 }
@@ -41,6 +44,10 @@ type SingletonClass struct {
 	class
 }
 
+type InheritClass struct {
+	class
+}
+
 func (mrb *State) Class(v Value) RClass {
 	switch v := v.(type) {
 	case RObject:
@@ -178,7 +185,20 @@ func (mrb *State) prepareSingletonClass(obj RObject) error {
 }
 
 func (mrb *State) includeClassNew(module, super RClass) RClass {
-	ic := mrb.AllocClass()
+	ic := mrb.AllocInheritClass()
+	if _, isIClass := module.(*InheritClass); isIClass {
+		module = module.Class()
+	}
+
+	module = findOrigin(module)
+	ic.setMethodTable(module.getMethodTable())
+	ic.setSuper(super)
+
+	if _, isIClass := module.(*InheritClass); isIClass {
+		ic.setClass(module.Class())
+	} else {
+		ic.setClass(module)
+	}
 
 	return ic
 }
@@ -239,6 +259,18 @@ func (c *class) setSuper(super RClass) {
 	c.super = super
 }
 
+func (c *class) setClass(class RClass) {
+	c.class = class
+}
+
+func (c *class) getMethodTable() methodTable {
+	return c.mt
+}
+
+func (c *class) setMethodTable(mt methodTable) {
+	c.mt = mt
+}
+
 func (c *class) ivPut(sym Symbol, val Value) {
 	if c.iv == nil {
 		c.iv = make(iv)