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

Fix dropped references to keyword arguments in parseArgs

Browse Source
This commit is contained in:
K. Lange 2023-12-28 22:04:48 +09:00
parent ebe1815075
commit 643313baa0
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/parseargs.c
View File

@ -29,7 +29,7 @@ static void raise_TypeError(const char * method_name, const char * expected, Krk
/**
* @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.
@ -46,6 +46,26 @@ static const char * methodName(const char * method_name, const char * fmt) {
/* Just to avoid repeating ourselves... */
#define _method_name (methodName(orig_method_name, fmt))
/**
* @brief Extract arguments from kwargs dict, but keep references to them.
*
* Searches for @p argName in the @p kwargs dict. If found, extracts the value
* into @p out and stores a reference to it in @p refList and then deletes
* the original entry from @p kwargs.
*
* @param kwargs Original keyword args dictionary, which will be mutated.
* @param argName Argument name to search for.
* @param out Slot to place argument value in.
* @param refList List to store references for garbage collection.
* @returns Non-zero if the argument was not found.
*/
static int extractKwArg(KrkTable * kwargs, KrkString * argName, KrkValue * out, KrkValueArray * refList) {
if (!krk_tableGet_fast(kwargs, argName, out)) return 1;
krk_writeValueArray(refList, *out);
krk_tableDeleteExact(kwargs, OBJECT_VAL(argName));
return 0;
}
/**
* @brief Validate and parse arguments to a function similar to how managed
* function arguments are handled.
@ -148,25 +168,19 @@ int krk_parseVArgs(
continue;
}
int wasPositional = 0;
KrkValue arg = KWARGS_VAL(0);
#define ARG_NAME (krk_copyString(names[oarg],strlen(names[oarg])))
if (iarg < argc) {
/* Positional arguments are pretty straightforward. */
arg = argv[iarg];
iarg++;
wasPositional = 1;
} else if ((required && !hasKw) || (hasKw && !krk_tableGet_fast(AS_DICT(argv[argc]), ARG_NAME, &arg) && required)) {
} else if ((required && !hasKw) || (hasKw && extractKwArg(AS_DICT(argv[argc]), krk_copyString(names[oarg],strlen(names[oarg])), &arg, AS_LIST(argv[argc+1])) && required)) {
/* If keyword argument lookup failed and this is not an optional argument, raise an exception. */
krk_runtimeError(vm.exceptions->typeError, "%s() missing required positional argument: '%s'",
_method_name, names[oarg]);
goto _error;
}
/* If this was a keyword argument, remove it from the kwargs table. */
if (hasKw && !wasPositional) krk_tableDeleteExact(AS_DICT(argv[argc]), OBJECT_VAL(ARG_NAME));
char argtype = *fmt++;
if (*fmt == '?') {

7
src/vm.c
View File

@ -686,12 +686,17 @@ static inline int _callNative(KrkNative* callee, int argCount, int returnDepth)
/* Write the dict into the list */
krk_writeValueArray(AS_LIST(myList), myDict);
/* Also add a list for storing references that get removed from the kwargs dict during mutation. */
KrkValue refList = krk_list_of(0,NULL,0);
krk_push(refList);
krk_writeValueArray(AS_LIST(myList), refList);
/* Reduce the stack to just the list */
krk_currentThread.stack[stackOffsetAfterCall] = myList;
krk_currentThread.stackTop = &krk_currentThread.stack[stackOffsetAfterCall+1];
/* Call with list as arguments */
result = native(AS_LIST(myList)->count-1, AS_LIST(myList)->values, 1);
result = native(AS_LIST(myList)->count-2, AS_LIST(myList)->values, 1);
} else {
result = krk_callNativeOnStack(argCount, krk_currentThread.stackTop - argCount, 0, native);
}