Remove duplicated dereferences

antonmedv · antonmedv · commit 2bc0eed148d3 · 2025-03-10T13:52:54.000+01:00
diff --git a/builtin/builtin.go b/builtin/builtin.go
@@ -644,11 +644,11 @@ var Builtins = []*Function{
 			if len(args) != 2 {
 				return nil, fmt.Errorf("invalid number of arguments (expected 2, got %d)", len(args))
 			}
-			v := deref.ValueOf(args[0])
+			v := reflect.ValueOf(args[0])
 			if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
 				return nil, fmt.Errorf("cannot take from %s", v.Kind())
 			}
-			n := deref.ValueOf(args[1])
+			n := reflect.ValueOf(args[1])
 			if !n.CanInt() {
 				return nil, fmt.Errorf("cannot take %s elements", n.Kind())
 			}
@@ -683,7 +683,7 @@ var Builtins = []*Function{
 			if len(args) != 1 {
 				return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))
 			}
-			v := deref.ValueOf(args[0])
+			v := reflect.ValueOf(args[0])
 			if v.Kind() != reflect.Map {
 				return nil, fmt.Errorf("cannot get keys from %s", v.Kind())
 			}
@@ -713,7 +713,7 @@ var Builtins = []*Function{
 			if len(args) != 1 {
 				return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))
 			}
-			v := deref.ValueOf(args[0])
+			v := reflect.ValueOf(args[0])
 			if v.Kind() != reflect.Map {
 				return nil, fmt.Errorf("cannot get values from %s", v.Kind())
 			}
@@ -743,7 +743,7 @@ var Builtins = []*Function{
 			if len(args) != 1 {
 				return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))
 			}
-			v := deref.ValueOf(args[0])
+			v := reflect.ValueOf(args[0])
 			if v.Kind() != reflect.Map {
 				return nil, fmt.Errorf("cannot transform %s to pairs", v.Kind())
 			}
@@ -771,7 +771,7 @@ var Builtins = []*Function{
 			if len(args) != 1 {
 				return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))
 			}
-			v := deref.ValueOf(args[0])
+			v := reflect.ValueOf(args[0])
 			if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
 				return nil, fmt.Errorf("cannot transform %s from pairs", v)
 			}
@@ -808,7 +808,7 @@ var Builtins = []*Function{
 				return nil, 0, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))
 			}
 
-			v := deref.ValueOf(args[0])
+			v := reflect.ValueOf(args[0])
 			if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
 				return nil, 0, fmt.Errorf("cannot reverse %s", v.Kind())
 			}
@@ -843,7 +843,7 @@ var Builtins = []*Function{
 				return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))
 			}
 
-			v := deref.ValueOf(deref.Deref(args[0]))
+			v := reflect.ValueOf(args[0])
 			if v.Kind() != reflect.Array && v.Kind() != reflect.Slice {
 				return nil, fmt.Errorf("cannot uniq %s", v.Kind())
 			}
@@ -897,7 +897,7 @@ var Builtins = []*Function{
 			var arr []any
 
 			for _, arg := range args {
-				v := deref.ValueOf(deref.Deref(arg))
+				v := reflect.ValueOf(arg)
 
 				if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
 					return nil, 0, fmt.Errorf("cannot concat %s", v.Kind())
@@ -936,7 +936,7 @@ var Builtins = []*Function{
 			if len(args) != 1 {
 				return nil, 0, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))
 			}
-			v := deref.ValueOf(deref.Deref(args[0]))
+			v := reflect.ValueOf(args[0])
 			if v.Kind() != reflect.Array && v.Kind() != reflect.Slice {
 				return nil, size, fmt.Errorf("cannot flatten %s", v.Kind())
 			}
diff --git a/builtin/builtin_test.go b/builtin/builtin_test.go
@@ -693,6 +693,7 @@ func TestBuiltin_with_deref(t *testing.T) {
 		{`uniq(arr)`, []any{1, 2, 3}},
 		{`concat(arr, arr)`, []any{1, 2, 3, 1, 2, 3}},
 		{`flatten([arr, [arr]])`, []any{1, 2, 3, 1, 2, 3}},
+		{`flatten(arr)`, []any{1, 2, 3}},
 		{`toJSON(arr)`, "[\n  1,\n  2,\n  3\n]"},
 		{`fromJSON(json)`, []any{"1"}},
 		{`split(str, ",")`, []string{"1", "2", "3"}},
diff --git a/builtin/lib.go b/builtin/lib.go
@@ -12,7 +12,7 @@ import (
 )
 
 func Len(x any) any {
-	v := deref.ValueOf(x)
+	v := reflect.ValueOf(x)
 	switch v.Kind() {
 	case reflect.Array, reflect.Slice, reflect.Map:
 		return v.Len()
@@ -27,7 +27,7 @@ func Type(arg any) any {
 	if arg == nil {
 		return "nil"
 	}
-	v := deref.ValueOf(arg)
+	v := reflect.ValueOf(arg)
 	if v.Type().Name() != "" && v.Type().PkgPath() != "" {
 		return fmt.Sprintf("%s.%s", v.Type().PkgPath(), v.Type().Name())
 	}
@@ -58,7 +58,7 @@ func Type(arg any) any {
 }
 
 func Abs(x any) any {
-	switch x := deref.Deref(x).(type) {
+	switch x := x.(type) {
 	case float32:
 		if x < 0 {
 			return -x
@@ -172,7 +172,7 @@ func Round(x any) any {
 }
 
 func Int(x any) any {
-	switch x := deref.Deref(x).(type) {
+	switch x := x.(type) {
 	case float32:
 		return int(x)
 	case float64:
@@ -213,7 +213,7 @@ func Int(x any) any {
 }
 
 func Float(x any) any {
-	switch x := deref.Deref(x).(type) {
+	switch x := x.(type) {
 	case float32:
 		return float64(x)
 	case float64:
@@ -256,7 +256,7 @@ func String(arg any) any {
 func minMax(name string, fn func(any, any) bool, args ...any) (any, error) {
 	var val any
 	for _, arg := range args {
-		rv := deref.ValueOf(arg)
+		rv := reflect.ValueOf(arg)
 		switch rv.Kind() {
 		case reflect.Array, reflect.Slice:
 			size := rv.Len()
@@ -299,7 +299,7 @@ func mean(args ...any) (int, float64, error) {
 	var count int
 
 	for _, arg := range args {
-		rv := deref.ValueOf(arg)
+		rv := reflect.ValueOf(arg)
 		switch rv.Kind() {
 		case reflect.Array, reflect.Slice:
 			size := rv.Len()
@@ -331,7 +331,7 @@ func median(args ...any) ([]float64, error) {
 	var values []float64
 
 	for _, arg := range args {
-		rv := deref.ValueOf(arg)
+		rv := reflect.ValueOf(arg)
 		switch rv.Kind() {
 		case reflect.Array, reflect.Slice:
 			size := rv.Len()
@@ -388,9 +388,6 @@ func get(params ...any) (out any, err error) {
 		}
 	}
 
-	v = deref.Value(v)
-	i = deref.Deref(i)
-
 	switch v.Kind() {
 	case reflect.Array, reflect.Slice, reflect.String:
 		index := runtime.ToInt(i)
diff --git a/internal/deref/deref.go b/internal/deref/deref.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 )
 
-func Deref(p any) any {
+func Interface(p any) any {
 	if p == nil {
 		return nil
 	}
@@ -45,7 +45,3 @@ func Value(v reflect.Value) reflect.Value {
 	}
 	return v
 }
-
-func ValueOf(v any) reflect.Value {
-	return Value(reflect.ValueOf(v))
-}
diff --git a/internal/deref/deref_test.go b/internal/deref/deref_test.go
@@ -15,7 +15,7 @@ func TestDeref(t *testing.T) {
 	c := &b
 	d := &c
 
-	got := deref.Deref(d)
+	got := deref.Interface(d)
 	assert.Equal(t, uint(42), got)
 }
 
@@ -25,14 +25,14 @@ func TestDeref_mix_ptr_with_interface(t *testing.T) {
 	var c any = &b
 	d := &c
 
-	got := deref.Deref(d)
+	got := deref.Interface(d)
 	assert.Equal(t, uint(42), got)
 }
 
 func TestDeref_nil(t *testing.T) {
 	var a *int
-	assert.Nil(t, deref.Deref(a))
-	assert.Nil(t, deref.Deref(nil))
+	assert.Nil(t, deref.Interface(a))
+	assert.Nil(t, deref.Interface(nil))
 }
 
 func TestType(t *testing.T) {
diff --git a/vm/vm.go b/vm/vm.go
@@ -457,7 +457,7 @@ func (vm *VM) Run(program *Program, env any) (_ any, err error) {
 
 		case OpDeref:
 			a := vm.pop()
-			vm.push(deref.Deref(a))
+			vm.push(deref.Interface(a))
 
 		case OpIncrementIndex:
 			vm.scope().Index++

Original file line number	Diff line number	Diff line change
`@@ -644,11 +644,11 @@ var Builtins = []*Function{`
`644`	`644`	`if len(args) != 2 {`
`645`	`645`	`return nil, fmt.Errorf("invalid number of arguments (expected 2, got %d)", len(args))`
`646`	`646`	`}`
`647`		`-v := deref.ValueOf(args[0])`
	`647`	`+v := reflect.ValueOf(args[0])`
`648`	`648`	`if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {`
`649`	`649`	`return nil, fmt.Errorf("cannot take from %s", v.Kind())`
`650`	`650`	`}`
`651`		`-n := deref.ValueOf(args[1])`
	`651`	`+n := reflect.ValueOf(args[1])`
`652`	`652`	`if !n.CanInt() {`
`653`	`653`	`return nil, fmt.Errorf("cannot take %s elements", n.Kind())`
`654`	`654`	`}`
`@@ -683,7 +683,7 @@ var Builtins = []*Function{`
`683`	`683`	`if len(args) != 1 {`
`684`	`684`	`return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))`
`685`	`685`	`}`
`686`		`-v := deref.ValueOf(args[0])`
	`686`	`+v := reflect.ValueOf(args[0])`
`687`	`687`	`if v.Kind() != reflect.Map {`
`688`	`688`	`return nil, fmt.Errorf("cannot get keys from %s", v.Kind())`
`689`	`689`	`}`
`@@ -713,7 +713,7 @@ var Builtins = []*Function{`
`713`	`713`	`if len(args) != 1 {`
`714`	`714`	`return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))`
`715`	`715`	`}`
`716`		`-v := deref.ValueOf(args[0])`
	`716`	`+v := reflect.ValueOf(args[0])`
`717`	`717`	`if v.Kind() != reflect.Map {`
`718`	`718`	`return nil, fmt.Errorf("cannot get values from %s", v.Kind())`
`719`	`719`	`}`
`@@ -743,7 +743,7 @@ var Builtins = []*Function{`
`743`	`743`	`if len(args) != 1 {`
`744`	`744`	`return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))`
`745`	`745`	`}`
`746`		`-v := deref.ValueOf(args[0])`
	`746`	`+v := reflect.ValueOf(args[0])`
`747`	`747`	`if v.Kind() != reflect.Map {`
`748`	`748`	`return nil, fmt.Errorf("cannot transform %s to pairs", v.Kind())`
`749`	`749`	`}`
`@@ -771,7 +771,7 @@ var Builtins = []*Function{`
`771`	`771`	`if len(args) != 1 {`
`772`	`772`	`return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))`
`773`	`773`	`}`
`774`		`-v := deref.ValueOf(args[0])`
	`774`	`+v := reflect.ValueOf(args[0])`
`775`	`775`	`if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {`
`776`	`776`	`return nil, fmt.Errorf("cannot transform %s from pairs", v)`
`777`	`777`	`}`
`@@ -808,7 +808,7 @@ var Builtins = []*Function{`
`808`	`808`	`return nil, 0, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))`
`809`	`809`	`}`
`810`	`810`
`811`		`-v := deref.ValueOf(args[0])`
	`811`	`+v := reflect.ValueOf(args[0])`
`812`	`812`	`if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {`
`813`	`813`	`return nil, 0, fmt.Errorf("cannot reverse %s", v.Kind())`
`814`	`814`	`}`
`@@ -843,7 +843,7 @@ var Builtins = []*Function{`
`843`	`843`	`return nil, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))`
`844`	`844`	`}`
`845`	`845`
`846`		`-v := deref.ValueOf(deref.Deref(args[0]))`
	`846`	`+v := reflect.ValueOf(args[0])`
`847`	`847`	`if v.Kind() != reflect.Array && v.Kind() != reflect.Slice {`
`848`	`848`	`return nil, fmt.Errorf("cannot uniq %s", v.Kind())`
`849`	`849`	`}`
`@@ -897,7 +897,7 @@ var Builtins = []*Function{`
`897`	`897`	`var arr []any`
`898`	`898`
`899`	`899`	`for _, arg := range args {`
`900`		`-v := deref.ValueOf(deref.Deref(arg))`
	`900`	`+v := reflect.ValueOf(arg)`
`901`	`901`
`902`	`902`	`if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {`
`903`	`903`	`return nil, 0, fmt.Errorf("cannot concat %s", v.Kind())`
`@@ -936,7 +936,7 @@ var Builtins = []*Function{`
`936`	`936`	`if len(args) != 1 {`
`937`	`937`	`return nil, 0, fmt.Errorf("invalid number of arguments (expected 1, got %d)", len(args))`
`938`	`938`	`}`
`939`		`-v := deref.ValueOf(deref.Deref(args[0]))`
	`939`	`+v := reflect.ValueOf(args[0])`
`940`	`940`	`if v.Kind() != reflect.Array && v.Kind() != reflect.Slice {`
`941`	`941`	`return nil, size, fmt.Errorf("cannot flatten %s", v.Kind())`
`942`	`942`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"reflect"`
`6`	`6`	`)`
`7`	`7`
`8`		`-func Deref(p any) any {`
	`8`	`+func Interface(p any) any {`
`9`	`9`	`if p == nil {`
`10`	`10`	`return nil`
`11`	`11`	`}`
`@@ -45,7 +45,3 @@ func Value(v reflect.Value) reflect.Value {`
`45`	`45`	`}`
`46`	`46`	`return v`
`47`	`47`	`}`
`48`		`-`
`49`		`-func ValueOf(v any) reflect.Value {`
`50`		`-return Value(reflect.ValueOf(v))`
`51`		`-}`