[no subject]

[Gavin D. Smith]

branch: master
commit 9d38b12222bd2c66f35f6c68b325e6da164a038a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Feb 25 11:27:34 2024 +0000

    Remove separate error registrar argument
    
    * tp/Texinfo/Structuring.pm (warn_non_empty_parts),
    * tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs,
    (warn_non_empty_parts):
    Remove separate Texinfo::Report 'registrar' argument, and access
    errors through 'registrar' key on Texinfo::Document argument.
---
 ChangeLog                                                 | 14 +++++++++++++-
 tp/Texinfo/Structuring.pm                                 |  5 ++---
 tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs |  2 +-
 tp/t/test_utils.pl                                        |  3 +--
 tp/texi2any.pl                                            |  3 +--
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f9309d37b..5b30a83965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,20 @@
 
        Remove separate error registrar argument
 
-       * tp/Texinfo/Structuring.pm (associate_internal_references),
+       * tp/Texinfo/Structuring.pm (warn_non_empty_parts),
        * tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs,
+       (warn_non_empty_parts):
+       Remove separate Texinfo::Report 'registrar' argument, and access
+       errors through 'registrar' key on Texinfo::Document argument.
+
+2024-02-25  Gavin Smith <gavinsmith0123@gmail.com>
+
+2024-02-25  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Remove separate error registrar argument
+
+       * tp/Texinfo/Structuring.pm (associate_internal_references),
+       * tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
        (associate_internal_references):
        Remove separate Texinfo::Report 'registrar' argument, and access
        errors through 'registrar' key on Texinfo::Document argument.
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index e5bbc4a48f..fe0534b4af 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -396,10 +396,9 @@ sub _print_sectioning_tree($)
   return $result;
 }
 
-sub warn_non_empty_parts($$$)
+sub warn_non_empty_parts($$)
 {
   my $document = shift;
-  my $registrar = shift;
   my $customization_information = shift;
 
   my $global_commands = $document->global_commands_information();
@@ -407,7 +406,7 @@ sub warn_non_empty_parts($$$)
   if ($global_commands->{'part'}) {
     foreach my $part (@{$global_commands->{'part'}}) {
       if (!Texinfo::Common::is_content_empty($part)) {
-        $registrar->line_warn($customization_information,
+        $document->{'registrar'}->line_warn($customization_information,
                sprintf(__("\@%s not empty"),
                        $part->{'cmdname'}), $part->{'source_info'});
       }
diff --git a/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs 
b/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
index 362603e779..8cd45cd2d6 100644
--- a/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
+++ b/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
@@ -170,7 +170,7 @@ sectioning_structure (SV *tree_in, ...)
 
 void
 warn_non_empty_parts (SV *document_in, ...)
-   PROTOTYPE: $$$
+   PROTOTYPE: $$
     PREINIT:
         DOCUMENT *document = 0;
     CODE:
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 5c89117f88..e3f40a80f4 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -1085,8 +1085,7 @@ sub test($$)
     Texinfo::Document::register_document_sections_list($document,
                                                        $sections_list);
   }
-  Texinfo::Structuring::warn_non_empty_parts($document, $registrar,
-                                             $main_configuration);
+  Texinfo::Structuring::warn_non_empty_parts($document, $main_configuration);
 
   if ($tree_transformations{'complete_tree_nodes_menus'}) {
     Texinfo::Transformations::complete_tree_nodes_menus($tree);
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 78a22e54b3..1452cb805b 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -1650,8 +1650,7 @@ while(@input_files) {
   }
 
   if (!$formats_table{$converted_format}->{'no_warn_non_empty_parts'}) {
-    Texinfo::Structuring::warn_non_empty_parts($document, $registrar,
-                                               $main_configuration);
+    Texinfo::Structuring::warn_non_empty_parts($document, $main_configuration);
   }
 
   if ($tree_transformations{'complete_tree_nodes_menus'}) {