shorten the logic for negated operations, fix logic bugs in strmath.hpp

radj307 · Mar 4, 2022 · a7b024e · a7b024e
1 parent 1a4f99b
commit a7b024e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 28 deletions.
diff --git a/307lib b/307lib
diff --git a/convlib/include/tokenizers/bitwise.hpp b/convlib/include/tokenizers/bitwise.hpp
@@ -193,39 +193,15 @@ namespace bitwise {
 
 		long long operator&(const Operand& o) const
 		{
-			if (negated && !o.negated)
-				return ~value & o.value;
-			else if (!negated && !o.negated)
-				return value & o.value;
-			else if (!negated && o.negated)
-				return value & ~o.value;
-			else if (negated && o.negated)
-				return ~value & ~o.value;
-			else throw make_exception("Unhandled operation");
+			return (negated ? ~value : value) & (o.negated ? ~o.value : o.value);
 		}
 		long long operator|(const Operand& o) const
 		{
-			if (negated && !o.negated)
-				return ~value | o.value;
-			else if (!negated && !o.negated)
-				return value | o.value;
-			else if (!negated && o.negated)
-				return value | ~o.value;
-			else if (negated && o.negated)
-				return ~value | ~o.value;
-			else throw make_exception("Unhandled operation");
+			return (negated ? ~value : value) | (o.negated ? ~o.value : o.value);
 		}
 		long long operator^(const Operand& o) const
 		{
-			if (negated && !o.negated)
-				return ~value ^ o.value;
-			else if (!negated && !o.negated)
-				return value ^ o.value;
-			else if (!negated && o.negated)
-				return value ^ ~o.value;
-			else if (negated && o.negated)
-				return ~value ^ ~o.value;
-			else throw make_exception("Unhandled operation");
+			return (negated ? ~value : value) ^ (o.negated ? ~o.value : o.value);
 		}
 
 		friend std::ostream& operator<<(std::ostream& os, const Operand& op)