From 7c3ba17a362ab4d20ca461e3592b3467c4f98c7e Mon Sep 17 00:00:00 2001 From: TheAlgorithm476 Date: Wed, 21 May 2025 10:15:58 +0200 Subject: [PATCH] Replace Operand with Operator --- Sources/PMCalc/{Operand.swift => Operator.swift} | 2 +- Sources/PMCalc/ViewModel.swift | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) rename Sources/PMCalc/{Operand.swift => Operator.swift} (82%) diff --git a/Sources/PMCalc/Operand.swift b/Sources/PMCalc/Operator.swift similarity index 82% rename from Sources/PMCalc/Operand.swift rename to Sources/PMCalc/Operator.swift index 83f94e3..07bb8e2 100644 --- a/Sources/PMCalc/Operand.swift +++ b/Sources/PMCalc/Operator.swift @@ -1,4 +1,4 @@ -enum Operand { +enum Operator { case add case sub case mul diff --git a/Sources/PMCalc/ViewModel.swift b/Sources/PMCalc/ViewModel.swift index 9dc96ba..893e48c 100644 --- a/Sources/PMCalc/ViewModel.swift +++ b/Sources/PMCalc/ViewModel.swift @@ -5,7 +5,7 @@ struct ViewModel { private var numberBuffer: String = "" private var number1: Double? = nil private var number2: Double? = nil - private var operand: Operand? = nil + private var op: Operator? = nil @State private(set) var display: String = "" @@ -13,7 +13,7 @@ struct ViewModel { numberBuffer = "" number1 = nil number2 = nil - operand = nil + op = nil display = "" } @@ -31,18 +31,18 @@ struct ViewModel { display = numberBuffer } - mutating func operation(_ operand: Operand) { + mutating func operation(_ op: Operator) { guard !numberBuffer.isEmpty && number1 == nil else { return } - self.operand = operand + self.op = op if number1 == nil { number1 = Double(numberBuffer) } else { number2 = Double(numberBuffer) } numberBuffer = "" - if operand == .sqrt { + if op == .sqrt { display = String(sqrt(number1!)) number1 = nil - self.operand = nil + self.op = nil } } @@ -52,7 +52,7 @@ struct ViewModel { var result: Double = 0.0 - switch operand { + switch op { case .add: result = add_nums(number1!, number2!) case .sub: