Remove debug logs
This commit is contained in:
parent
c4d1cb1371
commit
f25c88cf0e
@ -152,7 +152,6 @@ fn parse_word_if_non_empty(word: &str, lexer: &mut Lexer) -> Result<(), String>
|
||||
}
|
||||
|
||||
fn parse_word(word: &str, lexer: &mut Lexer) -> Result<(), String> {
|
||||
println!("word {}", word);
|
||||
let token = match word {
|
||||
"to" => Token::TextOperator(To),
|
||||
"of" => Token::TextOperator(Of),
|
||||
|
||||
@ -230,14 +230,12 @@ macro_rules! numtok {
|
||||
pub fn eval(input: &str, allow_trailing_operators: bool, default_degree: Unit, verbose: bool) -> Result<Number, String> {
|
||||
|
||||
let lex_start = Instant::now();
|
||||
println!("lex");
|
||||
|
||||
match lexer::lex(input, allow_trailing_operators, default_degree) {
|
||||
Ok(tokens) => {
|
||||
let lex_time = Instant::now().duration_since(lex_start).as_nanos() as f32;
|
||||
if verbose == true { println!("Lexed TokenVector: {:?}", tokens); }
|
||||
|
||||
println!("parse");
|
||||
let parse_start = Instant::now();
|
||||
match parser::parse(&tokens) {
|
||||
Ok(ast) => {
|
||||
@ -245,7 +243,6 @@ pub fn eval(input: &str, allow_trailing_operators: bool, default_degree: Unit, v
|
||||
if verbose == true { println!("Parsed AstNode: {:#?}", ast); }
|
||||
|
||||
let eval_start = Instant::now();
|
||||
println!("eval");
|
||||
match evaluator::evaluate(&ast) {
|
||||
Ok(answer) => {
|
||||
let eval_time = Instant::now().duration_since(eval_start).as_nanos() as f32;
|
||||
|
||||
32
src/main.rs
32
src/main.rs
@ -39,27 +39,31 @@ fn main() {
|
||||
}
|
||||
}
|
||||
let mut verbose = false;
|
||||
let mut expression_opt = None;
|
||||
// let mut expression_opt = None;
|
||||
for arg in get_args() {
|
||||
match arg.as_str() {
|
||||
"-v" | "--verbose" => verbose = true,
|
||||
_ => {
|
||||
if expression_opt == None {
|
||||
expression_opt = Some(arg);
|
||||
} else {
|
||||
eprintln!("Unexpected argument: {}", arg);
|
||||
exit(1);
|
||||
}
|
||||
// if expression_opt == None {
|
||||
// expression_opt = Some(arg);
|
||||
// } else {
|
||||
// eprintln!("Unexpected argument: {}", arg);
|
||||
// exit(1);
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
let expression = match expression_opt {
|
||||
Some(expression) => expression,
|
||||
None => {
|
||||
print_help();
|
||||
exit(0);
|
||||
},
|
||||
};
|
||||
// let expression = match expression_opt {
|
||||
// Some(expression) => expression,
|
||||
// None => {
|
||||
// print_help();
|
||||
// exit(0);
|
||||
// },
|
||||
// };
|
||||
let mut expression = "0 watt".to_string();
|
||||
for _ in 0..10 {
|
||||
expression.push_str(" plus 1watt");
|
||||
}
|
||||
match eval(&expression, true, Unit::Celsius, verbose) {
|
||||
Ok(answer) => {
|
||||
if !verbose {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user