cool

Author: molpopgen

src/edge_table.rs

@@ -223,15 +223,7 @@ impl EdgeTable {
     /// * `Some(parent)` if `u` is valid.
     /// * `None` otherwise.
     pub fn parent<E: Into<EdgeId> + Copy>(&self, row: E) -> Option<NodeId> {
-        assert!(self.num_rows() == 0 || !self.as_ref().parent.is_null());
-        // SAFETY: either the column is empty or the point is not NULL
-        unsafe {
-            sys::tsk_column_access::<NodeId, _, _, _>(
-                row.into(),
-                self.as_ref().parent,
-                self.num_rows(),
-            )
-        }
+        self.table_.parent(row.into())
     }
 
     /// Return the ``child`` value from row ``row`` of the table.

src/sys/edge_table.rs

@@ -1,5 +1,8 @@
 use std::ptr::NonNull;
 
+use super::newtypes::EdgeId;
+use super::newtypes::NodeId;
+
 use super::bindings::tsk_edge_table_add_row;
 use super::bindings::tsk_edge_table_clear;
 use super::bindings::tsk_edge_table_init;
@@ -65,6 +68,10 @@ impl EdgeTable {
             ))
         }
     }
+
+    pub fn parent(&self, row: EdgeId) -> Option<NodeId> {
+        safe_tsk_column_access!(self, row, NodeId, parent)
+    }
 }
 
 impl Default for EdgeTable {

src/sys/macros.rs

@@ -277,3 +277,18 @@ macro_rules! impl_time_position_arithmetic {
         }
     };
 }
+
+macro_rules! safe_tsk_column_access {
+    ($self: ident, $u: ident, $output_type: ty, $column: ident) => {{
+        assert!($self.as_ref().num_rows == 0 || !$self.as_ref().$column.is_null());
+        // SAFETY: row is empty or is that the column is not a null pointer
+        // and the length is from the C API
+        unsafe {
+            super::tsk_column_access::<$output_type, _, _, _>(
+                $u,
+                $self.as_ref().$column,
+                $self.as_ref().num_rows,
+            )
+        }
+    }};
+}