From cdea96e3142cf45ead5806d51863ae9893963c48 Mon Sep 17 00:00:00 2001 From: Pin Lin Date: Wed, 6 May 2020 09:26:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=A7=8B=E5=B0=8F=E6=95=B8=E8=BD=89?= =?UTF-8?q?=E6=95=B4=E6=95=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidCalculator/Calculator.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift index 5ead6d0..2c528a2 100644 --- a/AndroidCalculator/Calculator.swift +++ b/AndroidCalculator/Calculator.swift @@ -115,10 +115,12 @@ class Calculator { if ["+", "-", "×", "÷"].firstIndex(of: formula.last!) != nil { return } - if (Double(formula.last!)! / 100).truncatingRemainder(dividingBy: 1) != 0 { - formula.append(String(Double(formula.popLast()!)! / 100)) - } else { - formula.append(String(Int(formula.popLast()!)! / 100)) + formula.append(String(Double(formula.popLast()!)! / 100)) + if Double(formula.last!)!.truncatingRemainder(dividingBy: 1) == 0 { + var number = formula.popLast()! + number.removeLast() + number.removeLast() + formula.append(number) } default: