factor out the injection of items

Author: book

Porting/merge-deltas.pl

@@ -42,6 +42,19 @@ ( $tree, $directive, $pos = 0 )
     return;    # not found
 }
 
+sub inject_items ( $master, $master_pos, $delta, $delta_pos ) {
+
+    # find the =over in both
+    my ( $master_list_pos, $delta_list_pos ) = (
+        next_directive_pos( $master, 'over-bullet', $master_pos ),
+        next_directive_pos( $delta,  'over-bullet', $delta_pos )
+    );
+
+    # inject the list from delta into the master
+    push $master->[$master_list_pos]->@*,
+      $delta->[$delta_list_pos]->@[ 2 .. $delta->[$delta_list_pos]->$#* ];
+}
+
 # handlers for different section types
 my %handler = (
 
@@ -113,16 +126,7 @@ ( $tree, $directive, $pos = 0 )
           map header_pos( $_, 1, $title ),
           $master, $delta;
 
-        # find the =over in both
-        my ( $master_list_pos, $delta_list_pos ) = (
-            next_directive_pos( $master, 'over-bullet', $master_pos ),
-            next_directive_pos( $delta,  'over-bullet', $delta_pos )
-        );
-
-        # inject the list from delta into the master
-        push $master->[$master_list_pos]->@*,
-          $delta->[$delta_list_pos]
-          ->@[ 2 .. $delta->[$delta_list_pos]->$#* ];
+        inject_items ( $master, $master_pos, $delta, $delta_pos );
     },
 
     # =item entries inside a =head3
@@ -146,16 +150,7 @@ ( $tree, $directive, $pos = 0 )
                 $master_pos =    # find the same =head2 in the master
                   header_pos( $master, 3, $section_title, $master_pos );
 
-                # find the =over in both
-                my ( $master_list_pos, $delta_list_pos ) = (
-                    next_directive_pos( $master, 'over-bullet', $master_pos ),
-                    next_directive_pos( $delta,  'over-bullet', $delta_pos )
-                );
-
-                # inject the list from delta into the master
-                push $master->[$master_list_pos]->@*,
-                  $delta->[$delta_list_pos]
-                  ->@[ 2 .. $delta->[$delta_list_pos]->$#* ];
+                inject_items( $master, $master_pos, $delta, $delta_pos );
             }
         }
     },
@@ -191,16 +186,7 @@ ( $tree, $directive, $pos = 0 )
                 $master_pos =    # find the same =head2 in the master
                   header_pos( $master, 2, $section_title, $master_pos );
 
-                # find the =over in both
-                my ( $master_list_pos, $delta_list_pos ) = (
-                    next_directive_pos( $master, 'over-text', $master_pos ),
-                    next_directive_pos( $delta,  'over-text', $delta_pos )
-                );
-
-                # inject the list from delta into the master
-                push $master->[$master_list_pos]->@*,
-                  $delta->[$delta_list_pos]
-                  ->@[ 2 .. $delta->[$delta_list_pos]->$#* ];
+                inject_items( $master, $master_pos, $delta, $delta_pos );
             }
             else {
                 # find where the =head2 ends