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) }