feat!: improve BinaryOperatorHandler api

bytecode.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/gad-lang/gad/parser"
-	"github.com/gad-lang/gad/token"
 )
 
 // Bytecode holds the compiled functions and constants.
@@ -202,11 +201,6 @@ func (o *CompiledFunction) Copy() Object {
 	}
 }
 
-// BinaryOp implements Object interface.
-func (*CompiledFunction) BinaryOp(token.Token, Object) (Object, error) {
-	return nil, ErrInvalidOperator
-}
-
 // IsFalsy implements Object interface.
 func (*CompiledFunction) IsFalsy() bool { return false }
 

objects.go

@@ -708,13 +708,15 @@ func (o Array) Items() (arr KeyValueArray) {
 
 func (o Array) Sort() (_ Object, err error) {
 	sort.Slice(o, func(i, j int) bool {
-		v, e := o[i].BinaryOp(token.Less, o[j])
-		if e != nil && err == nil {
-			err = e
-			return false
-		}
-		if v != nil {
-			return !v.IsFalsy()
+		if bo, _ := o[i].(BinaryOperatorHandler); bo != nil {
+			v, e := bo.BinaryOp(token.Less, o[j])
+			if e != nil && err == nil {
+				err = e
+				return false
+			}
+			if v != nil {
+				return !v.IsFalsy()
+			}
 		}
 		return false
 	})
@@ -723,13 +725,15 @@ func (o Array) Sort() (_ Object, err error) {
 
 func (o Array) SortReverse() (_ Object, err error) {
 	sort.Slice(o, func(i, j int) bool {
-		v, e := o[j].BinaryOp(token.Less, o[i])
-		if e != nil && err == nil {
-			err = e
-			return false
-		}
-		if v != nil {
-			return !v.IsFalsy()
+		if bo, _ := o[j].(BinaryOperatorHandler); bo != nil {
+			v, e := bo.BinaryOp(token.Less, o[i])
+			if e != nil && err == nil {
+				err = e
+				return false
+			}
+			if v != nil {
+				return !v.IsFalsy()
+			}
 		}
 		return false
 	})
@@ -787,7 +791,10 @@ func (o *ObjectPtr) BinaryOp(tok token.Token, right Object) (Object, error) {
 	if o.Value == nil {
 		return nil, errors.New("nil pointer")
 	}
-	return (*o.Value).BinaryOp(tok, right)
+	if bo, _ := (*o.Value).(BinaryOperatorHandler); bo != nil {
+		return bo.BinaryOp(tok, right)
+	}
+	return nil, ErrInvalidOperator
 }
 
 // CanCall implements Object interface.
@@ -1260,11 +1267,6 @@ func (o *Error) NewError(messages ...string) *Error {
 	return cp
 }
 
-// BinaryOp implements Object interface.
-func (o *Error) BinaryOp(tok token.Token, right Object) (Object, error) {
-	return nil, ErrInvalidOperator
-}
-
 // RuntimeError represents a runtime error that wraps Error and includes trace information.
 type RuntimeError struct {
 	Err     *Error
@@ -1374,11 +1376,6 @@ func (o *RuntimeError) NewError(messages ...string) *RuntimeError {
 	return cp
 }
 
-// BinaryOp implements Object interface.
-func (o *RuntimeError) BinaryOp(tok token.Token, right Object) (Object, error) {
-	return nil, ErrInvalidOperator
-}
-
 // StackTrace returns stack trace if set otherwise returns nil.
 func (o *RuntimeError) StackTrace() StackTrace {
 	if o.fileSet == nil {

objects_api.go

@@ -25,11 +25,6 @@ type Object interface {
 	// String should return a string of the type's value.
 	String() string
 
-	// BinaryOp handles +,-,*,/,%,<<,>>,<=,>=,<,> operators.
-	// Returned error stops VM execution if not handled with an error handler
-	// and VM.Run returns the same error as wrapped.
-	BinaryOp(tok token.Token, right Object) (Object, error)
-
 	// IsFalsy returns true if value is falsy otherwise false.
 	IsFalsy() bool
 
@@ -195,11 +190,6 @@ func (ObjectImpl) Equal(Object) bool { return false }
 // IsFalsy implements Object interface.
 func (ObjectImpl) IsFalsy() bool { return true }
 
-// BinaryOp implements Object interface.
-func (ObjectImpl) BinaryOp(_ token.Token, _ Object) (Object, error) {
-	return nil, ErrInvalidOperator
-}
-
 // NilType represents the type of global Nil Object. One should use
 // the NilType in type switches only.
 type NilType struct {
@@ -268,3 +258,10 @@ func Iterable(obj Object) bool {
 	}
 	return false
 }
+
+type BinaryOperatorHandler interface {
+	// BinaryOp handles +,-,*,/,%,<<,>>,<=,>=,<,> operators.
+	// Returned error stops VM execution if not handled with an error handler
+	// and VM.Run returns the same error as wrapped.
+	BinaryOp(tok token.Token, right Object) (Object, error)
+}

objects_namedargs.go

@@ -155,8 +155,11 @@ func (o KeyValue) IsLess(other KeyValue) bool {
 	if o.Key().String() < other.Key().String() {
 		return true
 	}
-	v, _ := o.Value().BinaryOp(token.Less, other.Value())
-	return v == nil || !v.IsFalsy()
+	if bo, _ := o.Value().(BinaryOperatorHandler); bo != nil {
+		v, _ := bo.BinaryOp(token.Less, other.Value())
+		return v == nil || !v.IsFalsy()
+	}
+	return false
 }
 
 // CanIterate implements Object interface.

objects_test.go

@@ -7,8 +7,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/gad-lang/gad/token"
-
 	. "github.com/gad-lang/gad"
 )
 
@@ -193,10 +191,6 @@ func TestObjectImpl(t *testing.T) {
 	require.True(t, impl.IsFalsy())
 	require.False(t, Callable(impl))
 	require.False(t, Iterable(impl))
-	v, err := impl.BinaryOp(token.Add, Int(0))
-	require.Nil(t, v)
-	require.NotNil(t, err)
-	require.Equal(t, ErrInvalidOperator, err)
 }
 
 func TestObjectIndexGet(t *testing.T) {

vm_loop.go

@@ -46,20 +46,10 @@ VMLoop:
 			var value Object
 			var err error
 			switch left := left.(type) {
-			case Int:
-				value, err = left.BinaryOp(tok, right)
-			case String:
-				value, err = left.BinaryOp(tok, right)
-			case Float:
-				value, err = left.BinaryOp(tok, right)
-			case Uint:
-				value, err = left.BinaryOp(tok, right)
-			case Char:
-				value, err = left.BinaryOp(tok, right)
-			case Bool:
+			case BinaryOperatorHandler:
 				value, err = left.BinaryOp(tok, right)
 			default:
-				value, err = left.BinaryOp(tok, right)
+				err = ErrInvalidOperator
 			}
 			if err == nil {
 				vm.stack[vm.sp-2] = value