PinLin/AndroidCalculator
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

直接用中文當變數名字啦

Browse Source
This commit is contained in:
Pin Lin
2020-05-06 09:16:23 +08:00
parent 27b7669ba1
commit ee555169c1
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
AndroidCalculator/Calculator.swift
View File

@@ -33,31 +33,26 @@ class Calculator {
}
while true {
let indexOfMultiplication = calculatingFormula.firstIndex(of: "×")
let indexOfDivision = calculatingFormula.firstIndex(of: "÷")
let indexOf乘號 = calculatingFormula.firstIndex(of: "×")
let indexOf除號 = calculatingFormula.firstIndex(of: "÷")
if indexOfMultiplication == nil && indexOfDivision == nil {
if indexOf乘號 == nil && indexOf除號 == nil {
break
}
if indexOfMultiplication != nil {
if indexOfDivision == nil || indexOfMultiplication! < indexOfDivision! {
let number1 = Double(calculatingFormula[indexOfMultiplication! - 1])!
let number2 = Double(calculatingFormula[indexOfMultiplication! + 1])!
calculatingFormula[indexOfMultiplication! - 1] = String(number1 * number2)
calculatingFormula.remove(at: indexOfMultiplication! + 1)
calculatingFormula.remove(at: indexOfMultiplication!)
continue
}
if indexOf乘號 != nil && (indexOf除號 == nil || indexOf乘號! < indexOf除號!) {
let number1 = Double(calculatingFormula[indexOf乘號! - 1])!
let number2 = Double(calculatingFormula[indexOf乘號! + 1])!
calculatingFormula[indexOf乘號! - 1] = String(number1 * number2)
calculatingFormula.remove(at: indexOf乘號! + 1)
calculatingFormula.remove(at: indexOf乘號!)
}
if indexOfDivision != nil {
if indexOfMultiplication == nil || indexOfDivision! < indexOfMultiplication! {
let number1 = Double(calculatingFormula[indexOfDivision! - 1])!
let number2 = Double(calculatingFormula[indexOfDivision! + 1])!
calculatingFormula[indexOfDivision! - 1] = String(number1 / number2)
calculatingFormula.remove(at: indexOfDivision! + 1)
calculatingFormula.remove(at: indexOfDivision!)
continue
}
if indexOf除號 != nil && (indexOf乘號 == nil || indexOf除號! < indexOf乘號!) {
let number1 = Double(calculatingFormula[indexOf除號! - 1])!
let number2 = Double(calculatingFormula[indexOf除號! + 1])!
calculatingFormula[indexOf除號! - 1] = String(number1 / number2)
calculatingFormula.remove(at: indexOf除號! + 1)
calculatingFormula.remove(at: indexOf除號!)
}
}