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

Function lookup now handles overloading

Browse Source
This commit is contained in:
Nathan Braswell
2016-01-14 12:57:16 -05:00
parent fe6818edfc
commit 785c6a6a8e
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
stdlib/ast_transformation.krak
View File

@@ -280,15 +280,30 @@ obj ast_transformation (Object) {
f->function_call.parameters.for_each(fun(param: *ast_node) print(param);) f->function_call.parameters.for_each(fun(param: *ast_node) print(param);)
return f return f
} }
fun identifier_lookup(name: string, scope: *ast_node): *ast_node { fun function_lookup(name: string, scope: *ast_node, param_types: vector<*type>): *ast_node {
var param_string = string()
param_types.for_each(fun(t: *type) param_string += t->to_string() + ", ";)
var results = scope_lookup(name, scope) var results = scope_lookup(name, scope)
if (!results.size) { for (var i = 0; i < results.size; i++;)
println(string("identifier lookup failed for ") + name) if (is_function(results[i])) {
var func_param_types = get_ast_type(results[i])->parameter_types
if (func_param_types.size != param_types.size)
continue
var param_types_match = true
for (var j = 0; j < param_types.size; j++;) {
if (*func_param_types[j] != *param_types[j]) {
param_types_match = false
break
}
}
if (param_types_match)
return results[i]
} else
println(string("either isn't function or types don't match ") + get_ast_type(results[i])->to_string() + " with needed " + param_string)
println(string("function lookup failed for ") + name)
return null<ast_node>() return null<ast_node>()
} }
return results[0] fun identifier_lookup(name: string, scope: *ast_node): *ast_node {
}
fun function_lookup(name: string, scope: *ast_node, param_types: vector<*type>): *ast_node {
var results = scope_lookup(name, scope) var results = scope_lookup(name, scope)
if (!results.size) { if (!results.size) {
println(string("identifier lookup failed for ") + name) println(string("identifier lookup failed for ") + name)

10
stdlib/type.krak
View File

@@ -38,17 +38,19 @@ obj type (Object) {
base.copy_construct(&base_type::none()) base.copy_construct(&base_type::none())
parameter_types.construct() parameter_types.construct()
indirection = 0 indirection = 0
return_type = null<type>()
return this return this
} }
fun construct(base_in: base_type, indirection_in: int): *type { fun construct(base_in: base_type, indirection_in: int): *type {
base.copy_construct(&base_in) base.copy_construct(&base_in)
parameter_types.construct() parameter_types.construct()
indirection = indirection_in indirection = indirection_in
return_type = null<type>()
return this return this
} }
fun construct(parameter_types_in: vector<*type>, return_type_in: *type, indirection_in: int): *type { fun construct(parameter_types_in: vector<*type>, return_type_in: *type, indirection_in: int): *type {
base.copy_construct(&base_type::function()) base.copy_construct(&base_type::function())
parameter_types.copy_construct(&parameter_types) parameter_types.copy_construct(&parameter_types_in)
return_type = return_type_in return_type = return_type_in
indirection = indirection_in indirection = indirection_in
return this return this
@@ -67,6 +69,12 @@ obj type (Object) {
base.destruct() base.destruct()
parameter_types.destruct() parameter_types.destruct()
} }
fun operator!=(other: ref type):bool return !(*this == other);
fun operator==(other: ref type):bool {
if ( (return_type && other.return_type && *return_type != *other.return_type) || (return_type && !other.return_type) || (!return_type && other.return_type) )
return false
return base == other.base && parameter_types == other.parameter_types && indirection == other.indirection
}
fun to_string(): string { fun to_string(): string {
match (base) { match (base) {
base_type::none() return string("none, indirection: ") + indirection base_type::none() return string("none, indirection: ") + indirection