affine/flesh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add str concat, refactor str tests

Browse source
This commit is contained in:
Aidan Hahn 2021-11-03 23:42:59 -07:00
parent e139756a81
commit ff5e76ff98
No known key found for this signature in database
GPG key ID: 327711E983899316
2 changed files with 37 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/str.rs
View file

@ -43,11 +43,41 @@ pub fn get_echo() -> Function {
Ctr::Seg(c) => string.push_str(ast_as_string(c.clone(), true).as_str()),
Ctr::None => ()
}
string.push_str("\n");
println!(string)
return true;
}) {
eprintln!("circuit loop in echo should not have returned false")
}
return Ctr::None;
}
)
};
}
pub fn get_concat() -> Function {
return Function{
name: String::from("concat"),
loose_syms: false,
eval_lazy: false,
args: Args::Lazy(-1),
function: Operation::Internal(
|a: Ast, _b: Rc<RefCell<VTable>>, _c: Rc<RefCell<FTable>>| -> Ctr {
let mut string = String::from("");
if !circuit(a, &mut |arg: &Ctr| {
match arg {
// should be a thing here
Ctr::Symbol(_) => return false,
Ctr::String(s) => string.push_str(&s),
Ctr::Integer(i) => string.push_str(&i.to_string()),
Ctr::Float(f) => string.push_str(&f.to_string()),
Ctr::Bool(b) => string.push_str(&b.to_string()),
Ctr::Seg(c) => string.push_str(ast_as_string(c.clone(), true).as_str()),
Ctr::None => ()
}
return true;
}) {
eprintln!("circuit loop in concat should not have returned false")
}
return Ctr::String(string);
}
)