[6532] fix empty macro expansion

[Gavin D. Smith]

Revision: 6532
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6532
Author:   gavin
Date:     2015-08-16 17:36:39 +0000 (Sun, 16 Aug 2015)
Log Message:
-----------
fix empty macro expansion

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-15 18:32:39 UTC (rev 6531)
+++ trunk/ChangeLog     2015-08-16 17:36:39 UTC (rev 6532)
@@ -1,5 +1,12 @@
 2015-08-15  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi) <macro expansion>: If macro 
+       expansion is empty, don't add to macro expansion stack.  Problem 
+       with empty macro body, leading to error about recursive macro 
+       usage, reported by Vincent Belaiche.
+
+2015-08-15  Gavin Smith  <address@hidden>
+
        * autogen.sh: Run libtoolize before autoreconf.
 
 2015-08-14  Gavin Smith  <address@hidden>

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2015-08-15 18:32:39 UTC (rev 6531)
+++ trunk/tp/Texinfo/Parser.pm  2015-08-16 17:36:39 UTC (rev 6532)
@@ -4128,15 +4128,15 @@
           next if ($found);
         }
 
-        unshift @{$self->{'macro_stack'}}, $expanded_macro;
-        print STDERR "UNSHIFT MACRO_STACK: 
$expanded_macro->{'args'}->[0]->{'text'}\n"
-          if ($self->{'DEBUG'});
         my $expanded_lines = _text_to_lines($expanded);
         chomp ($expanded_lines->[-1]);
         pop @$expanded_lines if ($expanded_lines->[-1] eq '');
         print STDERR "MACRO EXPANSION LINES: ".join('|', @$expanded_lines)
                                      ."|\nEND LINES MACRO EXPANSION\n" if 
($self->{'DEBUG'});
         next if (address@hidden);
+        unshift @{$self->{'macro_stack'}}, $expanded_macro;
+        print STDERR "UNSHIFT MACRO_STACK: 
$expanded_macro->{'args'}->[0]->{'text'}\n"
+          if ($self->{'DEBUG'});
         my $new_lines = _complete_line_nr($expanded_lines, 
                             $line_nr->{'line_nr'}, $line_nr->{'file_name'},
                             $expanded_macro->{'args'}->[0]->{'text'}, 1);