계산기 [STEP2] 가마

Calculator/Calculator.xcodeproj/project.pbxproj

@@ -7,8 +7,16 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		06145E582B792BA500F39DD3 /* CalculatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06145E572B792BA500F39DD3 /* CalculatorTests.swift */; };
+		060891552B8348B100002F9B /* CalculatorError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 060891542B8348B100002F9B /* CalculatorError.swift */; };
+		060891572B834DF600002F9B /* FormulaTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 060891562B834DF600002F9B /* FormulaTests.swift */; };
+		06145E582B792BA500F39DD3 /* CalculatorItemQueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06145E572B792BA500F39DD3 /* CalculatorItemQueueTests.swift */; };
 		06145E5F2B792C1000F39DD3 /* CalculatorItemQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06145E5E2B792C1000F39DD3 /* CalculatorItemQueue.swift */; };
+		06EA151C2B7CDA22001821CA /* Operator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EA151B2B7CDA22001821CA /* Operator.swift */; };
+		06EA15202B7CFFB2001821CA /* Formula.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EA151F2B7CFFB2001821CA /* Formula.swift */; };
+		06EA15222B7D0084001821CA /* ExpressionParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EA15212B7D0084001821CA /* ExpressionParser.swift */; };
+		06EA15282B7D4B76001821CA /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EA15272B7D4B76001821CA /* StringExtension.swift */; };
+		06EA152A2B7D4CF4001821CA /* DoubleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EA15292B7D4CF4001821CA /* DoubleExtension.swift */; };
+		06EA152C2B7D4D11001821CA /* CalculateItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EA152B2B7D4D11001821CA /* CalculateItem.swift */; };
 		C713D9422570E5EB001C3AFC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C713D9412570E5EB001C3AFC /* AppDelegate.swift */; };
 		C713D9442570E5EB001C3AFC /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C713D9432570E5EB001C3AFC /* SceneDelegate.swift */; };
 		C713D9462570E5EB001C3AFC /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C713D9452570E5EB001C3AFC /* ViewController.swift */; };
@@ -28,9 +36,17 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		060891542B8348B100002F9B /* CalculatorError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorError.swift; sourceTree = "<group>"; };
+		060891562B834DF600002F9B /* FormulaTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormulaTests.swift; sourceTree = "<group>"; };
 		06145E552B792BA500F39DD3 /* CalculatorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CalculatorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		06145E572B792BA500F39DD3 /* CalculatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorTests.swift; sourceTree = "<group>"; };
+		06145E572B792BA500F39DD3 /* CalculatorItemQueueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorItemQueueTests.swift; sourceTree = "<group>"; };
 		06145E5E2B792C1000F39DD3 /* CalculatorItemQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculatorItemQueue.swift; sourceTree = "<group>"; };
+		06EA151B2B7CDA22001821CA /* Operator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Operator.swift; sourceTree = "<group>"; };
+		06EA151F2B7CFFB2001821CA /* Formula.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Formula.swift; sourceTree = "<group>"; };
+		06EA15212B7D0084001821CA /* ExpressionParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpressionParser.swift; sourceTree = "<group>"; };
+		06EA15272B7D4B76001821CA /* StringExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtension.swift; sourceTree = "<group>"; };
+		06EA15292B7D4CF4001821CA /* DoubleExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoubleExtension.swift; sourceTree = "<group>"; };
+		06EA152B2B7D4D11001821CA /* CalculateItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalculateItem.swift; sourceTree = "<group>"; };
 		C713D93E2570E5EB001C3AFC /* Calculator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Calculator.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C713D9412570E5EB001C3AFC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		C713D9432570E5EB001C3AFC /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -62,11 +78,51 @@
 		06145E562B792BA500F39DD3 /* CalculatorTests */ = {
 			isa = PBXGroup;
 			children = (
-				06145E572B792BA500F39DD3 /* CalculatorTests.swift */,
+				06145E572B792BA500F39DD3 /* CalculatorItemQueueTests.swift */,
+				060891562B834DF600002F9B /* FormulaTests.swift */,
 			);
 			path = CalculatorTests;
 			sourceTree = "<group>";
 		};
