mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-10-31 22:16:16 +00:00
Code Issues 1 Releases Wiki Activity

Improve error message on bad method calls.

Browse Source
This commit is contained in:
Calvin Rose 2019-08-05 19:06:58 -05:00
parent 850a2d7f79
commit 2193193b12
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/capi.c
View File

@ -107,7 +107,6 @@ Janet janet_getmethod(const uint8_t *method, const JanetMethod *methods) {
return janet_wrap_cfunction(methods->cfun); return janet_wrap_cfunction(methods->cfun);
methods++; methods++;
} }
janet_panicf("unknown method :%S invoked", method);
return janet_wrap_nil(); return janet_wrap_nil();
} }

18
src/core/vm.c
View File

@ -192,6 +192,16 @@ static Janet call_nonfn(JanetFiber *fiber, Janet callee) {
return janet_get(ds, key); return janet_get(ds, key);
} }
/* Get a callable from a keyword method name and check ensure that it is valid. */
static Janet resolve_method(Janet name, JanetFiber *fiber) {
int32_t argc = fiber->stacktop - fiber->stackstart;
if (argc < 1) janet_panicf("method call takes at least 1 argument, got %d", argc);
Janet callee = janet_get(fiber->data[fiber->stackstart], name);
if (janet_checktype(callee, JANET_NIL))
janet_panicf("unknown method %v invoked on %v", name, fiber->data[fiber->stackstart]);
return callee;
}
/* Interpreter main loop */ /* Interpreter main loop */
static JanetSignal run_vm(JanetFiber *fiber, Janet in, JanetFiberStatus status) { static JanetSignal run_vm(JanetFiber *fiber, Janet in, JanetFiberStatus status) {
@ -586,9 +596,7 @@ static JanetSignal run_vm(JanetFiber *fiber, Janet in, JanetFiberStatus status)
} }
if (janet_checktype(callee, JANET_KEYWORD)) { if (janet_checktype(callee, JANET_KEYWORD)) {
vm_commit(); vm_commit();
int32_t argc = fiber->stacktop - fiber->stackstart; callee = resolve_method(callee, fiber);
if (argc < 1) janet_panicf("method call takes at least 1 argument, got %d", argc);
callee = janet_get(fiber->data[fiber->stackstart], callee);
} }
if (janet_checktype(callee, JANET_FUNCTION)) { if (janet_checktype(callee, JANET_FUNCTION)) {
func = janet_unwrap_function(callee); func = janet_unwrap_function(callee);
@ -622,9 +630,7 @@ static JanetSignal run_vm(JanetFiber *fiber, Janet in, JanetFiberStatus status)
Janet callee = stack[D]; Janet callee = stack[D];
if (janet_checktype(callee, JANET_KEYWORD)) { if (janet_checktype(callee, JANET_KEYWORD)) {
vm_commit(); vm_commit();
int32_t argc = fiber->stacktop - fiber->stackstart; callee = resolve_method(callee, fiber);
if (argc < 1) janet_panicf("method call takes at least 1 argument, got %d", argc);
callee = janet_get(fiber->data[fiber->stackstart], callee);
} }
if (janet_checktype(callee, JANET_FUNCTION)) { if (janet_checktype(callee, JANET_FUNCTION)) {
func = janet_unwrap_function(callee); func = janet_unwrap_function(callee);