Changeset 8d1ad36 for libcfa/src/containers/list2.hfa

Timestamp:

May 11, 2021, 9:14:26 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7d51ef8

Parents:

4ab767a

Message:

Adding linked-list convenience functions and testing a corner case.

New API: isEmpty, hasPrev, `hasNext, try_pop_front, try_pop_back

Corner case: modifications near `elems (inserting in all n+1 interator states)

File:

• libcfa/src/containers/list2.hfa (modified) (5 diffs)

libcfa/src/containers/list2.hfa

@@ -17 +17 @@
 
 #include <assert.h>
-
-forall( T & ) struct tag {};
-#define ttag(T) ((tag(T)){})
-#define ztag(n) ttag(Z(n))
 
 extern "C" {
@@ -191 +187 @@
     }
 
+    static inline bool ?`isEmpty( dlist(tE, tLinks) & lst ) {
+        tE * firstPtr = lst.next;
+        if (ORIGIN_TAG_QUERY((size_t)firstPtr)) firstPtr = 0p;
+        return firstPtr == 0p;
+    }
+
     static inline int ?!=?( const diref(tE, tLinks) & list_pos, zero_t ) {
         tE & list_pos_elem = list_pos;
@@ -229 +231 @@
     }
 
+    static inline bool ?`hasNext( diref(tE, tLinks) refx ) {
+        return refx`moveNext;
+    }
+
+    static inline bool ?`hasPrev( diref(tE, tLinks) refx ) {
+        return refx`movePrev;
+    }
+
+    static inline diref(tE, tLinks) ?`next( diref(tE, tLinks) refx ) {
+        if( refx`moveNext ) return refx;
+        tE && ref_inner = refx;
+        & ref_inner = 0p;
+        return refx;
+    }
+
+    static inline diref(tE, tLinks) ?`prev( diref(tE, tLinks) refx ) {
+        if( refx`movePrev ) return refx;
+        tE && ref_inner = refx;
+        & ref_inner = 0p;
+        return refx;
+    }
+
     static inline void insert_first( dlist(tE, tLinks) &lst, tE & e ) {
         insert_after(lst`elems, e);
@@ -235 +259 @@
     static inline void insert_last( dlist(tE, tLinks) &lst, tE & e ) {
         insert_before(lst`elems, e);
+    }
+
+    static inline tE & try_pop_front( dlist(tE, tLinks) &lst ) {
+        diref(tE, tLinks) first_inlist = lst`first;
+        tE & first_item = first_inlist;
+        if (&first_item) remove(first_inlist);
+        return first_item;
+    }
+
+    static inline tE & try_pop_back( dlist(tE, tLinks) &lst ) {
+        diref(tE, tLinks) last_inlist = lst`last;
+        tE & last_item = last_inlist;
+        if (&last_item) remove(last_inlist);
+        return last_item;
     }
 
@@ -297 +335 @@
         return ref_dird`movePrev;
     }
-
+    static inline bool ?`hasNext( tE & ref ) {
+        diref(tE, tE) ref_dird = { ref };
+        return ref_dird`hasNext;
+    }
+    static inline bool ?`hasPrev( tE & ref ) {
+        diref(tE, tE) ref_dird = { ref };
+        return ref_dird`hasPrev;
+    }
+    static inline tE & ?`next( tE & ref ) {
+        diref(tE, tE) ref_dird = { ref };
+        diref(tE, tE) rslt = ref_dird`next;
+        return rslt;
+    }
+    static inline tE & ?`prev( tE & ref ) {
+        diref(tE, tE) ref_dird = { ref };
+        diref(tE, tE) rslt = ref_dird`prev;
+        return rslt;
+    }
 }