[8263] parsetexi update (tests still pass)

[gavinsmith0123]

Revision: 8263
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8263
Author:   gavin
Date:     2018-10-06 11:44:44 -0400 (Sat, 06 Oct 2018)
Log Message:
-----------
parsetexi update (tests still pass)

Modified Paths:
--------------
    trunk/tp/Texinfo/XS/parsetexi/end_line.c
    trunk/tp/Texinfo/XS/parsetexi/handle_commands.c
    trunk/tp/Texinfo/XS/parsetexi/tree.c

Modified: trunk/tp/Texinfo/XS/parsetexi/end_line.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/end_line.c    2018-10-06 08:47:22 UTC (rev 
8262)
+++ trunk/tp/Texinfo/XS/parsetexi/end_line.c    2018-10-06 15:44:44 UTC (rev 
8263)
@@ -1901,8 +1901,7 @@
           if ((misc_args = lookup_extra (misc_cmd, "misc_args")))
             {
               char *s;
-              add_extra_misc_args (current, "columnfractions", 
-                                       misc_args->value);
+              add_extra_element (current, "columnfractions", misc_cmd);
               asprintf (&s, "%d", misc_args->value->contents.number);
               add_extra_string (current, "max_columns", s);
             }

Modified: trunk/tp/Texinfo/XS/parsetexi/handle_commands.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/handle_commands.c     2018-10-06 08:47:22 UTC 
(rev 8262)
+++ trunk/tp/Texinfo/XS/parsetexi/handle_commands.c     2018-10-06 15:44:44 UTC 
(rev 8263)
@@ -527,7 +527,12 @@
                     {
                       prototypes = lookup_extra(parent, "columnfractions");
                       if (prototypes)
-                        max_columns = prototypes->value->contents.number;
+                        {
+                          prototypes = lookup_extra((ELEMENT *) 
prototypes->value,
+                                                    "misc_args");
+                          if (prototypes)
+                            max_columns = prototypes->value->contents.number;
+                        }
                     }
 
                   if (max_columns == 0)

Modified: trunk/tp/Texinfo/XS/parsetexi/tree.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/tree.c        2018-10-06 08:47:22 UTC (rev 
8262)
+++ trunk/tp/Texinfo/XS/parsetexi/tree.c        2018-10-06 15:44:44 UTC (rev 
8263)
@@ -121,14 +121,7 @@
             break;
           }
         case extra_misc_args:
-          //destroy_element_and_children (e->extra[i].value);
-            /* Big problem here.  If we call free_node_contents to look for
-               'route_not_in_tree' elements, the elements that *were* in
-               the tree may have already been freed via reset_parser.
-               Also a potential problem for extra_node_spec above.  The best 
-               solution would seem to get rid of the need for any 
-               'route_not_in_tree' elements. */
-
+          destroy_element_and_children (e->extra[i].value);
           break;
         case extra_def_info:
           free (e->extra[i].value);