[8397] parsetexi update

[gavinsmith0123]

Revision: 8397
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8397
Author:   gavin
Date:     2018-10-24 15:47:37 -0400 (Wed, 24 Oct 2018)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/Texinfo/XS/parsetexi/close.c
    trunk/tp/Texinfo/XS/parsetexi/commands.c
    trunk/tp/Texinfo/XS/parsetexi/end_line.c

Modified: trunk/tp/Texinfo/XS/parsetexi/close.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/close.c       2018-10-24 17:32:00 UTC (rev 
8396)
+++ trunk/tp/Texinfo/XS/parsetexi/close.c       2018-10-24 19:47:37 UTC (rev 
8397)
@@ -18,7 +18,6 @@
 #include "parser.h"
 #include "errors.h"
 
-// 1246
 /* Possibly print an error message, and return CURRENT->parent. */
 static ELEMENT *
 close_brace_command (ELEMENT *current,
@@ -279,9 +278,9 @@
               if (command_data(current->cmd).data == BLOCK_conditional)
                 {
                   parent = current->parent;
-                  destroy_element (pop_element_from_contents (parent));
+                  destroy_element_and_children (pop_element_from_contents
+                                                          (parent));
                 }
-              /* TODO: Maybe avoid adding the element in the first place. */
             }
           if (command_data(cmd).flags
               & (CF_preformatted | CF_menu | CF_format_raw))
@@ -365,7 +364,7 @@
 /* 1725 */
 /* Return lowest level ancestor of CURRENT containing a CLOSED_COMMAND
    element.  Set CLOSED_ELEMENT to the element itself.  INTERRUPTING is used 
in 
-   close_brace_command 1246 to display an error message.  Remove a context 
from 
+   close_brace_command to display an error message.  Remove a context from 
    context stack if it was added by this command. */
 ELEMENT *
 close_commands (ELEMENT *current, enum command_id closed_command,

Modified: trunk/tp/Texinfo/XS/parsetexi/commands.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/commands.c    2018-10-24 17:32:00 UTC (rev 
8396)
+++ trunk/tp/Texinfo/XS/parsetexi/commands.c    2018-10-24 19:47:37 UTC (rev 
8397)
@@ -1,5 +1,4 @@
-/* Copyright 2010, 2011, 2012, 2013, 2014, 2015
-   Free Software Foundation, Inc.
+/* Copyright 2010-2018 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

Modified: trunk/tp/Texinfo/XS/parsetexi/end_line.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/end_line.c    2018-10-24 17:32:00 UTC (rev 
8396)
+++ trunk/tp/Texinfo/XS/parsetexi/end_line.c    2018-10-24 19:47:37 UTC (rev 
8397)
@@ -1254,7 +1254,7 @@
         }
       else if (item_line_command (current->cmd)
           && !lookup_extra (current, "command_as_argument"))
-        { // 3064
+        {
           ELEMENT *e, *contents, *contents2;
 
           e = new_element (ET_command_as_argument_inserted);
@@ -1774,7 +1774,6 @@
       ELEMENT *end_elt;
 
       debug ("END COMMAND %s", end_command);
-      free (end_command);
 
       /* Reparent the "@end" element to be a child of the block element. */
       end_elt = pop_element_from_contents (current);