Define module class and class class

elct9620 · Dec 14, 2023 · 6dcb2af · 6dcb2af
1 parent 122dbc1
commit 6dcb2af
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/class.go b/class.go
@@ -2,6 +2,7 @@ package mruby
 
 type MethodTable map[string]*Method
 type RClass struct {
+	RBasic
 	super *RClass
 	mt    MethodTable
 }
@@ -55,6 +56,15 @@ func (mrb *State) FindMethod(recv Value, class *RClass, mid string) *Method {
 }
 
 func initClass(mrb *State) {
-	mrb.basicObject = newClass(mrb, nil)
-	mrb.objectClass = newClass(mrb, mrb.basicObject)
+	basicObject := newClass(mrb, nil)
+	objectClass := newClass(mrb, basicObject)
+	mrb.objectClass = objectClass
+	moduleClass := newClass(mrb, mrb.objectClass)
+	mrb.moduleClass = moduleClass
+	classClass := newClass(mrb, mrb.moduleClass)
+	mrb.classClass = classClass
+
+	basicObject.class = classClass
+	objectClass.class = classClass
+	moduleClass.class = classClass
 }
diff --git a/mruby.go b/mruby.go
@@ -26,10 +26,11 @@ type callinfo struct {
 type State struct {
 	context *context
 
-	basicObject *RClass
+	objectClass *RClass
+	moduleClass *RClass
+	classClass  *RClass
 	falseClass  *RClass
 	trueClass   *RClass
-	objectClass *RClass
 
 	topSelf *RObject
 }

diff --git a/object.go b/object.go
@@ -3,6 +3,7 @@ package mruby
 import "fmt"
 
 type RBasic struct {
+	class *RClass
 }
 
 type RObject struct {