We have a VERY SILL KRAKEN COMPILER\! simple_passthroughs are now emitted by the c_generator and test_compiler has been extended to write the C to a file and then call cc on it, so the self-hosted Kraken compiler can compile its very first thing\! (though that thing is a hello world C program written entirely in a simple_passthrough...

This commit is contained in:
Nathan Braswell
2016-01-04 02:00:06 -05:00
parent 84032eece0
commit 79065c032f
6 changed files with 186 additions and 6 deletions

View File

@@ -53,6 +53,12 @@ fun ast_translation_unit_ptr(name: string): *ast_node {
ptr->copy_construct(&ast_node::translation_unit(obj_var)) ptr->copy_construct(&ast_node::translation_unit(obj_var))
return ptr return ptr
} }
fun is_translation_unit(node: *ast_node): bool {
match(*node) {
ast_node::translation_unit(backing) return true
}
return false
}
obj translation_unit (Object) { obj translation_unit (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
var children: vector<*ast_node> var children: vector<*ast_node>
@@ -87,6 +93,12 @@ fun ast_import_ptr(name: string): *ast_node {
ptr->copy_construct(&ast_node::import(to_ret)) ptr->copy_construct(&ast_node::import(to_ret))
return ptr return ptr
} }
fun is_import(node: *ast_node): bool {
match(*node) {
ast_node::import(backing) return true
}
return false
}
obj import (Object) { obj import (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
var imported: set<string> var imported: set<string>
@@ -124,6 +136,12 @@ fun ast_identifier_ptr(name: string): *ast_node {
ptr->copy_construct(&ast_node::identifier(to_ret)) ptr->copy_construct(&ast_node::identifier(to_ret))
return ptr return ptr
} }
fun is_identifier(node: *ast_node): bool {
match(*node) {
ast_node::identifier(backing) return true
}
return false
}
obj identifier (Object) { obj identifier (Object) {
var name: string var name: string
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
@@ -154,6 +172,12 @@ fun ast_type_def_ptr(name: string): *ast_node {
ptr->copy_construct(&ast_node::type_def(to_ret)) ptr->copy_construct(&ast_node::type_def(to_ret))
return ptr return ptr
} }
fun is_type_def(node: *ast_node): bool {
match(*node) {
ast_node::type_def(backing) return true
}
return false
}
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
@@ -184,6 +208,12 @@ fun ast_adt_def_ptr(name: string): *ast_node {
ptr->copy_construct(&ast_node::adt_def(to_ret)) ptr->copy_construct(&ast_node::adt_def(to_ret))
return ptr return ptr
} }
fun is_adt_def(node: *ast_node): bool {
match(*node) {
ast_node::adt_def(backing) return true
}
return false
}
obj adt_def (Object) { obj adt_def (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
var name: string var name: string
@@ -214,6 +244,12 @@ fun ast_function_ptr(): *ast_node {
ptr->copy_construct(&ast_node::function(to_ret)) ptr->copy_construct(&ast_node::function(to_ret))
return ptr return ptr
} }
fun is_function(node: *ast_node): bool {
match(*node) {
ast_node::function(backing) return true
}
return false
}
obj function (Object) { obj function (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *function { fun construct(): *function {
@@ -240,6 +276,12 @@ fun ast_code_block_ptr(): *ast_node {
ptr->copy_construct(&ast_node::code_block(to_ret)) ptr->copy_construct(&ast_node::code_block(to_ret))
return ptr return ptr
} }
fun is_code_block(node: *ast_node): bool {
match(*node) {
ast_node::code_block(backing) return true
}
return false
}
obj code_block (Object) { obj code_block (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
var children: vector<*ast_node> var children: vector<*ast_node>
@@ -270,6 +312,12 @@ fun ast_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::statement(to_ret)) ptr->copy_construct(&ast_node::statement(to_ret))
return ptr return ptr
} }
fun is_statement(node: *ast_node): bool {
match(*node) {
ast_node::statement(backing) return true
}
return false
}
obj statement (Object) { obj statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
var child: *ast_node var child: *ast_node
@@ -298,6 +346,12 @@ fun ast_if_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::if_statement(to_ret)) ptr->copy_construct(&ast_node::if_statement(to_ret))
return ptr return ptr
} }
fun is_if_statement(node: *ast_node): bool {
match(*node) {
ast_node::if_statement(backing) return true
}
return false
}
obj if_statement (Object) { obj if_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *if_statement { fun construct(): *if_statement {
@@ -324,6 +378,12 @@ fun ast_match_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::match_statement(to_ret)) ptr->copy_construct(&ast_node::match_statement(to_ret))
return ptr return ptr
} }
fun is_match_statement(node: *ast_node): bool {
match(*node) {
ast_node::match_statement(backing) return true
}
return false
}
obj match_statement (Object) { obj match_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *match_statement { fun construct(): *match_statement {
@@ -350,6 +410,12 @@ fun ast_case_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::case_statement(to_ret)) ptr->copy_construct(&ast_node::case_statement(to_ret))
return ptr return ptr
} }
fun is_case_statement(node: *ast_node): bool {
match(*node) {
ast_node::case_statement(backing) return true
}
return false
}
obj case_statement (Object) { obj case_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *case_statement { fun construct(): *case_statement {
@@ -376,6 +442,12 @@ fun ast_while_loop_ptr(): *ast_node {
ptr->copy_construct(&ast_node::while_loop(to_ret)) ptr->copy_construct(&ast_node::while_loop(to_ret))
return ptr return ptr
} }
fun is_while_loop(node: *ast_node): bool {
match(*node) {
ast_node::while_loop(backing) return true
}
return false
}
obj while_loop (Object) { obj while_loop (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *while_loop { fun construct(): *while_loop {
@@ -402,6 +474,12 @@ fun ast_for_loop_ptr(): *ast_node {
ptr->copy_construct(&ast_node::for_loop(to_ret)) ptr->copy_construct(&ast_node::for_loop(to_ret))
return ptr return ptr
} }
fun is_for_loop(node: *ast_node): bool {
match(*node) {
ast_node::for_loop(backing) return true
}
return false
}
obj for_loop (Object) { obj for_loop (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *for_loop { fun construct(): *for_loop {
@@ -428,6 +506,12 @@ fun ast_return_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::return_statement(to_ret)) ptr->copy_construct(&ast_node::return_statement(to_ret))
return ptr return ptr
} }
fun is_return_statement(node: *ast_node): bool {
match(*node) {
ast_node::return_statement(backing) return true
}
return false
}
obj return_statement (Object) { obj return_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *return_statement { fun construct(): *return_statement {
@@ -454,6 +538,12 @@ fun ast_break_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::break_statement(to_ret)) ptr->copy_construct(&ast_node::break_statement(to_ret))
return ptr return ptr
} }
fun is_break_statement(node: *ast_node): bool {
match(*node) {
ast_node::break_statement(backing) return true
}
return false
}
obj break_statement (Object) { obj break_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *break_statement { fun construct(): *break_statement {
@@ -480,6 +570,12 @@ fun ast_continue_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::continue_statement(to_ret)) ptr->copy_construct(&ast_node::continue_statement(to_ret))
return ptr return ptr
} }
fun is_continue_statement(node: *ast_node): bool {
match(*node) {
ast_node::continue_statement(backing) return true
}
return false
}
obj continue_statement (Object) { obj continue_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *continue_statement { fun construct(): *continue_statement {
@@ -506,6 +602,12 @@ fun ast_defer_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::defer_statement(to_ret)) ptr->copy_construct(&ast_node::defer_statement(to_ret))
return ptr return ptr
} }
fun is_defer_statement(node: *ast_node): bool {
match(*node) {
ast_node::defer_statement(backing) return true
}
return false
}
obj defer_statement (Object) { obj defer_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *defer_statement { fun construct(): *defer_statement {
@@ -532,6 +634,12 @@ fun ast_assignment_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::assignment_statement(to_ret)) ptr->copy_construct(&ast_node::assignment_statement(to_ret))
return ptr return ptr
} }
fun is_assignment_statement(node: *ast_node): bool {
match(*node) {
ast_node::assignment_statement(backing) return true
}
return false
}
obj assignment_statement (Object) { obj assignment_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *assignment_statement { fun construct(): *assignment_statement {
@@ -558,6 +666,12 @@ fun ast_declaration_statement_ptr(): *ast_node {
ptr->copy_construct(&ast_node::declaration_statement(to_ret)) ptr->copy_construct(&ast_node::declaration_statement(to_ret))
return ptr return ptr
} }
fun is_declaration_statement(node: *ast_node): bool {
match(*node) {
ast_node::declaration_statement(backing) return true
}
return false
}
obj declaration_statement (Object) { obj declaration_statement (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *declaration_statement { fun construct(): *declaration_statement {
@@ -584,6 +698,12 @@ fun ast_if_comp_ptr(): *ast_node {
ptr->copy_construct(&ast_node::if_comp(to_ret)) ptr->copy_construct(&ast_node::if_comp(to_ret))
return ptr return ptr
} }
fun is_if_comp(node: *ast_node): bool {
match(*node) {
ast_node::if_comp(backing) return true
}
return false
}
obj if_comp (Object) { obj if_comp (Object) {
var wanted_generator: string var wanted_generator: string
var statement: *ast_node var statement: *ast_node
@@ -612,6 +732,12 @@ fun ast_simple_passthrough_ptr(): *ast_node {
ptr->copy_construct(&ast_node::simple_passthrough(to_ret)) ptr->copy_construct(&ast_node::simple_passthrough(to_ret))
return ptr return ptr
} }
fun is_simple_passthrough(node: *ast_node): bool {
match(*node) {
ast_node::simple_passthrough(backing) return true
}
return false
}
obj simple_passthrough (Object) { obj simple_passthrough (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
var passthrough_str: string var passthrough_str: string
@@ -642,6 +768,12 @@ fun ast_function_call_ptr(): *ast_node {
ptr->copy_construct(&ast_node::function_call(to_ret)) ptr->copy_construct(&ast_node::function_call(to_ret))
return ptr return ptr
} }
fun is_function_call(node: *ast_node): bool {
match(*node) {
ast_node::function_call(backing) return true
}
return false
}
obj function_call (Object) { obj function_call (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *function_call { fun construct(): *function_call {
@@ -668,6 +800,12 @@ fun ast_value_ptr(): *ast_node {
ptr->copy_construct(&ast_node::value(to_ret)) ptr->copy_construct(&ast_node::value(to_ret))
return ptr return ptr
} }
fun is_value(node: *ast_node): bool {
match(*node) {
ast_node::value(backing) return true
}
return false
}
obj value (Object) { obj value (Object) {
var scope: map<string, vector<*ast_node>> var scope: map<string, vector<*ast_node>>
fun construct(): *value { fun construct(): *value {

View File

@@ -80,6 +80,8 @@ obj ast_transformation (Object) {
return transform_if_comp(node, scope) return transform_if_comp(node, scope)
} else if (name == "simple_passthrough") { } else if (name == "simple_passthrough") {
return transform_simple_passthrough(node, scope) return transform_simple_passthrough(node, scope)
} else if (name == "statement") {
return transform_statement(node, scope)
} }
print("FAILED TO TRANSFORM: "); println(concat_symbol_tree(node)) print("FAILED TO TRANSFORM: "); println(concat_symbol_tree(node))
return null<ast_node>() return null<ast_node>()
@@ -107,7 +109,7 @@ obj ast_transformation (Object) {
fun transform_simple_passthrough(node: *tree<symbol>, scope: *ast_node): *ast_node { fun transform_simple_passthrough(node: *tree<symbol>, scope: *ast_node): *ast_node {
var new_passthrough = ast_simple_passthrough_ptr() var new_passthrough = ast_simple_passthrough_ptr()
// setup passthrough params and string // setup passthrough params and string
new_passthrough->simple_passthrough.passthrough_str = concat_symbol_tree(get_node("triple_quoted_string", node)) new_passthrough->simple_passthrough.passthrough_str = concat_symbol_tree(get_node("triple_quoted_string", node)).slice(3,-4)
return new_passthrough return new_passthrough
} }
fun transform_statement(node: *tree<symbol>, scope: *ast_node): *ast_node { fun transform_statement(node: *tree<symbol>, scope: *ast_node): *ast_node {

View File

@@ -20,7 +20,7 @@ obj c_generator (Object) {
} }
fun destruct() { fun destruct() {
} }
fun generate(name_ast_map: map<string, pair<*tree<symbol>,*ast_node>>): pair<string,string> { fun generate_c(name_ast_map: map<string, pair<*tree<symbol>,*ast_node>>): pair<string,string> {
var linker_string:string = "" var linker_string:string = ""
var prequal: string = "#include <stdbool.h>\n#include <stdlib.h>\n#include <stdio.h>\n" var prequal: string = "#include <stdbool.h>\n#include <stdlib.h>\n#include <stdio.h>\n"
var plain_typedefs: string = "" var plain_typedefs: string = ""
@@ -40,8 +40,12 @@ obj c_generator (Object) {
// assert translation_unit? // assert translation_unit?
tree_pair.second->translation_unit.children.for_each(fun(child: *ast_node) { tree_pair.second->translation_unit.children.for_each(fun(child: *ast_node) {
match (*child) { match (*child) {
ast_node::if_comp(backing) top_level_c_passthrough += "got an if_comp\n" // should really check the genrator
ast_node::simple_passthrough(backing) top_level_c_passthrough += "got a simple_passthrough\n" ast_node::if_comp(backing) {
if (is_simple_passthrough(backing.statement->statement.child))
top_level_c_passthrough += generate_simple_passthrough(backing.statement->statement.child)
}
ast_node::simple_passthrough(backing) top_level_c_passthrough += generate_simple_passthrough(child)
} }
}) })
}) })
@@ -49,6 +53,16 @@ obj c_generator (Object) {
var function_definitions: string = "" var function_definitions: string = ""
return make_pair(prequal+plain_typedefs+top_level_c_passthrough+variable_extern_declarations+structs+function_typedef_string_pre+function_typedef_string+function_prototypes+variable_declarations+function_definitions, linker_string) return make_pair(prequal+plain_typedefs+top_level_c_passthrough+variable_extern_declarations+structs+function_typedef_string_pre+function_typedef_string+function_prototypes+variable_declarations+function_definitions, linker_string)
} }
fun generate_simple_passthrough(node: *ast_node): string {
// deal with all the passthrough params
return node->simple_passthrough.passthrough_str
}
// for now, anyway
fun generate(node: *ast_node): string {
match (*node) {
ast_node::simple_passthrough(backing) return generate_simple_passthrough(node)
}
}
} }

19
stdlib/os.krak Normal file
View File

@@ -0,0 +1,19 @@
import string:*
import mem:*
fun system(call_string: string):int {
var c_call_string = call_string.toCharArray()
var result = system(c_call_string)
delete(c_call_string)
return result
}
fun system(call_string: *char): int {
__if_comp__ __C__ {
simple_passthrough(call_string::) """
return system(call_string);
"""
}
}

View File

@@ -8,6 +8,7 @@ import symbol:*
import tree:* import tree:*
import serialize:* import serialize:*
import c_generator:* import c_generator:*
import os:*
fun main():int { fun main():int {
@@ -79,9 +80,11 @@ fun main():int {
var importer.construct(parse, ast_pass): importer var importer.construct(parse, ast_pass): importer
importer.import(kraken_file_name) importer.import(kraken_file_name)
var c_generator.construct(): c_generator var c_generator.construct(): c_generator
var c_output_pair = c_generator.generate(importer.name_ast_map) var c_output_pair = c_generator.generate_c(importer.name_ast_map)
write_file(kraken_file_name + ".c", c_output_pair.first) var kraken_c_output_name = kraken_file_name + ".c"
write_file(kraken_c_output_name, c_output_pair.first)
println(string("linker string: ") + c_output_pair.second) println(string("linker string: ") + c_output_pair.second)
system(string("cc -g -O3 -std=c99 ") + kraken_c_output_name + " -o " + kraken_file_name + ".exe")
return 0 return 0
} }

View File

@@ -1,6 +1,10 @@
__if_comp__ __C__ simple_passthrough """ __if_comp__ __C__ simple_passthrough """
#include <stdio.h> #include <stdio.h>
int main() {
printf("hello world! (of selfhosting! (silly selfhosting for now))\n");
return 0;
}
""" """
var a = 1 var a = 1
var b = 2 var b = 2