Refactor argument parsting

zhulik · Aug 7, 2024 · 8e48ca2 · 8e48ca2
1 parent 8a3b6f3
commit 8e48ca2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/gruby.go b/gruby.go
@@ -15,7 +15,7 @@ type GRuby struct {
 	state *C.mrb_state
 
 	loadedFiles       map[string]bool
-	getArgAccumulator []C.mrb_value
+	getArgAccumulator []Value
 
 	methods methodsStore
 
@@ -28,7 +28,7 @@ type GRuby struct {
 func goGetArgAppend(state *C.mrb_state, v C.mrb_value) {
 	grb := states.Get(state)
 
-	grb.getArgAccumulator = append(grb.getArgAccumulator, v)
+	grb.getArgAccumulator = append(grb.getArgAccumulator, grb.value(v))
 }
 
 // GetGlobalVariable returns the value of the global variable by the given name.
@@ -64,7 +64,7 @@ func New() *GRuby {
 			grb:     nil,
 			classes: classMethodMap{},
 		},
-		getArgAccumulator: make([]C.mrb_value, 0, C._go_get_max_funcall_args()),
+		getArgAccumulator: make([]Value, 0, C._go_get_max_funcall_args()),
 		trueV:             nil,
 		falseV:            nil,
 		nilV:              nil,
@@ -190,7 +190,7 @@ func (g *GRuby) FullGC() {
 // called function (currently on the stack).
 func (g *GRuby) GetArgs() []Value {
 	// Clear reset the accumulator to zero length
-	g.getArgAccumulator = make([]C.mrb_value, 0, C._go_get_max_funcall_args())
+	g.getArgAccumulator = make([]Value, 0, C._go_get_max_funcall_args())
 
 	// Get all the arguments and put it into our accumulator
 	count := C._go_mrb_get_args_all(g.state)
@@ -199,7 +199,7 @@ func (g *GRuby) GetArgs() []Value {
 	values := make([]Value, count)
 
 	for i := range int(count) {
-		values[i] = g.value(g.getArgAccumulator[i])
+		values[i] = g.getArgAccumulator[i]
 	}
 
 	return values
@@ -413,7 +413,7 @@ func (g *GRuby) TopSelf() Value {
 
 // FalseValue returns a Value for "false"
 func (g *GRuby) FalseValue() Value {
-	return g.falseV // TODO: const?
+	return g.falseV
 }
 
 // NilValue returns "nil"

diff --git a/gruby_test.go b/gruby_test.go
@@ -618,7 +618,6 @@ func TestStackedException(t *testing.T) {
 
 	grb.TopSelf().SingletonClass().DefineMethod("myeval", evalFunc, gruby.ArgsBlock())
 
-	// TODO: fix me and enable back
 	result, err := grb.LoadString("myeval { raise 'foo' }")
 	g.Expect(err).To(HaveOccurred())
 	g.Expect(result).To(BeNil())

diff --git a/methods.go b/methods.go
@@ -9,9 +9,8 @@ type (
 )
 
 type methodsStore struct {
-	grb               *GRuby
-	classes           classMethodMap
-	getArgAccumulator []C.mrb_value
+	grb     *GRuby
+	classes classMethodMap
 }
 
 func (s *methodsStore) add(class *C.struct_RClass, name string, callback Func) {

diff --git a/value.go b/value.go
@@ -78,7 +78,7 @@ func (v *GValue) call(method string, args []Value, block Value) (Value, error) {
 	var argvPtr *C.mrb_value
 
 	if len(args) > 0 {
-		// Make the raw byte slice to hold our arguments we'll pass to C
+		// Make the raw byte slice to hold our arguments we'll pass to C*C.mrb
 		argv = make([]C.mrb_value, len(args))
 		for i, arg := range args {
 			argv[i] = arg.CValue()