kuroko-lang/kuroko
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't bother getting the alternate function name if we aren't raising an exception

Browse Source
This commit is contained in:
K. Lange 2023-12-28 19:25:00 +09:00
parent e9b0269c91
commit ebe1815075
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/parseargs.c
View File

@ -14,19 +14,38 @@
/**
* @brief Format a TypeError exception for an argument.
*
* @param _method_name Method name from parseVArgs, after possibly modification by `:`
* @param method_name Method name from parseVArgs, after possibly modification by `:`
* @param expected Description of expected type; generally a type name, but maybe something like "str of length 1".
* @param arg The value passed that failed the type check.
* @param argName Name of the argument. If NULL or zero-length, argument name is not included in the description.
*/
__attribute__((cold))
static void raise_TypeError(const char * _method_name, const char * expected, KrkValue arg, const char * argName) {
static void raise_TypeError(const char * method_name, const char * expected, KrkValue arg, const char * argName) {
krk_runtimeError(vm.exceptions->typeError,
"%s()%s%s expects %s, not '%T'",
_method_name, (argName && *argName) ? " argument " : "", (argName && *argName) ? argName : "",
method_name, (argName && *argName) ? " argument " : "", (argName && *argName) ? argName : "",
expected, arg);
}
/**
* @brief Get the method name to use for an error message.
*
* If the format string has a ':' it is taken as the start of an alternative method name
* to include in error messages. This may be useful when calling the macro version of
* @c krk_parseArgs in a @c __new__ or @c __init__ method.
*
* @param method_name Original method name passed to krk_parseArgs.
* @param fmt Pointer to somewhere in the format string up to the colon.
*/
__attribute__((cold))
static const char * methodName(const char * method_name, const char * fmt) {
const char * maybeColon = strchr(fmt, ':');
return maybeColon ? maybeColon + 1 : method_name;
}
/* Just to avoid repeating ourselves... */
#define _method_name (methodName(orig_method_name, fmt))
/**
* @brief Validate and parse arguments to a function similar to how managed
* function arguments are handled.
@ -44,7 +63,7 @@ static void raise_TypeError(const char * _method_name, const char * expected, Kr
* @returns 1 on success, 0 on error.
*/
int krk_parseVArgs(
const char * _method_name,
const char * orig_method_name,
int argc, const KrkValue argv[], int hasKw,
const char * fmt, const char ** names, va_list args) {
int iarg = 0; /**< Index into positional input arguments */
@ -52,16 +71,6 @@ int krk_parseVArgs(
int required = 1; /**< Parser state, whether required arguments are being collected */
int acceptextrakws = 0; /**< Whether extra keyword args should produce an error (0) or not (1) */
const char * maybeColon = strchr(fmt, ':');
if (maybeColon) {
/**
* If the format string has a ':' it is taken as the start of an alternative method name
* to include in error messages. This may be useful when calling the macro version of
* @c krk_parseArgs in a @c __new__ or @c __init__ method.
*/
_method_name = maybeColon + 1;
}
if (*fmt == '.') {
/**
* If the format string starts with `.` then argument processing skips the first argument
@ -431,12 +440,12 @@ _error:
* @brief Variable argument version of @c krk_parseVArgs.
*/
int krk_parseArgs_impl(
const char * _method_name,
const char * method_name,
int argc, const KrkValue argv[], int hasKw,
const char * format, const char ** names, ...) {
va_list args;
va_start(args, names);
int result = krk_parseVArgs(_method_name,argc,argv,hasKw,format,names,args);
int result = krk_parseVArgs(method_name,argc,argv,hasKw,format,names,args);
va_end(args);
return result;
}