texinfo-commits
[Top][All Lists]
Advanced

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

[7566] _parse_def don't call parse_texi_line


From: gavinsmith0123
Subject: [7566] _parse_def don't call parse_texi_line
Date: Sat, 24 Dec 2016 09:39:55 +0000 (UTC)

Revision: 7566
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7566
Author:   gavin
Date:     2016-12-24 09:39:55 +0000 (Sat, 24 Dec 2016)
Log Message:
-----------
_parse_def don't call parse_texi_line

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-12-24 09:38:55 UTC (rev 7565)
+++ trunk/ChangeLog     2016-12-24 09:39:55 UTC (rev 7566)
@@ -1,5 +1,10 @@
 2016-12-24  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_def): Avoid an unnecessary
+       call to 'parse_texi_line'.
+
+2016-12-24  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_end_line) <@include> If in the tests, 
        strip off leading directories when recording filename.  This is 
        to be consistent with what is done in 'parse_texi_file'.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-12-24 09:38:55 UTC (rev 7565)
+++ trunk/tp/Texinfo/Parser.pm  2016-12-24 09:39:55 UTC (rev 7566)
@@ -2357,20 +2357,15 @@
     my $prepended = $def_map{$command}->{$real_command};
     my @prepended_content;
 
-    my $tree = parse_texi_line(undef, $prepended);
 
     my $bracketed = { 'type' => 'bracketed' };
-    $bracketed->{'contents'} = $tree->{'contents'};
-    foreach my $content (@{$tree->{'contents'}}) {
-      $content->{'parent'} = $bracketed;
-      if (!$content->{'type'} and $self->{'documentlanguage'}) {
-        $content->{'type'} = 'untranslated';
-        $content->{'extra'}->{'documentlanguage'}
-        = $self->{'documentlanguage'};
-      }
+    my $content = { 'text' => $prepended, 'parent' => $bracketed };
+    if ($self->{'documentlanguage'}) {
+      $content->{'type'} = 'untranslated';
+      $content->{'extra'}->{'documentlanguage'} = $self->{'documentlanguage'};
     }
-    @prepended_content = ($bracketed);
-    push @prepended_content, { 'text' => ' ' };
+    @{$bracketed->{'contents'}} = ($content);
+    @prepended_content = ($bracketed, { 'text' => ' ' });
 
     unshift @contents, @prepended_content;
 




reply via email to

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