move test_compiler up to main kraken.krak and fix linker string, make paths work correctly
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
# comment
|
||||
a = b ;
|
||||
b = "c":named_c ;
|
||||
b = c "d":dname ;
|
||||
c = "a" | d ;
|
||||
d = "has space" ;
|
||||
d = "has
|
||||
return" ;
|
||||
d = "has \"" ;
|
||||
d = "has
|
||||
ll\"
|
||||
\\\"y8\" \\\\" ;
|
||||
d = "has space" ;
|
||||
d = e ;
|
||||
e = f | ;
|
||||
f = ;
|
||||
@@ -1,16 +0,0 @@
|
||||
# comment
|
||||
Goal = a ;
|
||||
a = b | rec "end" ;
|
||||
b = "c":named_c ;
|
||||
b = c "d":dname ;
|
||||
c = "a" | d ;
|
||||
d = e post_null post_non_null inherit_null ;
|
||||
inherit_null = e | post_non_null ;
|
||||
e = ;
|
||||
e = g ;
|
||||
#e = e | g ;
|
||||
f = ;
|
||||
g = f ;
|
||||
post_null = "hi" ;
|
||||
post_non_null = "bye" ;
|
||||
rec = "hmm" rec | ;
|
||||
@@ -1,3 +0,0 @@
|
||||
# comment
|
||||
Goal = a ;
|
||||
a = "hi" "d":dname ;
|
||||
@@ -1,5 +0,0 @@
|
||||
# comment
|
||||
Goal = a ;
|
||||
a = "a" d ;
|
||||
d = g ;
|
||||
g = ;
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
runner_path="./tester/tester"
|
||||
runner_path="./tester"
|
||||
#testDir=${1:-"../tests"}
|
||||
testDir="."
|
||||
ext=${2:-"krak"}
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
import io:*
|
||||
import grammer:*
|
||||
import parser:*
|
||||
import ast_transformation:*
|
||||
import string:*
|
||||
import util:*
|
||||
import symbol:*
|
||||
import tree:*
|
||||
import serialize:*
|
||||
import c_generator:*
|
||||
import os:*
|
||||
|
||||
fun main(argc: int, argv: **char):int {
|
||||
|
||||
/*var gram.construct(): grammer*/
|
||||
// delay construction until we either load it or copy construct it
|
||||
var gram: grammer
|
||||
|
||||
var file_name = string("../krakenGrammer.kgm")
|
||||
|
||||
var compiled_name = file_name + string(".comp_new")
|
||||
var file_contents = read_file(file_name)
|
||||
var loaded_and_valid = false
|
||||
|
||||
if (file_exists(compiled_name)) {
|
||||
println("cached file exists")
|
||||
var pos = 0
|
||||
var binary = read_file_binary(compiled_name)
|
||||
println("read file!")
|
||||
var cached_contents = string()
|
||||
unpack(cached_contents, pos) = unserialize<string>(binary, pos)
|
||||
if (cached_contents == file_contents) {
|
||||
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!!")
|
||||
} else {
|
||||
println("file contents do not match:")
|
||||
println("CACHED:")
|
||||
println(cached_contents)
|
||||
println("REAL:")
|
||||
println(file_contents)
|
||||
println("END")
|
||||
}
|
||||
} else {
|
||||
println("cached file does not exist")
|
||||
}
|
||||
if (!loaded_and_valid) {
|
||||
println("Not loaded_and_valid, re-generating and writing out")
|
||||
/*gram = load_grammer(file_contents)*/
|
||||
// since we now don't construct before hand
|
||||
gram.copy_construct(&load_grammer(file_contents))
|
||||
println("grammer loaded, calculate_first_set")
|
||||
gram.calculate_first_set()
|
||||
println("grammer loaded, calculate_state_automaton")
|
||||
gram.calculate_state_automaton()
|
||||
println("calculated, writing out")
|
||||
write_file_binary(compiled_name, serialize(file_contents) + serialize(gram))
|
||||
println("done writing")
|
||||
}
|
||||
|
||||
var kraken_file_name = string("to_parse.krak")
|
||||
if (argc > 1)
|
||||
kraken_file_name = string(argv[1])
|
||||
var parse.construct(gram): parser
|
||||
var ast_pass.construct(): ast_transformation
|
||||
var importer.construct(parse, ast_pass, vector(string(), string("../stdlib/"))): importer
|
||||
importer.import(kraken_file_name)
|
||||
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)
|
||||
system(string("cc -g -O3 -std=c99 ") + kraken_c_output_name + " -o " + kraken_file_name + ".exe")
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ fun error(message: *char) {
|
||||
}
|
||||
|
||||
fun main(argc: int, argv: **char): int {
|
||||
var kraken_path = string("./test_compiler/test_compiler")
|
||||
var kraken_path = string("../kraken")
|
||||
var all_results = string()
|
||||
var num_passed = 0
|
||||
var name_length = 0
|
||||
@@ -28,7 +28,7 @@ fun main(argc: int, argv: **char): int {
|
||||
if (system(kraken_path + " " + test_name + ".krak")) error("could not compile")
|
||||
var results_file_name = test_name + ".results"
|
||||
var expected_results_file_name = test_name + ".expected_results"
|
||||
if (system(string("./") + test_name + ".krak.exe > " + results_file_name)) error("could not run")
|
||||
if (system(string("./") + test_name + " > " + results_file_name)) error("could not run")
|
||||
if (file_exists(results_file_name) && file_exists(expected_results_file_name) && read_file(results_file_name) == read_file(expected_results_file_name)) {
|
||||
println(test_name + "\tPASSED!")
|
||||
all_results += pad_with_spaces(test_name) + "\tPASSED!\n"
|
||||
@@ -39,6 +39,7 @@ fun main(argc: int, argv: **char): int {
|
||||
all_results += pad_with_spaces(test_name) + "\tFAILED!!!\n"
|
||||
}
|
||||
system(string("rm ./") + test_name + ".krak.*")
|
||||
system(string("rm ./") + test_name)
|
||||
}
|
||||
println(string("\n\nTEST RESULTS: ") + num_passed + "/" + (argc-1))
|
||||
println(all_results)
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
import simple_print: *
|
||||
fun main(): int {
|
||||
var data = 7
|
||||
var v: fun():int
|
||||
v = fun(): int {
|
||||
println(data)
|
||||
return data
|
||||
}
|
||||
println(v())
|
||||
// println(print_and_return(7))
|
||||
return 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user