mirror of https://github.com/rm-dr/daisy
Cleanup
parent
a3ada7c70c
commit
b6acbcee6b
|
@ -155,10 +155,8 @@ pub fn parse(
|
||||||
let tokens = tokenize(s);
|
let tokens = tokenize(s);
|
||||||
let (_, tokens) = find_subs(tokens);
|
let (_, tokens) = find_subs(tokens);
|
||||||
let g = groupify(tokens)?;
|
let g = groupify(tokens)?;
|
||||||
println!("{:#?}", g);
|
|
||||||
let g = treeify(g)?;
|
let g = treeify(g)?;
|
||||||
|
|
||||||
|
|
||||||
return Ok(g);
|
return Ok(g);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ use std::collections::VecDeque;
|
||||||
|
|
||||||
use crate::tokens::Token;
|
use crate::tokens::Token;
|
||||||
use crate::tokens::Operator;
|
use crate::tokens::Operator;
|
||||||
//use crate::quantity::Quantity;
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
@ -13,7 +12,6 @@ pub enum Function {
|
||||||
Ceil,
|
Ceil,
|
||||||
Round,
|
Round,
|
||||||
|
|
||||||
// TODO: Add arbitrary log
|
|
||||||
NaturalLog,
|
NaturalLog,
|
||||||
TenLog,
|
TenLog,
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue