[8186] no spaces_before_argument_elt

[gavinsmith0123]

Revision: 8186
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8186
Author:   gavin
Date:     2018-09-21 12:26:41 -0400 (Fri, 21 Sep 2018)
Log Message:
-----------
no spaces_before_argument_elt

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/Texinfo/XS/misc.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-21 16:10:57 UTC (rev 8185)
+++ trunk/ChangeLog     2018-09-21 16:26:41 UTC (rev 8186)
@@ -1,5 +1,13 @@
 2018-09-21  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi):
+       Do not set a 'spaces_after_command_elt' value.
+       (_abort_empty_line): Do not clear a 'spaces_before_argument_elt' 
+       value.
+       * tp/Texinfo/XS/misc.c (xs_abort_empty_line): Make the same change.
+
+2018-09-21  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_start_empty_line_after_command):
        Do not set a 'spaces_after_command_elt' value.
        (_abort_empty_line): Do not clear a 'spaces_after_command_elt' value.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-09-21 16:10:57 UTC (rev 8185)
+++ trunk/tp/Texinfo/Parser.pm  2018-09-21 16:26:41 UTC (rev 8186)
@@ -2139,12 +2139,6 @@
     if ($spaces_element->{'text'} eq '') {
       pop @{$current->{'contents'}};
 
-      if ($owning_element
-          and $owning_element->{'extra'}->{'spaces_before_argument_elt'}) {
-        delete ($owning_element->{'extra'}->{'spaces_before_argument_elt'});
-        delete ($owning_element->{'extra'})
-          if !(keys(%{$owning_element->{'extra'}}));
-      }
     } elsif ($spaces_element->{'type'} eq 'empty_line') {
       # exactly the same condition than to begin a paragraph
       if ((!$current->{'type'} or $type_with_paragraph{$current->{'type'}})
@@ -2160,10 +2154,8 @@
         # the 'extra' hash as 'spaces_before_argument'.
         pop @{$current->{'contents'}};
 
-        # Replace element reference with a simple string.
         $owning_element->{'extra'}->{'spaces_before_argument'}
           = $spaces_element->{'text'};
-        delete $owning_element->{'extra'}->{'spaces_before_argument_elt'};
       } else {
         $spaces_element->{'type'} = 'empty_spaces_after_command';
       }
@@ -4921,8 +4913,6 @@
                             'parent' => $current,
                             'extra' => {'command' => $current->{'parent'}}
                                       };
-              $current->{'parent'}->{'extra'}->{'spaces_before_argument_elt'}
-                 = $current->{'contents'}->[-1];
             } else {
               $current->{'type'} = 'brace_command_arg';
               if ($brace_commands{$command}
@@ -4934,8 +4924,6 @@
                             'parent' => $current,
                             'extra' => {'command' => $current}
                                       };
-                $current->{'extra'}->{'spaces_before_argument_elt'}
-                   = $current->{'contents'}->[-1];
               }
               if ($inline_commands{$command}) {
                 push @{$self->{'context_stack'}}, $command
@@ -4966,9 +4954,6 @@
                  'extra' => {'command' => $current}
                };
             print STDERR "BRACKETED in def/multitable\n" if ($self->{'DEBUG'});
-            $current->{'extra'}->{'spaces_before_argument_elt'}
-               = $current->{'contents'}->[-1];
-
           # lone braces accepted right in a rawpreformatted
           } elsif ($current->{'type'} 
                    and $current->{'type'} eq 'rawpreformatted') {
@@ -5366,8 +5351,6 @@
                   'parent' => $current,
                   'extra' => {'command' => $current}
                 };
-          $current->{'extra'}->{'spaces_before_argument_elt'}
-            = $current->{'contents'}->[-1];
         } elsif ($separator eq ',' and $current->{'type'}
             and $current->{'type'} eq 'misc_line_arg'
             and $current->{'parent'}->{'cmdname'} 
@@ -6852,12 +6835,6 @@
 For @-commands with opening brace followed by spaces held in a 
 C<empty_spaces_before_argument> element, a reference to those spaces.
 
-=item spaces_before_argument_elt
-
-For @-commands with opening brace followed by spaces held in a 
-C<empty_spaces_before_argument> element, a reference to that element.
-Should not occur in final tree.
-
 =item spaces
 
 For accent commands acting on one letter only, like C<@ringaccent>

Modified: trunk/tp/Texinfo/XS/misc.c
===================================================================
--- trunk/tp/Texinfo/XS/misc.c  2018-09-21 16:10:57 UTC (rev 8185)
+++ trunk/tp/Texinfo/XS/misc.c  2018-09-21 16:26:41 UTC (rev 8186)
@@ -138,23 +138,6 @@
     {
       /* Remove spaces_elt */
       av_pop (contents_array);
-
-      if (owning_elt)
-        {
-          if (command_extra)
-            {
-              /* We found an "extra" reference to this element.  Remove it. */
-              hv_delete (command_extra,
-                         "spaces_before_argument_elt",
-                         strlen ("spaces_before_argument_elt"),
-                         G_DISCARD);
-
-              /* If the extra hash now empty, remove it as well. */
-              hv_iterinit (command_extra);
-              if (!hv_iternext (command_extra))
-                hv_delete (owning_elt, "extra", strlen ("extra"), G_DISCARD);
-            }
-        }
     }
   else if (!strcmp (type, "empty_line"))
     {
@@ -235,10 +218,6 @@
                     strlen ("spaces_before_argument"),
                     newSVpv(ptr, len),
                     0);
-          hv_delete (command_extra,
-                     "spaces_before_argument_elt",
-                     strlen ("spaces_before_argument_elt"),
-                     G_DISCARD);
         }
       else
         {