From 5ffe1ea03c886741a0332f26838450268a626583 Mon Sep 17 00:00:00 2001 From: Hexa Dust Date: Fri, 18 Jul 2025 20:31:23 +0100 Subject: [PATCH] calc-math update --- src/main.rs | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main.rs b/src/main.rs index e922122..7b092cd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -480,20 +480,21 @@ impl NumberInput { } fn to_decimal(&self) -> Decimal<5, u8> { - Decimal { - minus: self.minus, - significant: self.significant, - minus_exponent: self.minus_exponent, - exponent: self.exponent[0] * 10 + self.exponent[1], - } + Decimal::new( + self.minus, + self.significant, + self.minus_exponent, + self.exponent[0] * 10 + self.exponent[1], + ) } fn set_decimal(&mut self, dec: Decimal<5, u8>) { - self.minus = dec.minus; - self.significant = dec.significant; - self.minus_exponent = dec.minus_exponent; - self.exponent[0] = dec.exponent / 10; - self.exponent[1] = dec.exponent - dec.exponent / 10; + let (minus, significant, minus_exponent, exponent) = dec.into_parts(); + self.minus = minus; + self.significant = significant; + self.minus_exponent = minus_exponent; + self.exponent[0] = exponent / 10; + self.exponent[1] = exponent - exponent / 10; } } @@ -576,7 +577,7 @@ fn main() -> ! { let mut display = DispalyState::default(); number_input.show(&mut display); - let mut calc = StackCalc::<2, 5, u8>::default(); + let mut calc = StackCalc::::default(); let mut state = State::EnterSignificant; loop {