diff options
| -rw-r--r-- | filter/data.c | 1 | ||||
| -rw-r--r-- | filter/data.h | 2 | ||||
| -rw-r--r-- | filter/f-util.c | 86 |
3 files changed, 82 insertions, 7 deletions
diff --git a/filter/data.c b/filter/data.c index 2e6d3784..a847d414 100644 --- a/filter/data.c +++ b/filter/data.c @@ -29,6 +29,7 @@ static const char * const f_type_str[] = { [T_VOID] = "void", + [T_NONE] = "none", [T_INT] = "int", [T_BOOL] = "bool", diff --git a/filter/data.h b/filter/data.h index 3fa762d0..df53df40 100644 --- a/filter/data.h +++ b/filter/data.h @@ -21,6 +21,8 @@ enum f_type { T_VOID = 0, T_EMPTY_LIST = 1, + T_NONE = 1, /* Special hack to represent missing arguments */ + /* User visible types, which fit in int */ T_INT = 0x10, T_BOOL = 0x11, diff --git a/filter/f-util.c b/filter/f-util.c index 7ce3f9c8..e980cef5 100644 --- a/filter/f-util.c +++ b/filter/f-util.c @@ -45,25 +45,97 @@ f_new_where(struct f_inst *where) static inline int f_match_signature(const struct f_method *dsc, struct f_inst *args) { - uint i; + int i, arg_num = (int) dsc->arg_num; - for (i = 1; args && (i < dsc->arg_num); args = args->next, i++) + for (i = 1; args && (i < arg_num); args = args->next, i++) if (dsc->args_type[i] && (args->type != dsc->args_type[i])) return 0; - return !args && !(i < dsc->arg_num); + return !args && !(i < arg_num); +} + +/* Variant of f_match_signature(), optimized for error reporting */ +static inline void +f_match_signature_err(const struct f_method *dsc, struct f_inst *args, int *pos, int *want, int *got) +{ + int i, arg_num = (int) dsc->arg_num; + + for (i = 1; args && (i < arg_num); args = args->next, i++) + if (dsc->args_type[i] && (args->type != dsc->args_type[i])) + break; + + *pos = i; + *want = (i < arg_num) ? dsc->args_type[i] : T_NONE; + *got = args ? args->type : T_NONE; } struct f_inst * f_dispatch_method(struct symbol *sym, struct f_inst *obj, struct f_inst *args) { - /* Note! We should revert args */ - + /* Find match */ for (const struct f_method *dsc = sym->method; dsc; dsc = dsc->next) if (f_match_signature(dsc, args)) return dsc->new_inst(obj, args); - cf_error("Cannot dispatch method '%s'", sym->name); + + /* No valid match - format error message */ + + int best_pos = -1; /* Longest argument position with partial match */ + int best_got = 0; /* Received type at best partial match position */ + int best_count = 0; /* Number of partial matches at best position */ + const int best_max = 8; /* Max number of reported types */ + int best_want[best_max]; /* Expected types at best position */ + + for (const struct f_method *dsc = sym->method; dsc; dsc = dsc->next) + { + int pos, want, got; + f_match_signature_err(dsc, args, &pos, &want, &got); + + /* Ignore shorter match */ + if (pos < best_pos) + continue; + + /* Found longer match, reset existing results */ + if (pos > best_pos) + { + best_pos = pos; + best_got = got; + best_count = 0; + } + + /* Skip duplicates */ + for (int i = 0; i < best_count; i++) + if (best_want[i] == want) + goto next; + + /* Skip if we have enough types */ + if (best_count >= best_max) + continue; + + /* Add new expected type */ + best_want[best_count] = want; + best_count++; + next:; + } + + /* There is at least one method */ + ASSERT(best_pos >= 0 && best_count > 0); + + /* TODO: Here fix best_pos */ + + if (!best_got) + cf_error("Cannot infer type of argument %d of '%s', please assign it to a variable", best_pos, sym->name); + + /* Format list of expected types */ + buffer tbuf; + STACK_BUFFER_INIT(tbuf, 128); + for (int i = 0; i < best_count; i++) + buffer_print(&tbuf, " / %s", best_want[i] ? f_type_name(best_want[i]) : "any"); + char *types = tbuf.start + 3; + char *dots = (best_count >= best_max) || (tbuf.pos == tbuf.end) ? " / ..." : ""; + + cf_error("Argument %d of '%s' expected %s%s, got %s", + best_pos, sym->name, types, dots, f_type_name(best_got)); } struct f_inst * @@ -87,7 +159,7 @@ f_for_cycle(struct symbol *var, struct f_inst *term, struct f_inst *block) /* Static type check */ if (term->type == T_VOID) - cf_error("Couldn't infer the type of FOR expression, please assign it to a variable."); + cf_error("Cannot infer type of FOR expression, please assign it to a variable"); enum f_type el_type = f_type_element_type(term->type); struct sym_scope *scope = el_type ? f_type_method_scope(term->type) : NULL; |