refactor: streamline macros for adding nodes

Author: molpopgen

src/_macros.rs

@@ -620,7 +620,7 @@ macro_rules! node_table_add_row_details {
 }
 
 macro_rules! node_table_add_row {
-    ($(#[$attr:meta])* => $name: ident, $self: ident, $table: ident $(, $table2: ident )?) => {
+    ($(#[$attr:meta])* => $name: ident, $self: ident, $table: expr) => {
         $(#[$attr])*
         pub fn $name<F,T,P,I>(
             &mut $self,
@@ -641,13 +641,13 @@ macro_rules! node_table_add_row {
                                         individual,
                                         std::ptr::null(),
                                         0,
-                                        (*$self.$table)$(.$table2)?)
+                                        $table)
         }
     };
 }
 
 macro_rules! node_table_add_row_with_metadata {
-    ($(#[$attr:meta])* => $name: ident, $self: ident, $table: ident $(, $table2: ident )?) => {
+    ($(#[$attr:meta])* => $name: ident, $self: ident, $table: expr) => {
         $(#[$attr])*
         pub fn $name<F,T,P,I,M>(
             &mut $self,
@@ -671,7 +671,7 @@ macro_rules! node_table_add_row_with_metadata {
                                         individual,
                                         md.as_ptr(),
                                         md.len().into(),
-                                        (*$self.$table)$(.$table2)?)
+                                        $table)
         }
     };
 }

src/node_table.rs

@@ -298,8 +298,8 @@ build_owned_table_type!(
 );
 
 impl OwnedNodeTable {
-    node_table_add_row!(=> add_row, self, table);
-    node_table_add_row_with_metadata!(=> add_row_with_metadata, self, table);
+    node_table_add_row!(=> add_row, self, (*self.table));
+    node_table_add_row_with_metadata!(=> add_row_with_metadata, self, (*self.table));
 }
 
 #[cfg(test)]

src/table_collection.rs

@@ -364,7 +364,7 @@ impl TableCollection {
 
     node_table_add_row!(
     /// Add a row to the node table
-    => add_node, self, inner, nodes
+    => add_node, self, (*self.inner).nodes
     );
 
     node_table_add_row_with_metadata!(
@@ -389,7 +389,7 @@ impl TableCollection {
     /// assert!(tables.add_node_with_metadata(0, 0.0, -1, -1, &metadata).is_ok());
     /// # }
     /// ```
-    => add_node_with_metadata, self, inner, nodes);
+    => add_node_with_metadata, self, (*self.inner).nodes);
 
     site_table_add_row!(
     /// Add a row to the site table