Fix AND, OR, NOT & XOR operators when base is not 10

ricglz · May 26, 2020 · 007f64d · 007f64d
1 parent 0a1d3aa
commit 007f64d
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/BaseCalc/Number.swift b/BaseCalc/Number.swift
@@ -228,25 +228,31 @@ class Number: NSObject {
     static func & (leftNum: Number, rightNum: Number) throws -> Number {
         let leftVal = Int(leftNum.value)
         let rightVal = Int(rightNum.value)
-        let result = String(leftVal & rightVal)
+        let strResult = String(leftVal & rightVal)
+        let result = try Number(number: strResult, base: .Base10)
 
-        return try Number(number: result, base: rightNum.base)
+        result.setBase(base: rightNum.base)
+        return result
     }
 
     static func | (leftNum: Number, rightNum: Number) throws -> Number {
         let leftVal = Int(leftNum.value)
         let rightVal = Int(rightNum.value)
-        let result = String(leftVal | rightVal)
+        let strResult = String(leftVal | rightVal)
+        let result = try Number(number: strResult, base: .Base10)
 
-        return try Number(number: result, base: rightNum.base)
+        result.setBase(base: rightNum.base)
+        return result
     }
 
     static func ^ (leftNum: Number, rightNum: Number) throws -> Number {
         let leftVal = Int(leftNum.value)
         let rightVal = Int(rightNum.value)
-        let result = String(leftVal ^ rightVal)
+        let strResult = String(leftVal ^ rightVal)
+        let result = try Number(number: strResult, base: .Base10)
 
-        return try Number(number: result, base: rightNum.base)
+        result.setBase(base: rightNum.base)
+        return result
     }
 
     static func ~| (leftNum: Number, rightNum: Number) throws -> Number {