From 1f6fa5a58030f4ff2adde61e7652d1956e407510 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Thu, 9 Feb 2023 15:26:30 -0330 Subject: simplify Function method and rename Calculator method --- src/input.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/input.rs') diff --git a/src/input.rs b/src/input.rs index a80ce11..e7783fb 100644 --- a/src/input.rs +++ b/src/input.rs @@ -33,7 +33,7 @@ impl Calculator { KeyCode::Enter if self.input_buffer.len() > 0 => { if let Ok(func) = Function::parse(&self.input_buffer) { if let Some(f) = self.stack.pop() { - self.stack.push(func.func()(f)); + self.stack.push(func.call_on(f)); } } else { self.stack.push(self.input_buffer.parse::().unwrap()); @@ -56,7 +56,7 @@ impl Calculator { } else if let Ok(op) = Operator::parse(c) { self.stack.push(self.input_buffer.parse::().unwrap()); self.input_buffer = String::new(); - self.op(op); + self.perform_operation(op); } else { self.input_buffer.push(c); } -- cgit v1.2.3