[8188] parsetexi update

[gavinsmith0123]

Revision: 8188
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8188
Author:   gavin
Date:     2018-09-21 13:19:52 -0400 (Fri, 21 Sep 2018)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/Texinfo/XS/parsetexi/extra.c
    trunk/tp/Texinfo/XS/parsetexi/parser.c
    trunk/tp/Texinfo/XS/parsetexi/parser.h
    trunk/tp/Texinfo/XS/parsetexi/separator.c

Modified: trunk/tp/Texinfo/XS/parsetexi/extra.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/extra.c       2018-09-21 16:32:56 UTC (rev 
8187)
+++ trunk/tp/Texinfo/XS/parsetexi/extra.c       2018-09-21 17:19:52 UTC (rev 
8188)
@@ -45,18 +45,6 @@
   e->extra[i].type = type;
 }
 
-void
-delete_extra (ELEMENT *e, char *key)
-{
-  KEY_PAIR *k = lookup_extra (e, key);
-  if (k)
-    {
-      k->key = "";
-      k->value = 0; /* should really free this */
-      k->type = extra_deleted;
-    }
-}
-
 /* Add an extra key that is a reference to another element (for example, 
    'associated_section' on a node command element. */
 void

Modified: trunk/tp/Texinfo/XS/parsetexi/parser.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/parser.c      2018-09-21 16:32:56 UTC (rev 
8187)
+++ trunk/tp/Texinfo/XS/parsetexi/parser.c      2018-09-21 17:19:52 UTC (rev 
8188)
@@ -444,11 +444,6 @@
           e = pop_element_from_contents (current);
           destroy_element (e);
           /* TODO: Maybe we could avoid adding it in the first place? */
-          if (owning_element)
-            {
-              delete_extra (owning_element, "spaces_before_argument_elt");
-              delete_extra (owning_element, "spaces_after_command_elt");
-            }
         }
       else if (last_child->type == ET_empty_line)
         {
@@ -465,13 +460,10 @@
               add_extra_string_dup (owning_element, "spaces_before_argument",
                                     e->text.text);
               destroy_element (e);
-              delete_extra (owning_element, "spaces_before_argument_elt");
-              delete_extra (owning_element, "spaces_after_command_elt");
             }
           else
             {
               last_child->type = ET_empty_spaces_after_command;
-              abort ();
             }
         }
       retval = 1;
@@ -490,7 +482,7 @@
 
   last_elt = last_contents_child (current);
   char *text = element_text (last_elt);
-  if (!text || !*text)
+  if (!text || !*text || last_elt->type)
     return;
 
   int text_len = strlen (text);
@@ -540,7 +532,7 @@
 
   last_elt = last_contents_child (current);
   text = element_text (last_elt);
-  if (!text || !*text)
+  if (!text || !*text || last_elt->type)
     return;
 
   text_len = strlen (text);
@@ -663,10 +655,7 @@
   line += len;
 
   if (command)
-    {
-      add_extra_element (command, "spaces_after_command_elt", e);
-      add_extra_element (e, "command", command);
-    }
+    add_extra_element (e, "command", command);
 
   *line_inout = line;
 }

Modified: trunk/tp/Texinfo/XS/parsetexi/parser.h
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/parser.h      2018-09-21 16:32:56 UTC (rev 
8187)
+++ trunk/tp/Texinfo/XS/parsetexi/parser.h      2018-09-21 17:19:52 UTC (rev 
8188)
@@ -113,7 +113,6 @@
 void add_extra_string (ELEMENT *e, char *key, char *value);
 void add_extra_string_dup (ELEMENT *e, char *key, char *value);
 KEY_PAIR *lookup_extra (ELEMENT *e, char *key);
-void delete_extra (ELEMENT *e, char *key);
 
 /* In menus.c */
 int handle_menu (ELEMENT **current_inout, char **line_inout);

Modified: trunk/tp/Texinfo/XS/parsetexi/separator.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/separator.c   2018-09-21 16:32:56 UTC (rev 
8187)
+++ trunk/tp/Texinfo/XS/parsetexi/separator.c   2018-09-21 17:19:52 UTC (rev 
8188)
@@ -132,9 +132,7 @@
             e = new_element (ET_empty_spaces_before_argument);
             text_append_n (&e->text, line, n);
             add_to_element_contents (current, e);
-            add_extra_element (current->parent,
-                                   "spaces_before_argument_elt", e);
-            add_extra_element (e, "command", current);
+            add_extra_element (e, "command", current->parent);
             line += n;
           }
           current->type = ET_brace_command_context;
@@ -154,7 +152,6 @@
               /* See comment in parser.c:merge_text */
               text_append (&e->text, "");
               add_to_element_contents (current, e);
-              add_extra_element (current, "spaces_before_argument_elt", e);
               add_extra_element (e, "command", current);
 
               if (command == CM_inlineraw)
@@ -182,7 +179,6 @@
       text_append (&e->text, ""); /* See comment in parser.c:merge_text */
       add_to_element_contents (current, e);
       debug ("BRACKETED in def/multitable");
-      add_extra_element (current, "spaces_before_argument_elt", e);
       add_extra_element (e, "command", current);
     }
   else if (current->type == ET_rawpreformatted)
@@ -780,7 +776,6 @@
   e = new_element (ET_empty_spaces_before_argument);
   text_append (&e->text, ""); /* See comment in parser.c:merge_text */
   add_to_element_contents (current, e);
-  add_extra_element (current, "spaces_before_argument_elt", e);
   add_extra_element (e, "command", current);
   
 funexit: