texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[8398] parsetexi update


From: gavinsmith0123
Subject: [8398] parsetexi update
Date: Wed, 24 Oct 2018 18:38:20 -0400 (EDT)

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

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

Modified: trunk/tp/Texinfo/XS/parsetexi/handle_commands.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/handle_commands.c     2018-10-24 19:47:37 UTC 
(rev 8397)
+++ trunk/tp/Texinfo/XS/parsetexi/handle_commands.c     2018-10-24 22:38:20 UTC 
(rev 8398)
@@ -447,7 +447,7 @@
           text_append (&e->text, arg);
           add_to_element_contents (args, e);
 
-          destroy_element (misc);
+          destroy_element_and_children (misc);
           misc = new_element (ET_NONE);
           misc->cmd = equivalent_cmd;
           misc->line_nr = line_nr;
@@ -468,7 +468,7 @@
 
           add_to_element_contents (current, misc);
         }
-      else // 4402
+      else
         {
           int i;
           if (!ignored)
@@ -484,12 +484,17 @@
                   add_to_element_args (misc, misc_arg);
                 }
               /* TODO: Could we have just set misc->args directly as args? */
+              if (args->contents.number > 0 && arg_spec != LINE_skipline)
+                add_extra_misc_args (misc, "misc_args", args);
+              else
+                destroy_element_and_children (args);
             }
-
-          if (args->contents.number > 0 && arg_spec != LINE_skipline)
-            add_extra_misc_args (misc, "misc_args", args);
           else
-            destroy_element_and_children (args);
+            {
+              destroy_element_and_children (misc);
+              destroy_element_and_children (args);
+              misc = 0;
+            }
         }
 
       if (cmd == CM_raisesections)
@@ -502,15 +507,15 @@
         }
       else if (cmd == CM_novalidate)
         {
-          // FIXME - what goes in here?
+          /* do nothing -  novalidate is set in build_global_info */
         }
 
-      register_global_command (misc); // 4423
+      if (misc) 
+        register_global_command (misc);
 
       if (arg_spec != LINE_special || !has_comment)
         current = end_line (current);
 
-      // 4429
       if (cmd == CM_bye)
         {
           *status = FINISHED_TOTALLY;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]