Changeset c2794b2

Timestamp:

May 17, 2021, 9:32:35 PM (4 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:

d286e94d

Parents:

02a43ff

Message:

Adding isListed accessor function to new linked list.

Files:

• libcfa/src/containers/list.hfa (modified) (5 diffs)
• tests/list/.expect/dlist-insert-remove.txt (modified) (1 diff)
• tests/list/dlist-insert-remove.cfa (modified) (2 diffs)

libcfa/src/containers/list.hfa

@@ -125 +125 @@
                 verify(linkToInsert.prev == 0p);
                 verify(linkToInsert.next == 0p);
-        tE & list_pos_raw = list_pos;
-        tE & list_pos_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & list_pos_raw );
+        tE & list_pos_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & list_pos );
         dlink(tE) & list_pos_links = list_pos_elem`inner;
         asm( "" : : : "memory" );
         tE & after_raw = * list_pos_links.next;
         tE & after_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & after_raw );
-                linkToInsert.prev = & list_pos_raw;
+                linkToInsert.prev = & list_pos;
                 linkToInsert.next = & after_raw;
         dlink(tE) & afterLinks = after_elem`inner;
@@ -145 +144 @@
                 verify(linkToInsert.next == 0p);
                 verify(linkToInsert.prev == 0p);
-        tE & list_pos_raw = list_pos;
-        tE & list_pos_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & list_pos_raw );
+        tE & list_pos_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & list_pos );
         dlink(tE) & list_pos_links = list_pos_elem`inner;
         asm( "" : : : "memory" );
         tE & before_raw = * (list_pos_links).prev;
         tE & before_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & before_raw );
-                linkToInsert.next = & list_pos_raw;
+                linkToInsert.next = & list_pos;
                 linkToInsert.prev = & before_raw;
         dlink(tE) & beforeLinks = before_elem`inner;
@@ -161 +159 @@
         static inline tE & remove(tE & list_pos) {
                 verify (&list_pos != 0p);
-        tE & list_pos_elem = list_pos;
-        verify( ! ORIGIN_TAG_QUERY((size_t) & list_pos_elem) );
-        dlink(tE) & list_pos_links = list_pos_elem`inner;
+        verify( ! ORIGIN_TAG_QUERY((size_t) & list_pos) );
+        dlink(tE) & list_pos_links = list_pos`inner;
         tE & before_raw = * list_pos_links.prev;
         tE & before_elem = * (tE *) ORIGIN_TAG_CLEAR( (size_t) & before_raw );
@@ -176 +173 @@
                 list_pos_links.next = 0p;
         asm( "" : : : "memory" );
-        return list_pos_elem;
+        return list_pos;
         }
 
@@ -194 +191 @@
         if (ORIGIN_TAG_QUERY((size_t)firstPtr)) firstPtr = 0p;
         return firstPtr == 0p;
+    }
+
+    static inline bool ?`isListed( tE & e ) {
+                verify (&e != 0p);
+        dlink(tE) & e_links = e`inner;
+                return (e_links.prev != 0p) || (e_links.next != 0p);
     }
 

tests/list/.expect/dlist-insert-remove.txt

@@ -1109 +1109 @@
 try_pop cases done
 origin_mutation cases done
+isListed cases done

tests/list/dlist-insert-remove.cfa

@@ -1607 +1607 @@
 }
 
+void test__isListed_cases__mary() {
+
+        mary m1 = {1.7};        assert(! m1`isListed);
+        mary m2 = {2.7};        assert(! m2`isListed);
+        mary m3 = {3.7};        assert(! m3`isListed);
+
+        dlist(mary) ml;
+
+        insert_last(ml, m1);    assert(  m1`isListed);  assert(! m2`isListed);
+        insert_last(ml, m2);    assert(  m2`isListed);  assert(! m3`isListed);
+        insert_last(ml, m3);    assert(  m3`isListed);
+
+        remove( m1 );           assert(! m1`isListed);  assert(  m2`isListed);
+        remove( m2 );           assert(! m2`isListed);  assert(  m3`isListed);
+        remove( m3 );           assert(! m3`isListed);
+
+        printf("isListed cases done\n");
+}
+
 ////////////////////////////////////////////////////////////
 //
@@ -1904 +1923 @@
         test__try_pop__mary();
         test__origin_mutation__mary();
+        test__isListed_cases__mary();
 
         return 0;