From 7c79f3af90f19b1b4717b39d1012a3da3cc686a2 Mon Sep 17 00:00:00 2001
From: Pin Lin <moneycat711@gmail.com>
Date: Wed, 6 May 2020 09:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A8=88=E7=AE=97=E5=8A=A0=E6=B8=9B=E7=9A=84?=
 =?UTF-8?q?=E7=B5=90=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AndroidCalculator/Calculator.swift | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift
index 38c5924..d3783fe 100644
--- a/AndroidCalculator/Calculator.swift
+++ b/AndroidCalculator/Calculator.swift
@@ -55,7 +55,17 @@ class Calculator {
           
         }
       }
-      
+      while calculatingFormula.count > 1 {
+        let number1 = Double(calculatingFormula[0])!
+        let number2 = Double(calculatingFormula[2])!
+        if calculatingFormula[1] == "+" {
+          calculatingFormula[0] = String(number1 + number2)
+        } else {
+          calculatingFormula[0] = String(number1 - number2)
+        }
+        calculatingFormula.remove(at: 2)
+        calculatingFormula.remove(at: 1)
+      }
       
       if Double(calculatingFormula.last!)!.truncatingRemainder(dividingBy: 1) == 0 {
         var number = calculatingFormula.popLast()!