+		06D0E84E2B883BE400F3113E /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				06145E5E2B792C1000F39DD3 /* CalculatorItemQueue.swift */,
+				06EA151F2B7CFFB2001821CA /* Formula.swift */,
+				06EA15212B7D0084001821CA /* ExpressionParser.swift */,
+				06EA152B2B7D4D11001821CA /* CalculateItem.swift */,
+				06EA151B2B7CDA22001821CA /* Operator.swift */,
+				060891542B8348B100002F9B /* CalculatorError.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		06D0E84F2B883BFD00F3113E /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				C713D9452570E5EB001C3AFC /* ViewController.swift */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		06D0E8502B883C0600F3113E /* View */ = {
+			isa = PBXGroup;
+			children = (
+				C713D9472570E5EB001C3AFC /* Main.storyboard */,
+				C713D94C2570E5ED001C3AFC /* LaunchScreen.storyboard */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		06D0E8512B883CE400F3113E /* Extension */ = {
+			isa = PBXGroup;
+			children = (
+				06EA15292B7D4CF4001821CA /* DoubleExtension.swift */,
+				06EA15272B7D4B76001821CA /* StringExtension.swift */,
+			);
+			path = Extension;
+			sourceTree = "<group>";
+		};
 		C713D9352570E5EB001C3AFC = {
 			isa = PBXGroup;
 			children = (
@@ -88,13 +144,13 @@
 		C713D9402570E5EB001C3AFC /* Calculator */ = {
 			isa = PBXGroup;
 			children = (
+				06D0E8512B883CE400F3113E /* Extension */,
+				06D0E84E2B883BE400F3113E /* Model */,
+				06D0E8502B883C0600F3113E /* View */,
+				06D0E84F2B883BFD00F3113E /* Controller */,
 				C713D9412570E5EB001C3AFC /* AppDelegate.swift */,
 				C713D9432570E5EB001C3AFC /* SceneDelegate.swift */,
-				C713D9452570E5EB001C3AFC /* ViewController.swift */,
-				06145E5E2B792C1000F39DD3 /* CalculatorItemQueue.swift */,
-				C713D9472570E5EB001C3AFC /* Main.storyboard */,
 				C713D94A2570E5ED001C3AFC /* Assets.xcassets */,
-				C713D94C2570E5ED001C3AFC /* LaunchScreen.storyboard */,
 				C713D94F2570E5ED001C3AFC /* Info.plist */,
 			);
 			path = Calculator;
@@ -200,7 +256,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				06145E582B792BA500F39DD3 /* CalculatorTests.swift in Sources */,
+				060891572B834DF600002F9B /* FormulaTests.swift in Sources */,
+				06145E582B792BA500F39DD3 /* CalculatorItemQueueTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -210,7 +267,14 @@
 			files = (
 				C713D9462570E5EB001C3AFC /* ViewController.swift in Sources */,
 				C713D9422570E5EB001C3AFC /* AppDelegate.swift in Sources */,
+				06EA15202B7CFFB2001821CA /* Formula.swift in Sources */,
+				06EA152A2B7D4CF4001821CA /* DoubleExtension.swift in Sources */,
+				06EA151C2B7CDA22001821CA /* Operator.swift in Sources */,
+				06EA152C2B7D4D11001821CA /* CalculateItem.swift in Sources */,
+				06EA15282B7D4B76001821CA /* StringExtension.swift in Sources */,
+				060891552B8348B100002F9B /* CalculatorError.swift in Sources */,
 				C713D9442570E5EB001C3AFC /* SceneDelegate.swift in Sources */,
+				06EA15222B7D0084001821CA /* ExpressionParser.swift in Sources */,
 				06145E5F2B792C1000F39DD3 /* CalculatorItemQueue.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Calculator/Calculator/ViewController.swift → Calculator/Calculator/Controller/ViewController.swift

@@ -7,12 +7,8 @@
 import UIKit
 
 class ViewController: UIViewController {
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Do any additional setup after loading the view.
     }
-
-
 }
-

Calculator/Calculator/Extension/DoubleExtension.swift

@@ -0,0 +1,12 @@
+//
+//  DoubleExtension.swift
+//  Calculator
+//
+//  Created by H on 2/15/24.
+//
+
+import Foundation
+
+extension Double: CalculateItem {
+
+}

Calculator/Calculator/Extension/StringExtension.swift

@@ -0,0 +1,14 @@
+//
+//  StringExtension.swift
+//  Calculator
+//
+//  Created by H on 2/15/24.
+//
+
+import Foundation
+
+extension String {
+    func split(with target: Character) -> [String] {
+        return self.split(separator: target).map { String($0) }
+    }
+}

Calculator/Calculator/Model/CalculateItem.swift

@@ -0,0 +1,12 @@
+//
+//  CalculateItem.swift
+//  Calculator
+//
+//  Created by H on 2/15/24.
+//
+
+import Foundation
+
+protocol CalculateItem {
+
+}

Calculator/Calculator/Model/CalculatorError.swift

@@ -0,0 +1,12 @@
+//
+//  CalculatorError.swift
+//  Calculator
+//
+//  Created by H on 2/19/24.
+//
+
+import Foundation
+
+enum CalculatorError: Error {
+    case divideByZero
+}

Calculator/Calculator/CalculatorItemQueue.swift → Calculator/Calculator/Model/CalculatorItemQueue.swift

@@ -7,13 +7,9 @@
 
 import Foundation
 
-protocol CalculateItem {
-
-}
-
-struct CalculatorItemQueue: CalculateItem {
-    private var inbox: [Int] = []
-    private var outbox: [Int] = []
+struct CalculatorItemQueue<T>: CalculateItem {
+    private var inbox: [T] = []
+    private var outbox: [T] = []
 
     var size: Int {
         return inbox.count + outbox.count
@@ -27,11 +23,11 @@ struct CalculatorItemQueue: CalculateItem {
         }
     }
 
-    mutating func push(_ data: Int) {
+    mutating func push(_ data: T) {
         inbox.append(data)
     }
 
-    mutating func pop() -> Int? {
+    mutating func pop() -> T? {
         if outbox.isEmpty {
             outbox = inbox.reversed()
             inbox.removeAll()
@@ -40,7 +36,7 @@ struct CalculatorItemQueue: CalculateItem {
         return outbox.popLast()
     }
 
-    mutating func front() -> Int? {
+    mutating func front() -> T? {
         if outbox.isEmpty {
             outbox = inbox.reversed()
             inbox.removeAll()
@@ -49,7 +45,7 @@ struct CalculatorItemQueue: CalculateItem {
         return outbox.last
     }
 
-    mutating func rear() -> Int? {
+    mutating func rear() -> T? {
         if inbox.isEmpty {
             return outbox.first
         }

Calculator/Calculator/Model/ExpressionParser.swift

@@ -0,0 +1,54 @@
+//
+//  ExpressionParser.swift
+//  Calculator
+//
+//  Created by H on 2/14/24.
+//
+
+import Foundation
+
+enum ExpressionParser {
+    static func parse(from input: String) -> Formula {
+        var operands: CalculatorItemQueue<Double> = CalculatorItemQueue<Double>()
+        var operators: CalculatorItemQueue<Operator> = CalculatorItemQueue<Operator>()
+
+        let parsedExpressions = componentsByOperators(from: input)
+        for expression in parsedExpressions {
+            if let operand = Double(expression) {
+                operands.push(operand)
+                break
+            }
+
+            if let `operator` = Operator(rawValue: Character(expression)) {
+                operators.push(`operator`)
+                break
+            }
+        }
+
+        return Formula(operands: operands, operators: operators)
+    }
+
+    static private func componentsByOperators(from input: String) -> [String] {
+        var components: [String] = []
+        var tempOperand: String = ""
+
+        for char in input {
+            let str = String(char)
+            if Operator.allCases.contains(where: { `operator` in
+                return `operator`.rawValue == char
+            }) {
+                components.append(tempOperand)
+                components.append(str)
+                tempOperand = ""
+            } else {
+                tempOperand.append(str)
+            }
+        }
+
+        if tempOperand != "" {
+            components.append(tempOperand)
+        }
+
+        return components
+    }
+}

Calculator/Calculator/Model/Formula.swift

@@ -0,0 +1,44 @@
+//
+//  Formula.swift
+//  Calculator
+//
+//  Created by H on 2/14/24.
+//
+
+import Foundation
+
+struct Formula {
+    var operands: CalculatorItemQueue<Double> = CalculatorItemQueue<Double>()
+    var operators: CalculatorItemQueue<Operator> = CalculatorItemQueue<Operator>()
+
+    mutating func result() throws -> Double {
+        var formulaResult: Double? = nil
+
+        while let operand = operands.pop() {
+            if let result = formulaResult {
+                let operatorCharacter = operators.pop()
+
+                switch operatorCharacter {
+                case .add:
+                    formulaResult = Operator.add.calculate(lhs: result, rhs: operand)
+                case .substract:
+                    formulaResult = Operator.substract.calculate(lhs: result, rhs: operand)
+                case .divide:
+                    if operand == 0 {
+                        throw CalculatorError.divideByZero
+                    }
+
+                    formulaResult = Operator.divide.calculate(lhs: result, rhs: operand)
+                case .multiply:
+                    formulaResult = Operator.multiply.calculate(lhs: result, rhs: operand)
+                default:
+                    break
+                }
+            } else {
+                formulaResult = operand
+            }
+        }
+
+        return formulaResult ?? 0.0
+    }
+}

Calculator/Calculator/Model/Operator.swift

@@ -0,0 +1,44 @@
+//
+//  Operator.swift
+//  Calculator
+//
+//  Created by H on 2/14/24.
+//
+
+import Foundation
+
+enum Operator: Character, CaseIterable, CalculateItem {
+    case add = "+"
+    case substract = "−"
+    case divide = "÷"
+    case multiply = "×"
+
+    func calculate(lhs: Double, rhs: Double) -> Double {
+        switch self {
+        case .add:
+            return add(lhs: lhs, rhs: rhs)
+        case .substract:
+            return substract(lhs: lhs, rhs: rhs)
+        case .divide:
+            return divide(lhs: lhs, rhs: rhs)
+        case .multiply:
+            return multiply(lhs: lhs, rhs: rhs)
+        }
+    }
+
+    private func add(lhs: Double, rhs: Double) -> Double {
+        return lhs + rhs
+    }
+
+    private func substract(lhs: Double, rhs: Double) -> Double {
+        return lhs - rhs
+    }
+
+    private func divide(lhs: Double, rhs: Double) -> Double {
+        return lhs / rhs
+    }
+
+    private func multiply(lhs: Double, rhs: Double) -> Double {
+        return lhs * rhs
+    }
+}