diff options
Diffstat (limited to 'std')
| -rw-r--r-- | std/bool.c | 24 | ||||
| -rw-r--r-- | std/int.c | 13 | ||||
| -rw-r--r-- | std/nil.c | 4 | ||||
| -rw-r--r-- | std/ref.c | 3 |
4 files changed, 14 insertions, 30 deletions
@@ -12,8 +12,7 @@ static inline bool get_bool_arg(UwUVMArgs *args, size_t i) UwUVMValue uwu_if(UwUVMArgs *args) { - if (args->num != 3) - error("error: :bool:if requires exactly 3 arguments\n"); + uwuutil_require_exact(":bool:if", args, 3); return uwuvm_clone_value(get_bool_arg(args, 0) ? uwuvm_get_arg(args, 1) @@ -23,8 +22,7 @@ UwUVMValue uwu_if(UwUVMArgs *args) UwUVMValue uwu_and(UwUVMArgs *args) { - if (args->num < 1) - error("error: :bool:and requires at least one argument\n"); + uwuutil_require_min(":bool:and", args, 1); for (size_t i = 0; i < args->num; i++) if (! get_bool_arg(args, i)) @@ -35,8 +33,7 @@ UwUVMValue uwu_and(UwUVMArgs *args) UwUVMValue uwu_or(UwUVMArgs *args) { - if (args->num < 1) - error("error: :bool:or requires at least one argument\n"); + uwuutil_require_min(":bool:or", args, 1); for (size_t i = 0; i < args->num; i++) if (get_bool_arg(args, i)) @@ -47,8 +44,7 @@ UwUVMValue uwu_or(UwUVMArgs *args) UwUVMValue uwu_equal(UwUVMArgs *args) { - if (args->num < 2) - error("error: :bool:equal requires at least 2 arguments\n"); + uwuutil_require_min(":bool:equal", args, 2); bool value = get_bool_arg(args, 0); @@ -61,25 +57,19 @@ UwUVMValue uwu_equal(UwUVMArgs *args) UwUVMValue uwu_not(UwUVMArgs *args) { - if (args->num != 1) - error("error: :bool:not requires exactly 1 argument\n"); - + uwuutil_require_exact(":bool:not", args, 1); return uwubool_create(! get_bool_arg(args, 0)); } UwUVMValue uwu_true(UwUVMArgs *args) { - if (args->num != 0) - error("error: :bool:true does not take any arguments\n"); - + uwuutil_require_exact(":bool:true", args, 0); return uwubool_create(true); } UwUVMValue uwu_false(UwUVMArgs *args) { - if (args->num != 0) - error("error: :bool:false does not take any arguments\n"); - + uwuutil_require_exact(":bool:false", args, 0); return uwubool_create(false); } @@ -18,18 +18,17 @@ typedef enum static int binary(const char *fnname, UwUVMArgs *args, BinaryOP op) { - if (args->num != 2) - error("error: %s requires exactly 2 arguments\n", fnname); + uwuutil_require_exact(fnname, args, 2); UwUVMValue value0 = uwuvm_get_arg(args, 0); if (value0.type != &uwuint_type) - error("error: %s requires an integer as $0\n", fnname); + error("type error: %s requires an integer as $0\n", fnname); UwUVMValue value1 = uwuvm_get_arg(args, 1); if (value1.type != &uwuint_type) - error("error: %s requires an integer as $1\n", fnname); + error("type error: %s requires an integer as $1\n", fnname); int a = uwuint_get(value0); int b = uwuint_get(value1); @@ -59,7 +58,7 @@ static int reduce(const char *fnname, UwUVMArgs *args, ReduceOP op, int result) UwUVMValue value = uwuvm_get_arg(args, i); if (value.type != &uwuint_type) - error("error: %s only accepts integers as arguments (invalid argument: $%lu)\n", fnname, i); + error("type error: %s only accepts integers as arguments (invalid argument: $%lu)\n", fnname, i); int this = uwuint_get(value); @@ -116,9 +115,7 @@ UwUVMValue uwu_greater(UwUVMArgs *args) UwUVMValue uwu_equal(UwUVMArgs *args) { - if (args->num < 2) - error("error: :int:equal requires at least 2 arguments\n"); - + uwuutil_require_min(":int:equal", args, 2); return uwubool_create(reduce(":int:equal", args, ROP_EQU, 1) == 1); } @@ -4,9 +4,7 @@ UwUVMValue uwu_nil(UwUVMArgs *args) { - if (args->num != 0) - error(":nil:nil does not accept any arguments\n"); - + uwuutil_require_exact(":nil:nil", args, 0); return uwunil_create(); } @@ -4,8 +4,7 @@ UwUVMValue uwu_call(UwUVMArgs *args) { - if (args->num < 1) - error(":ref:call requires at least one argument\n"); + uwuutil_require_min(":ref:call", args, 1); UwUVMValue value = uwuvm_get_arg(args, 0); |