[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8319] parse_node_manual don't lose (
From: |
gavinsmith0123 |
Subject: |
[8319] parse_node_manual don't lose ( |
Date: |
Wed, 17 Oct 2018 15:53:19 -0400 (EDT) |
Revision: 8319
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8319
Author: gavin
Date: 2018-10-17 15:53:19 -0400 (Wed, 17 Oct 2018)
Log Message:
-----------
parse_node_manual don't lose (
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Common.pm
trunk/tp/t/results/sectioning/node_nested_parentheses.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-10-17 19:05:08 UTC (rev 8318)
+++ trunk/ChangeLog 2018-10-17 19:53:19 UTC (rev 8319)
@@ -1,5 +1,10 @@
2018-10-17 Gavin Smith <address@hidden>
+ * tp/Texinfo/Common.pm (parse_node_manual): Don't lose a leading (
+ in the case of incorrectly nested parentheses.
+
+2018-10-17 Gavin Smith <address@hidden>
+
* tp/Texinfo/Common.pm (parse_node_manual): Set parent fields on
new elements.
Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm 2018-10-17 19:05:08 UTC (rev 8318)
+++ trunk/tp/Texinfo/Common.pm 2018-10-17 19:53:19 UTC (rev 8319)
@@ -1496,7 +1496,7 @@
if ($braces_count == 0) {
$result->{'manual_content'} = $manual if (defined($manual));
} else {
- @contents = @$manual;
+ @contents = ({ 'text' => '(', 'parent' => $node }, @$manual);
}
}
if (@contents) {
Modified: trunk/tp/t/results/sectioning/node_nested_parentheses.pl
===================================================================
--- trunk/tp/t/results/sectioning/node_nested_parentheses.pl 2018-10-17
19:05:08 UTC (rev 8318)
+++ trunk/tp/t/results/sectioning/node_nested_parentheses.pl 2018-10-17
19:53:19 UTC (rev 8319)
@@ -285,6 +285,10 @@
{
'contents' => [
{
+ 'parent' => {},
+ 'text' => '('
+ },
+ {
'args' => [
{
'contents' => [
@@ -342,9 +346,10 @@
'menu_entry_node' => {
'node_content' => [
{},
+ {},
{}
],
- 'normalized' => '_0029_0029_0029-error'
+ 'normalized' => '_0028_0029_0029_0029-error'
}
},
'line_nr' => {},
@@ -467,10 +472,11 @@
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'line_nr'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'line_nr'};
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0];
@@ -479,7 +485,8 @@
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_description'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[1]
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'line_nr'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[2]
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'line_nr'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'line_nr'};
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0];
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
=
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
@@ -496,7 +503,7 @@
* ((some) file)::
* (other (file))node name::
* (@code{open(}) close)::
-* @code{)))} error::
+* (@code{)))} error::
@end menu
';
@@ -505,7 +512,7 @@
* ((some) file)::
* (other (file))node name::
* (open() close)::
-* ))) error::
+* ())) error::
';
$result_sectioning{'node_nested_parentheses'} = {};
@@ -575,12 +582,12 @@
$result_errors{'node_nested_parentheses'} = [
{
- 'error_line' => ':7: @menu reference to nonexistent node
address@hidden)))} error\'
+ 'error_line' => ':7: @menu reference to nonexistent node `(@code{)))}
error\'
',
'file_name' => '',
'line_nr' => 7,
'macro' => '',
- 'text' => '@menu reference to nonexistent node address@hidden)))} error\'',
+ 'text' => '@menu reference to nonexistent node `(@code{)))} error\'',
'type' => 'error'
}
];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8319] parse_node_manual don't lose (,
gavinsmith0123 <=