Dry2

the-curve-consulting · Apr 21, 2020 · 5a86ab2 · 5a86ab2
1 parent 831e0e3
commit 5a86ab2
Showing 1 changed file with 10 additions and 22 deletions.
diff --git a/CalculatorApp/main.swift b/CalculatorApp/main.swift
@@ -35,24 +35,12 @@ func help() {
     print("Commands: add, subtract, multiply, divide, history or help")
 }
 
-func add() {
-    let result = calculator.add(gatherNumbers())
-    print("Result: \(result)")
-}
-
-func subtract() {
-    let result = calculator.subtract(gatherNumbers())
-    print("Result: \(result)")
-}
-
-func divide() {
-    let result = calculator.divide(gatherNumbers())
-    print("Result: \(result)")
-}
-
-func multiply() {
-    let result = calculator.multiply(gatherNumbers())
-    print("Result: \(result)")
+func mathFunc(_ fn: @escaping ([Double]) -> Double) -> (() -> ()) {
+    func x() {
+        let result = fn(gatherNumbers())
+        print("Result: \(result)")
+    }
+    return x;
 }
 
 func history() {
@@ -62,10 +50,10 @@ func history() {
 let commands = [
     "quit": quit,
     "help": help,
-    "add": add,
-    "subtract": subtract,
-    "divide": divide,
-    "multiply": multiply,
+    "add": mathFunc(calculator.add),
+    "subtract": mathFunc(calculator.subtract),
+    "divide": mathFunc(calculator.divide),
+    "multiply": mathFunc(calculator.multiply),
     "history": history,
 ]