miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix naming problem by realizing that we should allow variable shadowing anyway (anything that's not a function, that is) and we know what is and isn't a function based on the type of the binding from our type unification, so we just check to see if we're not a function type, and if so, just take our first result

Browse Source
This commit is contained in:
Nathan Braswell
2018-12-19 17:32:41 -05:00
parent 66f82062ba
commit 5eb9c08fd0
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
k.krak
View File

@@ -507,19 +507,30 @@ fun main(argc: int, argv: **char): int {
work_done = true work_done = true
println("wok done! set " + to_string(t->data)) println("wok done! set " + to_string(t->data))
} else { } else {
var filtered_options = multiple_binding_options[t].filter(fun(p: *tree<ast>): bool return equality(binding_types[t]->bound_to, get_type(p)->bound_to, true);) // isn't function, by shadowing we just take the first
if (filtered_options.size == 0) { if !is_fun(binding_types[t]->bound_to) {
println("Attempting to use our inferenced type " + to_string(binding_types[t]->bound_to) + " to decide what to bind " + to_string(t->data) + " to from options:") if (!multiple_binding_options[t].size > 0)
multiple_binding_options[t].for_each(fun(p: *tree<ast>) { println("\t" + to_string(p->data) + " of type " + to_string(get_type(p)->bound_to)); }) error("No possible options for " + to_string(t->data))
error("no options remain after filtering overloads by type for " + to_string(t->data)) var it = multiple_binding_options[t][0]
} else if (filtered_options.size > 1) { set_ast_binding(t, it)
println("inferenced type " + to_string(binding_types[t]->bound_to) + " HAD MULTIPLE OPTIONS AFTER FILTER for " + to_string(t) + ", that is "+ to_string(t->data)) unify(binding_types[t], get_type(it))
more_to_do = true
} else {
set_ast_binding(t, filtered_options[0])
unify(binding_types[t], get_type(filtered_options[0]))
work_done = true work_done = true
println("wok done! set " + to_string(t->data)) } else {
// function type, so we have to get interesting
var filtered_options = multiple_binding_options[t].filter(fun(p: *tree<ast>): bool return equality(binding_types[t]->bound_to, get_type(p)->bound_to, true);)
if (filtered_options.size == 0) {
println("Attempting to use our inferenced type " + to_string(binding_types[t]->bound_to) + " to decide what to bind " + to_string(t->data) + " to from options:")
multiple_binding_options[t].for_each(fun(p: *tree<ast>) { println("\t" + to_string(p->data) + " of type " + to_string(get_type(p)->bound_to)); })
error("no options remain after filtering overloads by type for " + to_string(t->data))
} else if (filtered_options.size > 1) {
println("inferenced type " + to_string(binding_types[t]->bound_to) + " HAD MULTIPLE OPTIONS AFTER FILTER for " + to_string(t) + ", that is "+ to_string(t->data))
more_to_do = true
} else {
set_ast_binding(t, filtered_options[0])
unify(binding_types[t], get_type(filtered_options[0]))
work_done = true
println("wok done! set " + to_string(t->data))
}
} }
} }
} }