From 035044ff722d426a8450cd7d6d734da7d80fe987 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Thu, 9 Feb 2023 11:44:33 -0330 Subject: use Function::parse for ui styling rather than array of function strings --- src/ui.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ui.rs b/src/ui.rs index dd3bfc5..3307123 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -13,12 +13,10 @@ use tui::{ Frame, Terminal, }; -use crate::Calculator; +use crate::{Calculator, Function}; const WIDTH: u16 = 32; -const FUNCTIONS: [&str; 3] = ["sin", "cos", "tan"]; - impl Calculator { pub fn draw(&self, f: &mut Frame) { let chunks = layout(self.stack.len(), f.size()); @@ -85,7 +83,7 @@ fn input_buffer_widget(input_buffer: &str) -> impl Widget { Span::raw(">"), Span::styled( format!(" {}", input_buffer), - if FUNCTIONS.contains(&input_buffer) { + if let Ok(_) = Function::parse(&input_buffer) { Style::default().add_modifier(Modifier::BOLD) } else { Style::default() -- cgit v1.2.3