計算加減的結果

2020-05-06 09:40:13 +08:00
parent f11f8455ab
commit 7c79f3af90
1 changed files with 11 additions and 1 deletions
--- 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()!