Merge branch 'main' into python

OxiDD · Apr 24, 2024 · 3feb362 · 3feb362
2 parents b5e292f + 4a5a7b8
commit 3feb362
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -5,7 +5,7 @@
   "ignorePaths": [
     "/.cache/",
     "/.cspellcache",
-    "/.git/",
+    "/.git",
     "/.project-words.txt",
     "/build/",
     "/doc/book/book/",

diff --git a/bindings/cpp/include/oxidd/bcdd.hpp b/bindings/cpp/include/oxidd/bcdd.hpp
@@ -533,7 +533,7 @@ class bcdd_function {
   /// Locking behavior: acquires the manager's lock for shared access.
   ///
   /// @returns  Node count including the terminal node
-  [[nodiscard]] size_t node_count() const noexcept {
+  [[nodiscard]] std::size_t node_count() const noexcept {
     assert(_func._p);
     return capi::oxidd_bcdd_node_count(_func);
   }

diff --git a/bindings/cpp/include/oxidd/bdd.hpp b/bindings/cpp/include/oxidd/bdd.hpp
@@ -531,7 +531,7 @@ class bdd_function {
   /// Locking behavior: acquires the manager's lock for shared access.
   ///
   /// @returns  Node count including the two terminal nodes
-  [[nodiscard]] uint64_t node_count() const noexcept {
+  [[nodiscard]] std::size_t node_count() const noexcept {
     assert(_func._p);
     return capi::oxidd_bdd_node_count(_func);
   }

diff --git a/bindings/cpp/include/oxidd/concepts.hpp b/bindings/cpp/include/oxidd/concepts.hpp
@@ -5,6 +5,7 @@
 #if __cplusplus >= 202002L
 
 #include <concepts>
+#include <cstddef>
 #include <cstdlib>
 #include <functional>
 #include <utility>

diff --git a/bindings/cpp/include/oxidd/zbdd.hpp b/bindings/cpp/include/oxidd/zbdd.hpp
@@ -561,7 +561,7 @@ class zbdd_function {
   /// Locking behavior: acquires the manager's lock for shared access.
   ///
   /// @returns  Node count including the two terminal nodes
-  [[nodiscard]] uint64_t node_count() const noexcept {
+  [[nodiscard]] std::size_t node_count() const noexcept {
     assert(_func._p);
     return capi::oxidd_zbdd_node_count(_func);
   }

diff --git a/crates/oxidd-rules-bdd/src/simple/mod.rs b/crates/oxidd-rules-bdd/src/simple/mod.rs
@@ -234,7 +234,7 @@ fn terminal_bin<'a, M: Manager<Terminal = BDDTerminal>, const OP: u8>(
         match (m.get_node(f), m.get_node(g)) {
             // Unique representation of {f, g} for commutative functions
             (Inner(_), Inner(_)) if f > g => Binary(BDDOp::And, g.borrowed(), f.borrowed()),
-            (Inner(_), Inner(_)) => Binary(BDDOp::And, g.borrowed(), f.borrowed()),
+            (Inner(_), Inner(_)) => Binary(BDDOp::And, f.borrowed(), g.borrowed()),
             (Terminal(t), _) | (_, Terminal(t)) if *t.borrow() == False => {
                 Done(m.get_terminal(False).unwrap())
             }
@@ -247,7 +247,7 @@ fn terminal_bin<'a, M: Manager<Terminal = BDDTerminal>, const OP: u8>(
         }
         match (m.get_node(f), m.get_node(g)) {
             (Inner(_), Inner(_)) if f > g => Binary(BDDOp::Or, g.borrowed(), f.borrowed()),
-            (Inner(_), Inner(_)) => Binary(BDDOp::Or, g.borrowed(), f.borrowed()),
+            (Inner(_), Inner(_)) => Binary(BDDOp::Or, f.borrowed(), g.borrowed()),
             (Terminal(t), _) | (_, Terminal(t)) if *t.borrow() == True => {
                 Done(m.get_terminal(True).unwrap())
             }
@@ -260,7 +260,7 @@ fn terminal_bin<'a, M: Manager<Terminal = BDDTerminal>, const OP: u8>(
         }
         match (m.get_node(f), m.get_node(g)) {
             (Inner(_), Inner(_)) if f > g => Binary(BDDOp::Nand, g.borrowed(), f.borrowed()),
-            (Inner(_), Inner(_)) => Binary(BDDOp::Nand, g.borrowed(), f.borrowed()),
+            (Inner(_), Inner(_)) => Binary(BDDOp::Nand, f.borrowed(), g.borrowed()),
             (Terminal(t), _) | (_, Terminal(t)) if *t.borrow() == False => {
                 Done(m.get_terminal(True).unwrap())
             }
@@ -273,7 +273,7 @@ fn terminal_bin<'a, M: Manager<Terminal = BDDTerminal>, const OP: u8>(
         }
         match (m.get_node(f), m.get_node(g)) {
             (Inner(_), Inner(_)) if f > g => Binary(BDDOp::Nor, g.borrowed(), f.borrowed()),
-            (Inner(_), Inner(_)) => Binary(BDDOp::Nor, g.borrowed(), f.borrowed()),
+            (Inner(_), Inner(_)) => Binary(BDDOp::Nor, f.borrowed(), g.borrowed()),
             (Terminal(t), _) | (_, Terminal(t)) if *t.borrow() == True => {
                 Done(m.get_terminal(False).unwrap())
             }