[7442] parsetexi update

[gavinsmith0123]

Revision: 7442
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7442
Author:   gavin
Date:     2016-10-08 12:57:38 +0000 (Sat, 08 Oct 2016)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/parsetexi/convert.c
    trunk/tp/parsetexi/menus.c

Modified: trunk/tp/parsetexi/convert.c
===================================================================
--- trunk/tp/parsetexi/convert.c        2016-10-08 12:22:45 UTC (rev 7441)
+++ trunk/tp/parsetexi/convert.c        2016-10-08 12:57:38 UTC (rev 7442)
@@ -95,7 +95,10 @@
     {
       // TODO "fix" argument
 
-      if (e->cmd)
+      if (e->cmd
+          || e->type == ET_def_line
+          || e->type == ET_menu_entry
+          || e->type == ET_menu_comment)
         {
           expand_cmd_args_to_texi (e, result);
         }

Modified: trunk/tp/parsetexi/menus.c
===================================================================
--- trunk/tp/parsetexi/menus.c  2016-10-08 12:22:45 UTC (rev 7441)
+++ trunk/tp/parsetexi/menus.c  2016-10-08 12:57:38 UTC (rev 7442)
@@ -36,6 +36,9 @@
       if (arg->type == ET_menu_entry_name)
         {
           add_extra_element (current, "menu_entry_name", arg);
+          if (arg->contents.number == 0)
+            line_warn ("empty menu entry name in `%s'",
+                       convert_to_texinfo (current));
 
           // Check menu label isn't empty
         }
@@ -175,7 +178,7 @@
            && last_contents_child(current)->type == ET_menu_star)
     {
       debug ("ABORT MENU STAR");
-      destroy_element (pop_element_from_contents (current));
+      last_contents_child(current)->type = ET_NONE;
     }
   // 4122
   /* After a separator in a menu (which would have been added in