the last one

Author: molpopgen

src/_macros.rs

@@ -103,26 +103,27 @@ macro_rules! unsafe_tsk_ragged_column_access {
 // to pass clippy checks
 #[allow(unused_macros)]
 macro_rules! unsafe_tsk_ragged_char_column_access {
-    ($i: expr, $lo: expr, $hi: expr, $array: expr, $offset_array: expr, $offset_array_len: expr) => {{
-        unimplemented!("have to refactor this macro");
+    ($i: expr, $lo: expr, $hi: expr, $owner: expr, $array: ident, $offset_array: ident, $offset_array_len: ident) => {{
         let i = $crate::SizeType::try_from($i)?;
         if $i < $lo || i >= $hi {
             Err(TskitError::IndexError {})
-        } else if $offset_array_len == 0 {
+        } else if $owner.$offset_array_len == 0 {
             Ok(None)
         } else {
-            let start = unsafe { *$offset_array.offset($i as isize) };
+            assert!(!$owner.$array.is_null());
+            assert!(!$owner.$offset_array.is_null());
+            let start = unsafe { *$owner.$offset_array.offset($i as isize) };
             let stop = if i < $hi {
-                unsafe { *$offset_array.offset(($i + 1) as isize) }
+                unsafe { *$owner.$offset_array.offset(($i + 1) as isize) }
             } else {
-                $offset_array_len as tsk_size_t
+                $owner.$offset_array_len as tsk_size_t
             };
             if start == stop {
                 Ok(None)
             } else {
                 let mut buffer = String::new();
                 for i in start..stop {
-                    buffer.push(unsafe { *$array.offset(i as isize) as u8 as char });
+                    buffer.push(unsafe { *$owner.$array.offset(i as isize) as u8 as char });
                 }
                 Ok(Some(buffer))
             }

src/provenance.rs

@@ -111,9 +111,10 @@ impl<'a> ProvenanceTable<'a> {
             row.into().0,
             0,
             self.num_rows(),
-            self.table_.timestamp,
-            self.table_.timestamp_offset,
-            self.table_.timestamp_length
+            self.table_,
+            timestamp,
+            timestamp_offset,
+            timestamp_length
         ) {
             Ok(Some(string)) => Ok(string),
             Ok(None) => Err(crate::TskitError::ValueError {
@@ -134,9 +135,10 @@ impl<'a> ProvenanceTable<'a> {
             row.into().0,
             0,
             self.num_rows(),
-            self.table_.record,
-            self.table_.record_offset,
-            self.table_.record_length
+            self.table_,
+            record,
+            record_offset,
+            record_length
         ) {
             Ok(Some(string)) => Ok(string),
             Ok(None) => Ok(String::from("")),