branch master updated: * tp/Texinfo/Convert/HTML.pm (_conversion_contents): Simplify and inline at call sites.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new a40bc3f9ea * tp/Texinfo/Convert/HTML.pm (_conversion_contents): 
Simplify and inline at call sites.
a40bc3f9ea is described below

commit a40bc3f9ea93703e80be5442f8318f51dbcad205
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Jun 4 14:38:02 2022 +0100

    * tp/Texinfo/Convert/HTML.pm (_conversion_contents):
    Simplify and inline at call sites.
---
 ChangeLog                  |  5 +++++
 tp/Texinfo/Convert/HTML.pm | 42 ++++++++++++------------------------------
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9699f162b8..92ac7aa11e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-06-04  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/Convert/HTML.pm (_conversion_contents):
+       Simplify and inline at call sites.
+
 2022-06-04  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Inline some method calls
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 7327cd6ed8..a1f2d62ec4 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -9859,34 +9859,6 @@ sub output($$)
   return undef;
 }
 
-# Convert the 'contents' of a tree element.
-sub _conversion_contents($$$)
-{
-  my $self = shift;
-  my $element = shift;
-  my $command_type = shift;
-
-  if (ref($element->{'contents'}) ne 'ARRAY') {
-    cluck "for $element contents not an array: $element->{'contents'}";
-    print STDERR Texinfo::Common::debug_print_element($element);
-  }
-
-  my $element_contents_formatted = '';
-  my $content_idx = 0;
-  foreach my $content (@{$element->{'contents'}}) {
-    my $formatted_content = $self->_convert($content, "$command_type 
c[$content_idx]");
-    if (!defined($formatted_content)) {
-      cluck "content not defined for $command_type [$content_idx]\n";
-      print STDERR "element is: 
".Texinfo::Common::debug_print_element($element);
-      print STDERR "content is: 
".Texinfo::Common::debug_print_element($content);
-    } else {
-      $element_contents_formatted .= $formatted_content;
-    }
-    $content_idx++;
-  }
-  return $element_contents_formatted;
-}
-
 #my $characters_replaced_from_class_names = quotemeta('[](),~#:/\\@+=!;.,?* ');
 # FIXME not clear what character should be allowed and which ones replaced 
besides space
 my $characters_replaced_from_class_names = quotemeta(' ');
@@ -10050,7 +10022,12 @@ sub _convert($$;$)
                                 {'contents' => $element->{'contents'}},
                                          $self->{'options_latex_math'});
         } else {
-          $content_formatted = $self->_conversion_contents($element, 
$command_type);
+          $content_formatted = '';
+          my $content_idx = 0;
+          foreach my $content (@{$element->{'contents'}}) {
+            $content_formatted .= _convert($self, $content, "$command_type 
c[$content_idx]");
+            $content_idx++;
+          }
         }
       }
       my $args_formatted;
@@ -10206,7 +10183,12 @@ sub _convert($$;$)
         $content_formatted = $self->_convert($element->{'args'}->[0]);
       }
     } elsif ($element->{'contents'}) {
-      $content_formatted = $self->_conversion_contents($element, 
$command_type);
+      $content_formatted = '';
+      my $content_idx = 0;
+      foreach my $content (@{$element->{'contents'}}) {
+        $content_formatted .= _convert($self, $content, "$command_type 
c[$content_idx]");
+        $content_idx++;
+      }
     }
 
     if (exists($self->{'types_conversion'}->{$type_name})) {