[Bugfix] IAssociativeAndCommutative (open-algebra#56)

* Fixed the concept IAssociativeAndCommutative, and made GetStaticCategory a consexpr * fixed formating --------- Co-authored-by: Benjamin Yankowitz <ben@DESKTOP-VBLHJ5F>
BenjaminYankowitz · Mar 12, 2024 · efa4b62 · efa4b62
1 parent 14fafc1
commit efa4b62
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/include/Oasis/BinaryExpression.hpp b/include/Oasis/BinaryExpression.hpp
@@ -22,7 +22,7 @@ template <typename MostSigOpT, typename LeastSigOpT, typename T>
 concept IOperand = std::is_same_v<T, MostSigOpT> || std::is_same_v<T, LeastSigOpT>;
 
 template <template <typename, typename> typename T>
-concept IAssociativeAndCommutative = IExpression<T<Expression, Expression>> && requires { (T<Expression, Expression>::GetStaticCategory() & (Associative | Commutative)) != 0; };
+concept IAssociativeAndCommutative = IExpression<T<Expression, Expression>> && ((T<Expression, Expression>::GetStaticCategory() & (Associative | Commutative)) == (Associative | Commutative));
 
 template <typename T, typename... U>
 concept IsAnyOf = (std::same_as<T, U> || ...);

diff --git a/include/Oasis/Expression.hpp b/include/Oasis/Expression.hpp
@@ -269,15 +269,15 @@ class Expression {
         return ExpressionType::type;                \
     }
 
-#define EXPRESSION_CATEGORY(category)             \
-    auto GetCategory() const -> uint32_t override \
-    {                                             \
-        return category;                          \
-    }                                             \
-                                                  \
-    static auto GetStaticCategory() -> uint32_t   \
-    {                                             \
-        return category;                          \
+#define EXPRESSION_CATEGORY(category)                     \
+    auto GetCategory() const -> uint32_t override         \
+    {                                                     \
+        return category;                                  \
+    }                                                     \
+                                                          \
+    constexpr static auto GetStaticCategory() -> uint32_t \
+    {                                                     \
+        return category;                                  \
     }
 
 } // namespace Oasis