HigherOrderCO/Kind1
1
1
Fork 0
mirror of https://github.com/HigherOrderCO/Kind1.git synced 2024-09-19 04:37:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #383 from developedby/kdl-run-last

Browse Source 
Put run blocks at the end of compiled kdl programs
This commit is contained in:
Felipe G 2022-09-27 10:38:40 -03:00 committed by GitHub
commit 76a5efd1b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/codegen/kdl.rs
View File

@ -74,11 +74,6 @@ pub fn to_kdl_rule(_book: &Book, kdl_names: &HashMap<String, String>, rule: &Com
pub fn to_kdl_entry(book: &Book, kdl_names: &HashMap<String, String>, entry: &CompEntry) -> Result<String, String> {
let entry = match entry.name.as_str() {
// Main is compiled to a run block
// TODO: Maybe we should have run blocks come from a specific type of function instead
// TODO: run statements should always come last in the block
"Main" => format!("run {{\n {}\n}}\n\n", to_kdl_term(kdl_names, &*entry.rules[0].body)?),
_ => {
let kdl_name = kdl_names.get(&entry.name).unwrap();
let args_names = entry.args.iter().map(|arg| format!(" {}", arg)).collect::<String>();
@ -116,10 +111,11 @@ pub fn to_kdl_entry(book: &Book, kdl_names: &HashMap<String, String>, entry: &Co
pub fn to_kdl_book(book: &Book, kdl_names: &HashMap<String, String>, comp_book: &CompBook) -> Result<String, String> {
let mut lines = vec![];
let mut run = String::new();
let gen_blk_names: HashSet<String> = HashSet::from_iter([
"Unit.new", "Pair.new", "U60.if",
"Kindelia.IO.done", "Kindelia.IO.do_save", "Kindelia.IO.do_take",
].map(String::from));
].map(String::from));
for name in &comp_book.names {
let entry = comp_book.entrs.get(name).unwrap();
// Skip names in the genesis block
@ -127,9 +123,16 @@ pub fn to_kdl_book(book: &Book, kdl_names: &HashMap<String, String>, comp_book:
if gen_blk_names.contains(&entry.name) {
continue;
}
// Main is compiled to a run block, which goes at the end
// TODO: Maybe we should have run blocks come from a specific type of function instead
if name == "Main" {
let stmnt = format!("run {{\n {}\n}}\n\n", to_kdl_term(kdl_names, &*entry.rules[0].body)?);
run.push_str(&stmnt);
continue;
}
lines.push(to_kdl_entry(book, kdl_names, entry)?);
}
Ok(lines.join(""))
Ok(lines.join("") + &run)
}
// Utils