Changeset fc1a3e2 for src/Common

Timestamp:

Apr 19, 2024, 2:36:52 PM (5 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

ba97ebf

Parents:

b9b6efb

Message:

Style update. Focused on indentation and trailing whitespace.

Location:

src/Common

Files:

• PersistentMap.h (modified) (6 diffs)
• VectorMap.h (modified) (5 diffs)

src/Common/PersistentMap.h

@@ -23 +23 @@
 #include <utility>        // for forward, move
 
-/// Wraps a hash table in a persistent data structure, using a technique based 
-/// on the persistent array in Conchon & Filliatre "A Persistent Union-Find 
+/// Wraps a hash table in a persistent data structure, using a technique based
+/// on the persistent array in Conchon & Filliatre "A Persistent Union-Find
 /// Data Structure"
 
 template<typename Key, typename Val,
-         typename Hash = std::hash<Key>, typename Eq = std::equal_to<Key>>
-class PersistentMap 
+                typename Hash = std::hash<Key>, typename Eq = std::equal_to<Key>>
+class PersistentMap
         : public std::enable_shared_from_this<PersistentMap<Key, Val, Hash, Eq>> {
 public:
@@ -38 +38 @@
 
         /// Types of version nodes
-        enum Mode { 
+        enum Mode {
                 BASE,  ///< Root node of version tree
                 REM,   ///< Key removal node
@@ -63 +63 @@
                 Ptr base;  ///< Modified map
                 Key key;   ///< Key removed
-                
+
                 template<typename P, typename K>
                 Rem(P&& p, K&& k) : base(std::forward<P>(p)), key(std::forward<K>(k)) {}
@@ -155 +155 @@
                                 auto it = base_map.find( self.key );
 
-                                base->template init<Ins>( 
+                                base->template init<Ins>(
                                                 mut_this->shared_from_this(), std::move(self.key), std::move(it->second) );
                                 base->mode = INS;
@@ -175 +175 @@
                                 auto it = base_map.find( self.key );
 
-                                base->template init<Ins>( 
+                                base->template init<Ins>(
                                                 mut_this->shared_from_this(), std::move(self.key), std::move(it->second) );
                                 base->mode = UPD;
@@ -267 +267 @@
         Ptr erase(const Key& k) {
                 reroot();
-                
+
                 // exit early if key does not exist in map
                 if ( ! as<Base>().count( k ) ) return this->shared_from_this();

src/Common/VectorMap.h

@@ -36 +36 @@
         typedef const value_type* pointer;
         typedef const const_value_type* const_pointer;
-        
-        class iterator : public std::iterator< std::random_access_iterator_tag,
-                                               value_type,
-                                                                                   difference_type,
-                                                                                   pointer,
-                                                                                   reference > {
-        friend class VectorMap;
-        friend class const_iterator;
-        
+
+        class iterator : public std::iterator<
+                        std::random_access_iterator_tag,
+                        value_type, difference_type, pointer, reference > {
+                friend class VectorMap;
+                friend class const_iterator;
+
                 value_type data;
 
@@ -99 +97 @@
                         return data.first == o.data.first && &data.second == &o.data.second;
                 }
-                
+
                 bool operator!= (const iterator& that) const { return !(*this == that); }
 
@@ -111 +109 @@
         };
 
-        class const_iterator : public std::iterator< std::bidirectional_iterator_tag,
-                                                     const_value_type,
-                                                                                                  difference_type,
-                                                                                                  const_pointer,
-                                                                                                  const_reference  > {
-        friend class VectorMap;
+        class const_iterator : public std::iterator<
+                        std::bidirectional_iterator_tag,
+                        const_value_type, difference_type, const_pointer, const_reference > {
+                friend class VectorMap;
                 const_value_type data;
 
@@ -181 +177 @@
                         return data.first == o.data.first && &data.second == &o.data.second;
                 }
-                
+
                 bool operator!= (const const_iterator& that) const { return !(*this == that); }
 
@@ -233 +229 @@
 
 template<typename T>
-typename VectorMap<T>::iterator operator+ (typename VectorMap<T>::difference_type i, 
-                                           const typename VectorMap<T>::iterator& it) {
+typename VectorMap<T>::iterator operator+(
+                typename VectorMap<T>::difference_type i,
+                const typename VectorMap<T>::iterator& it) {
         return it + i;
 }
 
 template<typename T>
-typename VectorMap<T>::const_iterator operator+ (typename VectorMap<T>::difference_type i, 
-                                                 const typename VectorMap<T>::const_iterator& it) {
+typename VectorMap<T>::const_iterator operator+(
+                typename VectorMap<T>::difference_type i,
+                const typename VectorMap<T>::const_iterator& it) {
         return it + i;
 }