From 1200e2d512d06bba36ff7b55549778f18d8da3db Mon Sep 17 00:00:00 2001 From: Inversion Date: Tue, 16 Feb 2021 15:53:07 -0800 Subject: [PATCH] Add optional custom error message to assert --- src/cbaselib.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/cbaselib.c b/src/cbaselib.c index 198f1f7..2441d10 100644 --- a/src/cbaselib.c +++ b/src/cbaselib.c @@ -24,18 +24,23 @@ int cosmoB_print(CState *state, int nargs, CValue *args) { } int cosmoB_assert(CState *state, int nargs, CValue *args) { - if (nargs != 1) { - cosmoV_error(state, "assert() expected 1 argument, got %d!", nargs); + if (nargs < 1 || nargs > 2) { + cosmoV_error(state, "assert() expected 1 or 2 arguments, got %d!", nargs); return 0; // nothing pushed onto the stack to return } - if (!IS_BOOLEAN(args[0])) { - cosmoV_typeError(state, "assert()", "", "%s", cosmoV_typeStr(args[0])); + if (!IS_BOOLEAN(args[0]) || (nargs == 2 && !IS_STRING(args[1]))) { + cosmoV_typeError(state, "assert()", ", ", "%s, %s", cosmoV_typeStr(args[0]), cosmoV_typeStr(args[1])); return 0; } if (!cosmoV_readBoolean(args[0])) { // expression passed was false, error! - cosmoV_error(state, "assert() failed!"); + if (nargs == 2) { + cosmoV_error(state, "%s", cosmoV_readCString(args[1])); + } + else { // optional custom error message + cosmoV_error(state, "%s", "assert() failed!"); + } } // else do nothing :) return 0;