branch master updated: * tp/Texinfo/ParserNonXS.pm (_close_current), tp/Texinfo/XS/parsetexi/close.c (close_current): do not treat especially types in menu_entry now that there are not in extra 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 505f12247a * tp/Texinfo/ParserNonXS.pm (_close_current), 
tp/Texinfo/XS/parsetexi/close.c (close_current): do not treat especially types 
in menu_entry now that there are not in extra anymore.
505f12247a is described below

commit 505f12247a87e6dda83d753ee7a07b05cbf4c770
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Feb 3 23:54:22 2023 +0100

    * tp/Texinfo/ParserNonXS.pm (_close_current),
    tp/Texinfo/XS/parsetexi/close.c (close_current): do not treat
    especially types in menu_entry now that there are not in extra
    anymore.
---
 ChangeLog                                   | 7 +++++++
 tp/Texinfo/ParserNonXS.pm                   | 4 ----
 tp/Texinfo/XS/parsetexi/close.c             | 8 +-------
 tp/t/results/menu/menu_node_unterminated.pl | 3 ---
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 76928482c5..71a5bd9145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-02-03  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_close_current),
+       tp/Texinfo/XS/parsetexi/close.c (close_current): do not treat
+       especially types in menu_entry now that there are not in extra
+       anymore.
+
 2023-02-03  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_register_extra_menu_entry_information)
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index d1ea72baab..71d6798fa4 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2110,10 +2110,6 @@ sub _close_current($$$;$$)
         and not $current->{'args'}
         and (not defined($current->{'text'}) or $current->{'text'} eq '')
         and not $current->{'info'}
-        # for consistency with XS parser.
-        and $current->{'type'} ne 'menu_entry_name'
-        and $current->{'type'} ne 'menu_entry_node'
-        and $current->{'type'} ne 'menu_entry_description'
         and (not $current->{'source_marks'}
              or not scalar(@{$current->{'source_marks'}}))) {
       $element_to_remove = $current;
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index 09cfe9eb0c..3d8b93c4e2 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -388,13 +388,7 @@ close_current (ELEMENT *current,
           && current->args.number == 0
           && current->text.end == 0
           && current->info_info->info_number == 0
-          && current->source_mark_list.number == 0
-          /* these are registered in extrat in menu.c
-             register_extra_menu_entry_information
-             FIXME remove? */
-          && current->type != ET_menu_entry_name
-          && current->type != ET_menu_entry_node
-          && current->type != ET_menu_entry_description)
+          && current->source_mark_list.number == 0)
         element_to_remove = current;
       current = current->parent;
       if (element_to_remove)
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index a4255d7b08..dc99914dad 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -78,9 +78,6 @@ $result_trees{'menu_node_unterminated'} = {
                     }
                   ],
                   'type' => 'menu_entry_node'
-                },
-                {
-                  'type' => 'menu_entry_description'
                 }
               ],
               'extra' => {