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

Fixed, working unions. Had to move the is_union member to the end. I'm not sure if this is a C bug or an effect of me doing something weird somewhere

Browse Source
This commit is contained in:
Nathan Braswell
2016-06-16 23:06:38 -07:00
parent 59f5c6f667
commit 4a33a94b15
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
krakenGrammer.kgm
View File

@@ -83,9 +83,8 @@ opt_parameter_list = parameter_list | ;
parameter_list = parameter_list WS "," WS parameter | parameter ; parameter_list = parameter_list WS "," WS parameter | parameter ;
parameter = boolean_expression ; parameter = boolean_expression ;
def_nonterm = "def" ; obj_nonterm = "obj" | "uni" ;
obj_nonterm = "obj" ; type_def = obj_nonterm WS identifier WS template_dec WS "{" WS declaration_block WS "}" | obj_nonterm WS identifier WS "{" WS declaration_block WS "}" | obj_nonterm WS identifier WS template_dec WS traits WS "{" WS declaration_block WS "}" | obj_nonterm WS identifier WS traits WS "{" WS declaration_block WS "}" ;
type_def = def_nonterm WS identifier WS type | obj_nonterm WS identifier WS template_dec WS "{" WS declaration_block WS "}" | obj_nonterm WS identifier WS "{" WS declaration_block WS "}" | obj_nonterm WS identifier WS template_dec WS traits WS "{" WS declaration_block WS "}" | obj_nonterm WS identifier WS traits WS "{" WS declaration_block WS "}" ;
declaration_block = declaration_statement line_end WS declaration_block | function WS declaration_block | declaration_statement line_end | function | ; declaration_block = declaration_statement line_end WS declaration_block | function WS declaration_block | declaration_statement line_end | function | ;
traits = "\(" WS trait_list WS "\)" ; traits = "\(" WS trait_list WS "\)" ;

28
stdlib/ast_nodes.krak
View File

@@ -190,13 +190,13 @@ obj identifier (Object) {
return name == other.name && type == other.type && enclosing_scope == other.enclosing_scope return name == other.name && type == other.type && enclosing_scope == other.enclosing_scope
} }
} }
fun ast_type_def_ptr(name: string): *ast_node { /*fun ast_type_def_ptr(name: string): *ast_node {*/
/*fun ast_type_def_ptr(name: ref string): *ast_node {*/ fun ast_type_def_ptr(name: ref string): *ast_node {
/*return ast_type_def_ptr(name, false)*/ return ast_type_def_ptr(name, false)
/*}*/ }
/*fun ast_type_def_ptr(name: ref string, is_union: bool): *ast_node {*/ fun ast_type_def_ptr(name: ref string, is_union: bool): *ast_node {
/*var to_ret.construct(name, is_union): type_def*/ var to_ret.construct(name, is_union): type_def
var to_ret.construct(name): type_def /*var to_ret.construct(name): type_def*/
var ptr = new<ast_node>() var ptr = new<ast_node>()
ptr->copy_construct(&ast_node::type_def(to_ret)) ptr->copy_construct(&ast_node::type_def(to_ret))
return ptr return ptr
@@ -210,16 +210,16 @@ fun is_type_def(node: *ast_node): bool {
obj type_def (Object) { obj type_def (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
var name: string var name: string
/*var is_union: bool*/
var self_type: *type var self_type: *type
var variables: vector<*ast_node> var variables: vector<*ast_node>
var methods: vector<*ast_node> var methods: vector<*ast_node>
/*fun construct(nameIn: ref string, is_unionIn: bool): *type_def {*/ var is_union: bool
fun construct(nameIn: ref string): *type_def { fun construct(nameIn: ref string, is_unionIn: bool): *type_def {
/*fun construct(nameIn: ref string): *type_def {*/
/*fun construct(nameIn: string): *type_def {*/ /*fun construct(nameIn: string): *type_def {*/
scope.construct() scope.construct()
name.copy_construct(&nameIn) name.copy_construct(&nameIn)
/*is_union = is_unionIn*/ is_union = is_unionIn
self_type = null<type>() self_type = null<type>()
variables.construct() variables.construct()
methods.construct() methods.construct()
@@ -229,7 +229,7 @@ obj type_def (Object) {
self_type = old->self_type self_type = old->self_type
scope.copy_construct(&old->scope) scope.copy_construct(&old->scope)
name.copy_construct(&old->name) name.copy_construct(&old->name)
/*is_union = old->is_union*/ is_union = old->is_union
variables.copy_construct(&old->variables) variables.copy_construct(&old->variables)
methods.copy_construct(&old->methods) methods.copy_construct(&old->methods)
} }
@@ -244,8 +244,8 @@ obj type_def (Object) {
copy_construct(&other) copy_construct(&other)
} }
fun operator==(other: ref type_def): bool { fun operator==(other: ref type_def): bool {
/*return name == other.name && is_union == other.is_union && self_type == other.self_type && variables == other.variables && methods == other.methods*/ return name == other.name && is_union == other.is_union && self_type == other.self_type && variables == other.variables && methods == other.methods
return name == other.name && self_type == other.self_type && variables == other.variables && methods == other.methods /*return name == other.name && self_type == other.self_type && variables == other.variables && methods == other.methods*/
} }
} }
fun ast_adt_def_ptr(name: string): *ast_node { fun ast_adt_def_ptr(name: string): *ast_node {

4
stdlib/ast_transformation.krak
View File

@@ -104,9 +104,9 @@ obj ast_transformation (Object) {
return template return template
} else { } else {
// pass in whether or not this is a union // pass in whether or not this is a union
/*var type_def_node = ast_type_def_ptr(name, concat_symbol_tree(get_node("obj_nonterm", child)) == "uni")*/ var type_def_node = ast_type_def_ptr(name, concat_symbol_tree(get_node("obj_nonterm", child)) == "uni")
/*var type_def_node = ast_type_def_ptr(name, false)*/ /*var type_def_node = ast_type_def_ptr(name, false)*/
var type_def_node = ast_type_def_ptr(name) /*var type_def_node = ast_type_def_ptr(name)*/
type_def_node->type_def.self_type = type_ptr(type_def_node, transform_traits(get_node("traits", child))) type_def_node->type_def.self_type = type_ptr(type_def_node, transform_traits(get_node("traits", child)))
ast_to_syntax.set(type_def_node, child) ast_to_syntax.set(type_def_node, child)
add_to_scope("~enclosing_scope", scope, type_def_node) add_to_scope("~enclosing_scope", scope, type_def_node)

11
stdlib/c_generator.krak
View File

@@ -443,16 +443,15 @@ obj c_generator (Object) {
}) })
}) })
type_poset.get_sorted().for_each(fun(vert: *ast_node) { type_poset.get_sorted().for_each(fun(vert: *ast_node) {
/*var base_name = vert->type_def.name*/
var base_name = get_name(vert) var base_name = get_name(vert)
plain_typedefs += string("typedef ") plain_typedefs += string("typedef ")
/*if (is_type_def(vert) && vert->type_def.is_union) {*/ if (is_type_def(vert) && vert->type_def.is_union) {
/*plain_typedefs += "union "*/ plain_typedefs += "union "
/*structs += "union "*/ structs += "union "
/*} else {*/ } else {
plain_typedefs += "struct " plain_typedefs += "struct "
structs += "struct " structs += "struct "
/*}*/ }
plain_typedefs += base_name + "_dummy " + base_name + ";\n" plain_typedefs += base_name + "_dummy " + base_name + ";\n"
structs += base_name + "_dummy {\n" structs += base_name + "_dummy {\n"
if (is_type_def(vert)) { if (is_type_def(vert)) {