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

Fix pointer/ref parsing

Browse Source
This commit is contained in:
Nathan Braswell
2018-10-10 01:13:47 -04:00
parent 02424543fb
commit c0a6b614d0
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
k.krak
View File

@@ -726,13 +726,13 @@ fun main(argc: int, argv: **char): int {
str("main"), str("main"),
binding_p(type::_fun(make_triple(make_pair(vec( binding_p(type::_fun(make_triple(make_pair(vec(
binding_p(type::_int()), binding_p(type::_int()),
binding_p(type::_char()) binding_p(type::_ptr(binding_p(type::_ptr(binding_p(type::_char())))))
), ),
binding_p(type::_int()) binding_p(type::_int())
), false, false))), ), false, false))),
true, vec( true, vec(
_identifier(str("argc"), binding_p(type::_int())), _identifier(str("argc"), binding_p(type::_int())),
_identifier(str("argv"), binding_p(type::_char())), _identifier(str("argv"), binding_p(type::_ptr(binding_p(type::_ptr(binding_p(type::_char())))))),
_return(vec(_call(vec(make_ast_binding("fmain"), make_ast_binding("argc"), make_ast_binding("argv"))))) _return(vec(_call(vec(make_ast_binding("fmain"), make_ast_binding("argc"), make_ast_binding("argv")))))
) )
) )
@@ -775,14 +775,17 @@ fun main(argc: int, argv: **char): int {
fun parse_type(syntax: *tree<symbol>, declared_template_types: ref map<str, *binding<type>>): *binding<type> { fun parse_type(syntax: *tree<symbol>, declared_template_types: ref map<str, *binding<type>>): *binding<type> {
var is_ref = get_node("\"ref\"", syntax) != null<tree<symbol>>() var is_ref = get_node("\"ref\"", syntax) != null<tree<symbol>>()
var indr = 0
syntax = get_node("pre_reffed", syntax) syntax = get_node("pre_reffed", syntax)
if (is_ref)
return binding_p(type::_ref(parse_type_helper(syntax, declared_template_types)))
else
return parse_type_helper(syntax, declared_template_types)
}
fun parse_type_helper(syntax: *tree<symbol>, declared_template_types: ref map<str, *binding<type>>): *binding<type> {
var next = get_node("pre_reffed", syntax) var next = get_node("pre_reffed", syntax)
while(next != null<tree<symbol>>()) { if (next != null<tree<symbol>>())
indr++ return binding_p(type::_ptr(parse_type_helper(next, declared_template_types)))
syntax = next
next = get_node("pre_reffed", syntax)
}
var ident = get_node("scoped_identifier", syntax) var ident = get_node("scoped_identifier", syntax)
var func = get_node("function_type", syntax) var func = get_node("function_type", syntax)
var first_child_name = syntax->children[0]->data.name var first_child_name = syntax->children[0]->data.name

4
stdlib/type2.krak
View File

@@ -124,8 +124,8 @@ fun to_string(it: *type): str {
match (*it) { match (*it) {
type::_unknown() return str("_unknown") type::_unknown() return str("_unknown")
type::_void() return str("_void") type::_void() return str("_void")
type::_ptr(p) return "*" + to_string(p) type::_ptr(p) return "*" + to_string(p->bound_to)
type::_ref(r) return "ref" + to_string(r) type::_ref(r) return "ref" + to_string(r->bound_to)
type::_obj(b) { type::_obj(b) {
return "_obj(" + to_string(b->data) + ")" return "_obj(" + to_string(b->data) + ")"
} }