[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8031] Transformations.pm avoid Texinfo::Parser functions
From: |
gavinsmith0123 |
Subject: |
[8031] Transformations.pm avoid Texinfo::Parser functions |
Date: |
Thu, 9 Aug 2018 11:44:40 -0400 (EDT) |
Revision: 8031
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8031
Author: gavin
Date: 2018-08-09 11:44:40 -0400 (Thu, 09 Aug 2018)
Log Message:
-----------
Transformations.pm avoid Texinfo::Parser functions
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Transformations.pm
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-08-09 15:39:15 UTC (rev 8030)
+++ trunk/ChangeLog 2018-08-09 15:44:40 UTC (rev 8031)
@@ -1,5 +1,11 @@
2018-08-09 Gavin Smith <address@hidden>
+ * tp/Texinfo/Transformations.pm (_new_node): Call
+ 'parse_node_manual' from Texinfo::Common instead of
+ Texinfo::Parser, and do not call Texinfo::Parser::register_label.
+
+2018-08-09 Gavin Smith <address@hidden>
+
* tp/Texinfo/Common.pm (%default_parser_state_configuration):
Do not allow customizing the root parser context.
* tp/Texinfo/Parser.pm (parser, simple_parser, _parse_texi):
Modified: trunk/tp/Texinfo/Transformations.pm
===================================================================
--- trunk/tp/Texinfo/Transformations.pm 2018-08-09 15:39:15 UTC (rev 8030)
+++ trunk/tp/Texinfo/Transformations.pm 2018-08-09 15:44:40 UTC (rev 8031)
@@ -186,7 +186,7 @@
return Texinfo::Common::modify_tree($self, $tree, \&_reference_to_arg);
}
-# prepare a new node and register it
+# prepare a new node
sub _new_node($$)
{
my $self = shift;
@@ -234,7 +234,7 @@
foreach my $content (@{$node_arg->{'contents'}}) {
$content->{'parent'} = $node_arg;
}
- $parsed_node = Texinfo::Parser::_parse_node_manual($node_arg);
+ $parsed_node = Texinfo::Common::parse_node_manual($node_arg);
if ($parsed_node and $parsed_node->{'node_content'}) {
$parsed_node->{'normalized'} =
Texinfo::Convert::NodeNameNormalization::normalize_node (
@@ -256,8 +256,9 @@
$self->{'labels'}->{$parsed_node->{'normalized'}} = $node;
$node->{'extra'}->{'normalized'} = $parsed_node->{'normalized'};
}
- if (!Texinfo::Parser::_register_label($self, $node, $parsed_node)) {
- print STDERR "BUG: node unique, register failed:
$parsed_node->{'normalized'}\n";
+ push @{$self->{'targets'}}, $node;
+ if ($parsed_node->{'node_content'}) {
+ $node->{'extra'}->{'node_content'} = $parsed_node->{'node_content'};
}
push @{$self->{'nodes'}}, $node;
return $node;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8031] Transformations.pm avoid Texinfo::Parser functions,
gavinsmith0123 <=