From f11f8455ab4ff25a78fff26e38187aa087329b4a Mon Sep 17 00:00:00 2001 From: Pin Lin Date: Wed, 6 May 2020 09:29:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=A6=E4=BD=9C=20result=20=E7=9A=84?= =?UTF-8?q?=E5=B0=8F=E6=95=B8=E8=BD=89=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, 9 insertions(+), 1 deletion(-) diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift index 74be81f..38c5924 100644 --- a/AndroidCalculator/Calculator.swift +++ b/AndroidCalculator/Calculator.swift @@ -56,8 +56,16 @@ class Calculator { } } + + if Double(calculatingFormula.last!)!.truncatingRemainder(dividingBy: 1) == 0 { + var number = calculatingFormula.popLast()! + number.removeLast() + number.removeLast() + calculatingFormula.append(number) + } + print(calculatingFormula) - return calculatingFormula[0] + return calculatingFormula.last! } }