Clean up for demo

This commit is contained in:
Nathan Braswell
2016-04-13 16:25:16 -04:00
parent 38ec4abc01
commit e732a6e41d
6 changed files with 61 additions and 18 deletions

View File

@@ -16,9 +16,9 @@ fun main(argc: int, argv: **char):int {
// delay construction until we either load it or copy construct it
var gram: grammer
var base_dir = string("/").join(string(argv[0]).split('/').slice(0,-2))
println(base_dir)
/*println(base_dir)*/
var file_name = base_dir + "/krakenGrammer.kgm"
println(file_name)
/*println(file_name)*/
var compiled_name = file_name + string(".comp_new")
var compiled_version = 1
@@ -26,22 +26,22 @@ fun main(argc: int, argv: **char):int {
var loaded_and_valid = false
if (file_exists(compiled_name)) {
println("cached file exists")
/*println("cached file exists")*/
var pos = 0
var binary = read_file_binary(compiled_name)
println("read file!")
/*println("read file!")*/
var saved_version = 0
unpack(saved_version, pos) = unserialize<int>(binary, pos)
if (saved_version == compiled_version) {
var cached_contents = string()
unpack(cached_contents, pos) = unserialize<string>(binary, pos)
if (cached_contents == file_contents) {
println("loaded_and_valid, using cached version!")
/*println("loaded_and_valid, using cached version!")*/
loaded_and_valid = true
/*unpack(gram, pos) = unserialize<grammer>(binary, pos)*/
// skip unnecessary copies this way
pos = gram.unserialize(binary, pos)
println("finished unserializeing!!")
/*println("finished unserializeing!!")*/
} else println("contents different")
} else println("version number different")
} else {
@@ -68,13 +68,15 @@ fun main(argc: int, argv: **char):int {
var parse.construct(gram): parser
var ast_pass.construct(): ast_transformation
var importer.construct(parse, ast_pass, vector(string(), base_dir + "/stdlib/")): importer
/*print("parsing: ")*/
importer.import(kraken_file_name)
println("NOW DOING C_GENERATOR")
println("Generating C")
/*println("NOW DOING C_GENERATOR")*/
var c_generator.construct(): c_generator
var c_output_pair = c_generator.generate_c(importer.name_ast_map)
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)*/
var executable_name = string(".").join(kraken_file_name.split('.').slice(0,-2))
if (argc == 3)