Formatting

DanielKrawisz · Mar 15, 2024 · f3439d4 · f3439d4
1 parent af02824
commit f3439d4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -29,7 +29,7 @@ def set_version (self):
         if "CURRENT_VERSION" in environ:
             self.version = environ['CURRENT_VERSION']
         else:
-            self.version = "v0.0.26"
+            self.version = "v0.0.27"
 
     def configure_cmake (self):
         cmake = CMake (self)

diff --git a/include/data/tools/ordered_list.hpp b/include/data/tools/ordered_list.hpp
@@ -54,7 +54,7 @@ namespace data::tool {
         }
 
         template <data::sequence X> requires std::equality_comparable_with<element, data::element_of<X>>
-        bool operator == (const X& x) const {
+        bool operator == (const X &x) const {
             return sequence_equal (*this, x);
         }
 
@@ -92,8 +92,11 @@ namespace data::tool {
 
     template <functional::stack stack, ordered element>
     ordered_stack<stack, element> ordered_stack<stack, element>::insert (const element &x) const {
-        if (this->empty () || x < this->first ()) return {this->prepend (x)};
-        return {rest ().insert (x).prepend (this->first ())};
+        if (this->empty () || x < this->first ()) {
+            return ordered_stack {this->prepend (x)};
+        }
+
+        return ordered_stack {rest ().insert (x).prepend (this->first ())};
     }
 }
 

diff --git a/include/data/tools/rb_map.hpp b/include/data/tools/rb_map.hpp
@@ -112,6 +112,7 @@ namespace data::tool {
     };
 
     // a map that is good for deriving from.
+    // NOTE: it seems that using this type leads to segmentation faults, not sure why.
     template <typename K, typename V, typename derived> struct base_rb_map : rb_map<K, V> {
         using rb_map<K, V>::rb_map;
 

diff --git a/include/milewski/RBMap/RBMap.h b/include/milewski/RBMap/RBMap.h
@@ -111,8 +111,8 @@ namespace milewski::okasaki {
 
         RBMap inserted (const K &x, const V &v) const
         {
-            RBMap t = ins(x, v);
-            return RBMap(B, t.left(), t.rootKey (), t.rootValue (), t.right ());
+            RBMap t = ins (x, v);
+            return RBMap (B, t.left (), t.rootKey (), t.rootValue (), t.right ());
         }
 
         template<class F>
@@ -153,7 +153,8 @@ namespace milewski::okasaki {
 
         RBMap ins (const K &x, const V &v) const
         {
-            assert1();
+
+            assert1 ();
             if (isEmpty ())
                 return RBMap (R, RBMap (), x, v, RBMap ());
             K y = rootKey ();