factor out finding the position of the section in both the master and the delta

Author: book

Porting/merge-deltas.pl

@@ -42,6 +42,12 @@ ( $tree, $directive, $pos = 0 )
     return;    # not found
 }
 
+sub find_pos_in ( $master, $delta, $title ) {
+    return
+      map header_pos( $_, 1, $title ),
+      $master, $delta;
+}
+
 sub inject_items ( $master, $master_pos, $delta, $delta_pos ) {
 
     # find the =over in both
@@ -60,11 +66,7 @@ ( $master, $master_pos, $delta, $delta_pos )
 
     # [ List each enhancement as a =head2 entry ]
     head2 => sub ( $master, $title, $delta ) {
-
-        # find the section in the delta and master
-        my ( $master_pos, $delta_pos ) =
-          map header_pos( $_, 1, $title ),
-          $master, $delta;
+        my ( $master_pos, $delta_pos ) = find_pos_in( $master, $delta, $title );
 
         # find the first =head2, until the next =head1
         my $from = next_header_pos( $delta, 2, $delta_pos );
@@ -77,11 +79,7 @@ ( $master, $master_pos, $delta, $delta_pos )
 
     # copy =head3 sections from known =head2 ones
     head3 => sub ( $master, $title, $delta ) {
-
-        # find the section in the delta and master
-        my ( $master_pos, $delta_pos ) =
-          map header_pos( $_, 1, $title ),
-          $master, $delta;
+        my ( $master_pos, $delta_pos ) = find_pos_in( $master, $delta, $title );
 
         # loop over the =head2 in the section
         while ( $delta_pos = next_header_pos( $delta, 2, $delta_pos ) ) {
@@ -120,22 +118,13 @@ ( $master, $master_pos, $delta, $delta_pos )
 
     # [ List each improvement as an =item entry ]
     item => sub ( $master, $title, $delta ) {
-
-        # find the section in the delta and master
-        my ( $master_pos, $delta_pos ) =
-          map header_pos( $_, 1, $title ),
-          $master, $delta;
-
-        inject_items ( $master, $master_pos, $delta, $delta_pos );
+        my ( $master_pos, $delta_pos ) = find_pos_in( $master, $delta, $title );
+        inject_items( $master, $master_pos, $delta, $delta_pos );
     },
 
     # =item entries inside a =head3
     item_head3 =>  sub ( $master, $title, $delta ) {
-
-        # find the section in the delta and master
-        my ( $master_pos, $delta_pos ) =
-          map header_pos( $_, 1, $title ),
-          $master, $delta;
+        my ( $master_pos, $delta_pos ) = find_pos_in( $master, $delta, $title );
 
         # loop over the =head2 in the section
         while ( $delta_pos = next_header_pos( $delta, 2, $delta_pos ) ) {
@@ -157,11 +146,7 @@ ( $master, $master_pos, $delta, $delta_pos )
 
     # copy the whole section content
     copy => sub ( $master, $title, $delta ) {
-
-        # find the section in the delta and master
-        my ( $master_pos, $delta_pos ) =
-          map header_pos( $_, 1, $title ),
-          $master, $delta;
+        my ( $master_pos, $delta_pos ) = find_pos_in( $master, $delta, $title );
 
         # find the end of the section in the delta
         my $end_pos = next_header_pos( $delta, 1, $delta_pos ) - 1;
@@ -173,11 +158,7 @@ ( $master, $master_pos, $delta, $delta_pos )
 
     # this one is very specific: 'Module removals' is treated separately
     deprecations => sub ( $master, $title, $delta ) {
-
-        # find the section in the delta and master
-        my ( $master_pos, $delta_pos ) =
-          map header_pos( $_, 1, $title ),
-          $master, $delta;
+        my ( $master_pos, $delta_pos ) = find_pos_in( $master, $delta, $title );
 
         # loop over the =head2 in the section
         while ( $delta_pos = next_header_pos( $delta, 2, $delta_pos ) ) {