[7882] don' store list of menus in unassociated_menus

[gavinsmith0123]

Revision: 7882
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7882
Author:   gavin
Date:     2017-06-29 14:04:08 -0400 (Thu, 29 Jun 2017)
Log Message:
-----------
don' store list of menus in unassociated_menus

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/Texinfo/Transformations.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-06-29 17:38:20 UTC (rev 7881)
+++ trunk/ChangeLog     2017-06-29 18:04:08 UTC (rev 7882)
@@ -1,5 +1,13 @@
 2017-06-29  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi) <menu>: Don't store
+       a list of menus in 'unassociated_menus' array.
+       * tp/Texinfo/Transformations.pm (_reassociate_to_node)
+       (set_menus_to_simple_menu): Remove checks of 
+       'unassociated_menus' array.
+
+2017-06-29  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_texi) <macro expansion>:
        Add a check for the return value of _text_to_lines being empty.
 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2017-06-29 17:38:20 UTC (rev 7881)
+++ trunk/tp/Texinfo/Parser.pm  2017-06-29 18:04:08 UTC (rev 7882)
@@ -979,7 +979,6 @@
 }
 
 # @ dircategory_direntry
-# @ unassociated_menus
 # perl_encoding
 # input_encoding_name
 # input_file_name
@@ -4765,9 +4764,6 @@
       "perhaps your address@hidden node should be wrapped in address@hidden 
rather than address@hidden"), 
                                   $line_nr);
                   }
-                  if ($command eq 'menu') {
-                    push @{$self->{'info'}->{'unassociated_menus'}}, $current;
-                  }
                 }
               }
               $current->{'args'} = [ {
@@ -6059,10 +6055,6 @@
 An array of successive C<@dircategory> and C<@direntry> as they appear
 in the document.
 
-=item unassociated_menus
-
-An array of menus that are not associated with a node.
-
 =item novalidate
 
 If set, it is as if C<@novalidate> was set in the document.

Modified: trunk/tp/Texinfo/Transformations.pm
===================================================================
--- trunk/tp/Texinfo/Transformations.pm 2017-06-29 17:38:20 UTC (rev 7881)
+++ trunk/tp/Texinfo/Transformations.pm 2017-06-29 18:04:08 UTC (rev 7882)
@@ -283,18 +283,6 @@
         @{$previous_node->{'menus'}} = grep {$_ ne $current} 
@{$previous_node->{'menus'}};
         delete $previous_node->{'menus'} if !(@{$previous_node->{'menus'}});
       }
-    } else {
-      my $info = $self->global_informations();
-      if (!$info or !$info->{'unassociated_menus'} 
-          or address@hidden>{'unassociated_menus'}}
-          or !grep {$current eq $_} @{$info->{'unassociated_menus'}}) {
-        print STDERR "Bug: menu $current not in unassociated menus\n";
-      } else {
-        @{$info->{'unassociated_menus'}} 
-          = grep {$_ ne $current} @{$info->{'unassociated_menus'}};
-        delete $info->{'unassociated_menus'} if 
!(@{$info->{'unassociated_menus'}});
-      }
-    }
     push @{$new_node->{'menus'}}, $current;
   } elsif ($current->{'extra'} and $current->{'extra'}->{'index_entry'}) {
     if ($previous_node 
@@ -718,11 +706,6 @@
 {
   my $self = shift;
 
-  if ($self->{'info'} and $self->{'info'}->{'unassociated_menus'}) {
-    foreach my $menu (@{$self->{'info'}->{'unassociated_menus'}}) {
-      menu_to_simple_menu($menu);
-    }
-  }
   if ($self->{'nodes'} and @{$self->{'nodes'}}) {
     foreach my $node (@{$self->{'nodes'}}) {
       if ($node->{'menus'}) {