Improvements to error handling mechanisms (deepnoodle-ai#265)

Author: myzie

arg/args.go

@@ -1,36 +1,34 @@
 package arg
 
 import (
-	"fmt"
-
 	"github.com/risor-io/risor/object"
 )
 
 func Require(funcName string, count int, args []object.Object) *object.Error {
 	nArgs := len(args)
 	if nArgs != count {
 		if count == 1 {
-			return object.Errorf(
-				fmt.Sprintf("type error: %s() takes exactly 1 argument (%d given)",
-					funcName, nArgs))
+			return object.ArgsErrorf(
+				"args error: %s() takes exactly 1 argument (%d given)",
+				funcName, nArgs)
 		}
-		return object.Errorf(
-			fmt.Sprintf("type error: %s() takes exactly %d arguments (%d given)",
-				funcName, count, nArgs))
+		return object.ArgsErrorf(
+			"args error: %s() takes exactly %d arguments (%d given)",
+			funcName, count, nArgs)
 	}
 	return nil
 }
 
 func RequireRange(funcName string, min, max int, args []object.Object) *object.Error {
 	nArgs := len(args)
 	if nArgs < min {
-		return object.Errorf(
-			fmt.Sprintf("type error: %s() takes at least %d %s (%d given)",
-				funcName, min, pluralize("argument", nArgs > 1), nArgs))
+		return object.ArgsErrorf(
+			"args error: %s() takes at least %d %s (%d given)",
+			funcName, min, pluralize("argument", nArgs > 1), nArgs)
 	} else if nArgs > max {
-		return object.Errorf(
-			fmt.Sprintf("type error: %s() takes at most %d %s (%d given)",
-				funcName, max, pluralize("argument", nArgs > 1), nArgs))
+		return object.ArgsErrorf(
+			"args error: %s() takes at most %d %s (%d given)",
+			funcName, max, pluralize("argument", nArgs > 1), nArgs)
 	}
 	return nil
 }

arg/args_test.go

@@ -28,7 +28,7 @@ func TestRequire(t *testing.T) {
 		},
 	)
 	require.NotNil(t, err)
-	require.Equal(t, "type error: foo() takes exactly 1 argument (3 given)",
+	require.Equal(t, "args error: foo() takes exactly 1 argument (3 given)",
 		err.Message().Value())
 
 	err = arg.Require(
@@ -37,7 +37,7 @@ func TestRequire(t *testing.T) {
 		[]object.Object{object.NewInt(1)},
 	)
 	require.NotNil(t, err)
-	require.Equal(t, "type error: bar() takes exactly 2 arguments (1 given)",
+	require.Equal(t, "args error: bar() takes exactly 2 arguments (1 given)",
 		err.Message().Value())
 }
 
@@ -64,7 +64,7 @@ func TestRequireRange(t *testing.T) {
 		},
 	)
 	require.NotNil(t, err)
-	require.Equal(t, "type error: foo() takes at most 3 arguments (4 given)",
+	require.Equal(t, "args error: foo() takes at most 3 arguments (4 given)",
 		err.Message().Value())
 
 	err = arg.RequireRange(
@@ -74,6 +74,6 @@ func TestRequireRange(t *testing.T) {
 		[]object.Object{},
 	)
 	require.NotNil(t, err)
-	require.Equal(t, "type error: foo() takes at least 1 argument (0 given)",
+	require.Equal(t, "args error: foo() takes at least 1 argument (0 given)",
 		err.Message().Value())
 }