Changeset 95789be for libcfa/src/containers/list.hfa

Timestamp:

Aug 3, 2020, 2:23:17 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1a39a5a

Parents:

3e2b9c9 (diff), 6dba8755 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/containers/list.hfa

@@ -22 +22 @@
 \
 static inline NODE& $tempcv_e2n(ELEM &node) { \
-        return node; \
+        return ( NODE & ) node; \
 } \
 \
@@ -187 +187 @@
                 $next_link(singleton_to_insert) = $next_link(list_pos);
                 if ($next_link(list_pos).is_terminator) {
-                        dlist(Tnode, Telem) *list = $next_link(list_pos).terminator;
+                        dlist(Tnode, Telem) *list = ( dlist(Tnode, Telem) * ) $next_link(list_pos).terminator;
                         $dlinks(Telem) *list_links = & list->$links;
                         $mgd_link(Telem) *list_last = & list_links->prev;
@@ -210 +210 @@
                 $prev_link(singleton_to_insert) = $prev_link(list_pos);
                 if ($prev_link(list_pos).is_terminator) {
-                        dlist(Tnode, Telem) *list = $prev_link(list_pos).terminator;
+                        dlist(Tnode, Telem) *list = ( dlist(Tnode, Telem) * ) $prev_link(list_pos).terminator;
                         $dlinks(Telem) *list_links = & list->$links;
                         $mgd_link(Telem) *list_first = & list_links->next;
@@ -275 +275 @@
 
                 if ( $prev_link(list_pos).is_terminator ) {
-                        dlist(Tnode, Telem) * tgt_before = $prev_link(list_pos).terminator;
+                        dlist(Tnode, Telem) * tgt_before = ( dlist(Tnode, Telem) * ) $prev_link(list_pos).terminator;
                         $dlinks(Telem) * links_before = & tgt_before->$links;
                         &incoming_from_prev = & links_before->next;
@@ -285 +285 @@
 
                 if ( $next_link(list_pos).is_terminator ) {
-                        dlist(Tnode, Telem) * tgt_after = $next_link(list_pos).terminator;
+                        dlist(Tnode, Telem) * tgt_after = ( dlist(Tnode, Telem) * ) $next_link(list_pos).terminator;
                         $dlinks(Telem) * links_after = & tgt_after->$links;
                         &incoming_from_next = & links_after->prev;