diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift index 8fa20b4..0da621c 100644 --- a/AndroidCalculator/Calculator.swift +++ b/AndroidCalculator/Calculator.swift @@ -47,6 +47,15 @@ class Calculator { formula.append(formula.popLast()! + text) } + case ".": + if formula.last!.firstIndex(of: ".") != nil { + return + } else if ["+", "-", "×", "÷"].firstIndex(of: formula.last!) != nil { + return + } else { + formula.append(formula.popLast()! + text) + } + default: print(formula) }