Merge pull request #32 from ricglz0201/orOperator

Implement OR, XOR and NOR operations
ricglz · May 5, 2020 · a9d41e4 · a9d41e4
2 parents 2a0f0bc + ab2062e
commit a9d41e4
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 2 deletions.
diff --git a/BaseCalc/EnvironmentalObjects.swift b/BaseCalc/EnvironmentalObjects.swift
@@ -15,6 +15,9 @@ enum Operation: String {
     case multiply = "x";
     case divide = "÷";
     case and = "AND";
+    case or = "OR";
+    case xor = "XOR";
+    case nor = "NOR";
 }
 
 class LayoutState: ObservableObject {
@@ -124,6 +127,12 @@ class CalculatorState: ObservableObject {
             changePrevNumber(answer: (prevNumber ?? currentNumber) - currentNumber)
         case .and:
             changePrevNumber(answer: (prevNumber ?? currentNumber) & currentNumber)
+        case .or:
+            changePrevNumber(answer: (prevNumber ?? currentNumber) | currentNumber)
+        case .xor:
+            changePrevNumber(answer: (prevNumber ?? currentNumber) ^ currentNumber)
+        case .nor:
+            changePrevNumber(answer: (prevNumber ?? currentNumber) ~| currentNumber)
         default:
             print(prevOperation == nil)
         }

diff --git a/BaseCalc/Number.swift b/BaseCalc/Number.swift
@@ -31,6 +31,8 @@ class FloatingPoint: NSObject {
     }
 }
 
+infix operator ~| : AdditionPrecedence
+
 class Number: NSObject {
     var value: Double
     var base: Base
@@ -209,4 +211,32 @@ class Number: NSObject {
 
         return Number(number: result, base: rightNum.base)
     }
+
+    static func | (leftNum: Number, rightNum: Number) -> Number {
+        let leftVal = Int(leftNum.value)
+        let rightVal = Int(rightNum.value)
+        let result = String(leftVal | rightVal)
+
+        return Number(number: result, base: rightNum.base)
+    }
+
+    static func ^ (leftNum: Number, rightNum: Number) -> Number {
+        let leftVal = Int(leftNum.value)
+        let rightVal = Int(rightNum.value)
+        let result = String(leftVal ^ rightVal)
+
+        return Number(number: result, base: rightNum.base)
+    }
+
+    static func ~| (leftNum: Number, rightNum: Number) -> Number {
+        let orResult = leftNum | rightNum
+
+        let ogBase = orResult.base
+        orResult.setBase(base: .Base2)
+
+        let norResult = orResult.radixComplementDiminished()
+        norResult.setBase(base: ogBase)
+
+        return norResult
+    }
 }
diff --git a/BaseCalc/Views/KeypadButton.swift b/BaseCalc/Views/KeypadButton.swift
@@ -50,9 +50,9 @@ struct KeypadButton: View {
                 Text(label)
                     .modifier(LightGrayButton(width: width, height: height, altCondition: false))
             })
-        case "AND":
+        case "AND", "OR", "XOR", "NOR":
             return makeBitwiseButton(op: Operation(rawValue: label)!)
-        case "NOR", "OR", "XOR", ">>", "<<", "X>>Y", "X<<Y":
+        case ">>", "<<", "X>>Y", "X<<Y":
             let disabled = calculatorState.isInvalidForBitOperations()
             return AnyView(Button(action: generalAction({})) {
                 Text(label)

diff --git a/BaseCalcTests/CalculatorStateTests.swift b/BaseCalcTests/CalculatorStateTests.swift
@@ -114,6 +114,21 @@ class CalculatorStateTests: XCTestCase {
         numericalOperationsAux(and, "AND")
     }
 
+    func testOr() {
+        let or = { self.state.performOperation(op: .or) }
+        numericalOperationsAux(or, "OR")
+    }
+
+    func testXor() {
+        let xor = { self.state.performOperation(op: .xor) }
+        numericalOperationsAux(xor, "XOR")
+    }
+
+    func testNor() {
+        let nor = { self.state.performOperation(op: .nor) }
+        numericalOperationsAux(nor, "NOR")
+    }
+
     //MARK:- Change Sign Operation
 
     func testChangeSignOfZero() {

diff --git a/BaseCalcTests/NumberTests.swift b/BaseCalcTests/NumberTests.swift
@@ -389,4 +389,31 @@ class NumberTests: XCTestCase {
         XCTAssertFalse(num3.hasFract)
         XCTAssertEqual(num3.base, Base.Base10)
     }
+
+    func testOrOperation(){
+        num1 = Number(number: "10", base: .Base10)
+        num2 = Number(number: "3", base: .Base10)
+        num3 = num1 | num2
+        XCTAssertEqual(num3.value, 11.0)
+        XCTAssertFalse(num3.hasFract)
+        XCTAssertEqual(num3.base, Base.Base10)
+    }
+
+    func testXorOperation(){
+        num1 = Number(number: "10", base: .Base10)
+        num2 = Number(number: "3", base: .Base10)
+        num3 = num1 ^ num2
+        XCTAssertEqual(num3.value, 9.0)
+        XCTAssertFalse(num3.hasFract)
+        XCTAssertEqual(num3.base, Base.Base10)
+    }
+
+    func testNorOperation(){
+        num1 = Number(number: "10", base: .Base10)
+        num2 = Number(number: "3", base: .Base10)
+        num3 = num1 ~| num2
+        XCTAssertEqual(num3.value, 4.0)
+        XCTAssertFalse(num3.hasFract)
+        XCTAssertEqual(num3.base, Base.Base10)
+    }
 }