branch master updated: * tp/Texinfo/Common.pm (_copy_tree, _substitute_references): remove handling of extra prototypes that do not exist anymore.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 2f2340e68c * tp/Texinfo/Common.pm (_copy_tree, 
_substitute_references): remove handling of extra prototypes that do not exist 
anymore.
2f2340e68c is described below

commit 2f2340e68cb5e8b66992cc4460ba31177c00f8e2
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Mar 7 17:45:22 2023 +0100

    * tp/Texinfo/Common.pm (_copy_tree, _substitute_references): remove
    handling of extra prototypes that do not exist anymore.
---
 ChangeLog            |  5 +++++
 tp/Texinfo/Common.pm | 30 ++----------------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96d039bd92..cb4d7621f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-07  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Common.pm (_copy_tree, _substitute_references): remove
+       handling of extra prototypes that do not exist anymore.
+
 2023-03-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/parsetexi/element_types.txt: remove
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index e45499c908..76afe01bb1 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1932,14 +1932,7 @@ sub _copy_tree($$$)
       # Some out of tree elements may be added later too, as is the case of
       # extra def_index_element and def_index_ref_element added in
       # complete_indices.
-      if (($current->{'cmdname'} and $current->{'cmdname'} eq 'multitable'
-           and $key eq 'prototypes') and $info_type eq 'extra') {
-        $new->{$info_type}->{$key} = [];
-        foreach my $child (@{$current->{$info_type}->{$key}}) {
-          push @{$new->{$info_type}->{$key}},
-                  _copy_tree($child, $new, $reference_associations);
-        }
-      } elsif (ref($current->{$info_type}->{$key}) eq '') {
+      if (ref($current->{$info_type}->{$key}) eq '') {
         $new->{$info_type}->{$key} = $current->{$info_type}->{$key};
       } elsif (($info_type eq 'info'
                 and ref($current->{$info_type}->{$key}) eq 'HASH')
@@ -2062,26 +2055,7 @@ sub _substitute_references($$$;$)
       if (ref($current->{$info_type}->{$key}) ne '') {
         #print STDERR (' ' x $level) . "K $info_type $key\n";
 
-        if (($current->{'cmdname'} and $current->{'cmdname'} eq 'multitable'
-             and $key eq 'prototypes') and $info_type eq 'extra') {
-          if (! exists($new->{$info_type}->{$key})) {
-            print STDERR "Not substituting missing [$command_or_type]: $key\n";
-          } else {
-            my $new_key = $new->{$info_type}->{$key};
-            if (scalar(@{$current->{$info_type}->{$key}}) != 
scalar(@$new_key)) {
-              print STDERR "For extra $key number of elements: "
-               .scalar(@{$current->{$info_type}->{$key}}).' != 
'.scalar(@$new_key).": "
-               .Texinfo::Common::debug_print_element($new)."\n";
-            }
-            #print STDERR "Recurse in $info_type $command_or_type $key\n";
-            my $index = 0;
-            foreach my $child (@$new_key) {
-              _substitute_references($current->{$info_type}->{$key}->[$index], 
$child,
-                                    $reference_associations, $level);
-              $index++;
-            }
-          }
-        } elsif ($reference_associations->{$current->{$info_type}->{$key}}) {
+        if ($reference_associations->{$current->{$info_type}->{$key}}) {
           $new->{$info_type}->{$key}
             = $reference_associations->{$current->{$info_type}->{$key}};
           #print STDERR "Done $info_type [$command_or_type]: $key\n";