[8163] remove _tree_without_comment

[gavinsmith0123]

Revision: 8163
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8163
Author:   gavin
Date:     2018-09-12 15:24:28 -0400 (Wed, 12 Sep 2018)
Log Message:
-----------
remove _tree_without_comment

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Converter.pm
    trunk/tp/Texinfo/Convert/TexinfoXML.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-11 20:49:04 UTC (rev 8162)
+++ trunk/ChangeLog     2018-09-12 19:24:28 UTC (rev 8163)
@@ -1,3 +1,11 @@
+2018-09-12  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Convert/Converter.pm (_end_line_or_comment): Do
+       not call _tree_without_comment.
+       * tp/Texinfo/Convert/TexinfoXML.pm (_texinfo_line):
+       Do not call _tree_without_comment.
+       * tp/Texinfo/Convert/Converter.pm (tree_without_comment): Remove.
+
 2018-09-11  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_isolate_last_space): If @c or @comment 

Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm       2018-09-11 20:49:04 UTC (rev 
8162)
+++ trunk/tp/Texinfo/Convert/Converter.pm       2018-09-12 19:24:28 UTC (rev 
8163)
@@ -1050,28 +1050,15 @@
   return $end_line;
 }
 
-sub _tree_without_comment($)
-{
-  my $root = shift;
-
-  my $comment = $root->{'extra'}->{'comment_at_end'}
-    if $root->{'extra'};
-
-  my $tree = $root->{'args'}->[-1];
-
-  return ($comment, $tree);
-}
-
 sub _convert_argument_and_end_line($$)
 {
   my $self = shift;
   my $root = shift;
-  my ($comment, $tree) 
-    = _tree_without_comment($root);
-  my $converted = $self->convert_tree($tree);
+
+  my $converted = $self->convert_tree($root->{'args'}->[-1]);
   my $end_line;
-  if ($comment) {
-    $end_line = $self->convert_tree($comment);
+  if ($root->{'extra'} and $root->{'extra'}->{'comment_at_end'}) {
+    $end_line = $self->convert_tree($root->{'extra'}->{'comment_at_end'});
   } else {
     if (chomp($converted)) {
       $end_line = "\n";

Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-09-11 20:49:04 UTC (rev 
8162)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-09-12 19:24:28 UTC (rev 
8163)
@@ -676,9 +676,7 @@
   my $self = shift;
   my $root = shift;
 
-  my ($comment, $tree) = Texinfo::Convert::Converter::_tree_without_comment(
-                                                                        $root);
-  my $line = Texinfo::Convert::Texinfo::convert($tree);
+  my $line = Texinfo::Convert::Texinfo::convert($root->{'args'}->[-1]);
   chomp($line);
   if ($line ne '') {
     return ('line', $line);