From 928396d516c281f315c78137591d8481e5c27086 Mon Sep 17 00:00:00 2001 From: Pin Lin Date: Wed, 6 May 2020 07:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=A6=E4=BD=9C=E6=8C=89=E4=B8=8B=20%=20?= =?UTF-8?q?=E8=A6=81=E6=80=8E=E9=BA=BC=E8=99=95=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidCalculator/Calculator.swift | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift index f208ce9..ea4d9c5 100644 --- a/AndroidCalculator/Calculator.swift +++ b/AndroidCalculator/Calculator.swift @@ -72,6 +72,16 @@ class Calculator { formula.append("-" + formula.popLast()!) } + case "%": + 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)) + } + default: print(formula) }