Handle errors on UI and calcState

ricglz · May 13, 2020 · 3ac3085 · 3ac3085
1 parent a5f02d8
commit 3ac3085
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 54 deletions.
diff --git a/BaseCalc/EnvironmentalObjects.swift b/BaseCalc/EnvironmentalObjects.swift
@@ -56,13 +56,6 @@ class CalculatorState: ObservableObject {
         let digitToAddIsDot = digitToAdd == "."
 
         if willPerformOperation {
-            do {
-                prevNumber = try Number(number: currentText, base: currentBase)
-            } catch {
-                print("Error")
-                return
-            }
-
             if digitToAddIsDot {
                 currentText = "0."
             } else {
@@ -94,6 +87,10 @@ class CalculatorState: ObservableObject {
         prevOperation = nil
         prevNumber = nil
     }
+
+    func enterErrorState() {
+        currentText = "Error"
+    }
 
     func isInvalidForBitOperations() -> Bool {
         isNegative || hasDecimalDot
@@ -110,6 +107,11 @@ class CalculatorState: ObservableObject {
             solve()
         } else {
             willPerformOperation = true
+            do {
+                prevNumber = try Number(number: currentText, base: currentBase)
+            } catch {
+                enterErrorState()
+            }
         }
     }
 
@@ -135,44 +137,78 @@ class CalculatorState: ObservableObject {
             hasDecimalDot = currNumber.hasFract
             currentBase = newBase
         } catch {
-            print("Error")
+            enterErrorState()
+        }
+    }
+
+    func getFloatingPoint() -> String {
+        do {
+            let number = try Number(number: currentText, base: currentBase)
+            return String(describing: number.getFloatingPoint())
+        } catch {
+            return "Error"
+        }
+    }
+
+    func getRadixComplement(digits: Int) {
+        do {
+            let number = try Number(number: currentText, base: currentBase)
+            let complement = try number.radixComplement(digits: digits)
+            currentText = complement.toString()
+        } catch {
+            enterErrorState()
+        }
+    }
+
+    func getRadixComplementDiminished(digits: Int) {
+        do {
+            let number = try Number(number: currentText, base: currentBase)
+            let complement = try number.radixComplementDiminished(digits: digits)
+            currentText = complement.toString()
+        } catch {
+            enterErrorState()
         }
     }
 
     func solve() {
         do {
             let currentNumber = try Number(number: currentText, base: currentBase)
+
+            if prevNumber == nil {
+                enterErrorState()
+                return
+            }
 
             switch prevOperation {
             case .add:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) + currentNumber)
+                changePrevNumber(answer: try prevNumber! + currentNumber)
             case .subtract:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) - currentNumber)
+                changePrevNumber(answer: try prevNumber! - currentNumber)
             case .multiply:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) * currentNumber)
+                changePrevNumber(answer: try prevNumber! * currentNumber)
             case .divide:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) / currentNumber)
+                changePrevNumber(answer: try prevNumber! / currentNumber)
             case .and:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) & currentNumber)
+                changePrevNumber(answer: try prevNumber! & currentNumber)
             case .or:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) | currentNumber)
+                changePrevNumber(answer: try prevNumber! | currentNumber)
             case .xor:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) ^ currentNumber)
+                changePrevNumber(answer: try prevNumber! ^ currentNumber)
             case .nor:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) ~| currentNumber)
+                changePrevNumber(answer: try prevNumber! ~| currentNumber)
             case .leftShiftN:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) << currentNumber)
+                changePrevNumber(answer: try prevNumber! << currentNumber)
             case .leftShift1:
                 changePrevNumber(answer: try currentNumber << Number(number: "1", base: currentBase))
             case .rightShiftN:
-                changePrevNumber(answer: try (prevNumber ?? currentNumber) >> currentNumber)
+                changePrevNumber(answer: try prevNumber! >> currentNumber)
             case .rightShift1:
                 changePrevNumber(answer: try currentNumber >> Number(number: "1", base: currentBase))
             default:
                 print(prevOperation == nil)
             }
         } catch {
-            print("Error")
+            enterErrorState()
         }
     }
 

diff --git a/BaseCalc/Views/ComplementAlert.swift b/BaseCalc/Views/ComplementAlert.swift
@@ -96,29 +96,17 @@ struct AlertButtons: View {
             Spacer()
 
             Button(action: {
-                do {
-                    let number = try Number(number: self.calculatorState.currentText, base: self.calculatorState.currentBase)
-                    let complement = try number.radixComplement(digits: Int(self.digits))
-                    self.calculatorState.currentText = complement.toString()
-                    self.manager.isShowing.toggle()
-                } catch {
-                    print("Error")
-                }
+                self.calculatorState.getRadixComplement(digits: Int(self.digits)!)
+                self.manager.isShowing.toggle()
             }){
                 Text("ß compl.")
             }.disabled(!isDigitCountValid)
 
             Spacer()
 
             Button(action: {
-                do {
-                    let number = try Number(number: self.calculatorState.currentText, base: self.calculatorState.currentBase)
-                    let complement = try number.radixComplementDiminished(digits: Int(self.digits))
-                    self.calculatorState.currentText = complement.toString()
-                    self.manager.isShowing.toggle()
-                } catch {
-                    print("Error")
-                }
+                self.calculatorState.getRadixComplementDiminished(digits: Int(self.digits)!)
+                self.manager.isShowing.toggle()
             }){
                 Text("ß⁻¹ compl.")
             }.disabled(!isDigitCountValid)

diff --git a/BaseCalc/Views/FloatingPointAlert.swift b/BaseCalc/Views/FloatingPointAlert.swift
@@ -14,30 +14,15 @@ struct FloatingPointAlert: View {
 
     var body: some View {
         GeneralAlert(isShowing: manager.isShowing) {
-            FloatingPointAlertContent(
-                val: self.calculatorState.currentText,
-                base: self.calculatorState.currentBase
-            )
+            FloatingPointAlertContent()
         }
     }
 }
 
 struct FloatingPointAlertContent: View {
     @EnvironmentObject var manager: FloatingPointAlertManager
+    @EnvironmentObject var calculatorState: CalculatorState
     @EnvironmentObject var layout: LayoutState
-    let single: String
-
-    init(val: String, base: Base) {
-        do {
-            let number = try Number(number: val, base: base)
-
-            self.single = String(describing: number.getFloatingPoint())
-            // self.double = String(describing: number.getFloatingPoint(exponentDigits: 11, mantissaDigits: 52))
-        } catch {
-            print("Error")
-            self.single = "Error"
-        }
-    }
 
     var body: some View {
         VStack(alignment: .center) {
@@ -55,7 +40,7 @@ struct FloatingPointAlertContent: View {
                         .font(.subheadline)
                         .foregroundColor(.white)
 
-                    Text(single)
+                    Text(calculatorState.getFloatingPoint())
                         .font(.subheadline)
                         .foregroundColor(.gray)
 
@@ -68,7 +53,7 @@ struct FloatingPointAlertContent: View {
                         .font(.subheadline)
                         .foregroundColor(.white)
 
-                    Text(single)
+                    Text(calculatorState.getFloatingPoint())
                         .font(.subheadline)
                         .foregroundColor(.gray)
                 }