[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8229] no _trim_spaces_comment_from_content
|
From: |
gavinsmith0123 |
|
Subject: |
[8229] no _trim_spaces_comment_from_content |
|
Date: |
Mon, 24 Sep 2018 07:50:07 -0400 (EDT) |
Revision: 8229
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8229
Author: gavin
Date: 2018-09-24 07:50:06 -0400 (Mon, 24 Sep 2018)
Log Message:
-----------
no _trim_spaces_comment_from_content
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/invalid_nestings/center.pl
trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-09-24 11:10:02 UTC (rev 8228)
+++ trunk/ChangeLog 2018-09-24 11:50:06 UTC (rev 8229)
@@ -1,5 +1,14 @@
2018-09-24 Gavin Smith <address@hidden>
+ * tp/Texinfo/Parser.pm (_end_line) <misc command>:
+ Do not call _trim_spaces_comment_from_content. This leads to a
+ change in the 'misc_args' in a few cases of invalid nesting of
+ line commands.
+ (_trim_spaces_comment_from_content): Remove wrapper for
+ Texinfo::Common::trim_spaces_comment_from_content.
+
+2018-09-24 Gavin Smith <address@hidden>
+
* tp/Texinfo/Parser.pm (_parse_texi): Remove a comment.
(_merge_text, _abort_empty_line, _parse_texi_regex): Add a
comment noting these subs have XS overrides.
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2018-09-24 11:10:02 UTC (rev 8228)
+++ trunk/tp/Texinfo/Parser.pm 2018-09-24 11:50:06 UTC (rev 8229)
@@ -3171,26 +3171,23 @@
my $node = _parse_node_manual($arg);
push @{$current->{'extra'}->{'nodes_manuals'}}, $node;
}
- _check_internal_node($self,
- $current->{'extra'}->{'nodes_manuals'}->[0],
- $line_nr);
+ _check_internal_node($self, $current->{'extra'}->{'nodes_manuals'}->[0],
+ $line_nr);
_register_label($self, $current,
$current->{'extra'}->{'nodes_manuals'}->[0]);
$self->{'current_node'} = $current;
} elsif ($command eq 'listoffloats') {
_parse_float_type($current);
- # handle all the other 'line' commands. Here just check that they
- # have an argument and prepare contents without spaces.
} else {
- my @contents = @{$current->{'args'}->[0]->{'contents'}};
- _trim_spaces_comment_from_content(address@hidden);
- # empty @top is allowed
- if (!scalar(@contents) and $command ne 'top') {
+ # Handle all the other 'line' commands. Here just check that they
+ # have an argument. Empty @top is allowed
+ if (address@hidden>{'args'}->[0]->{'contents'}} and $command ne 'top') {
$self->_command_warn($current, $line_nr,
__("address@hidden missing argument"), $command);
$current->{'extra'}->{'missing_argument'} = 1;
} else {
- $current->{'extra'}->{'misc_content'} = address@hidden;
+ $current->{'extra'}->{'misc_content'}
+ = $current->{'args'}->[0]->{'contents'};
if (($command eq 'item' or $command eq 'itemx')
and $self->{'command_index'}->{$current->{'parent'}->{'cmdname'}})
{
_enter_index_entry($self, $current->{'parent'}->{'cmdname'},
@@ -5465,11 +5462,6 @@
return ($args, $has_comment);
}
-sub _trim_spaces_comment_from_content($)
-{
- Texinfo::Common::trim_spaces_comment_from_content($_[0]);
-}
-
# at the end of an @-command line with arguments, parse the resulting
# text, to collect aliases, definfoenclose and collect errors on
# wrong arguments.
Modified: trunk/tp/t/results/invalid_nestings/center.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/center.pl 2018-09-24 11:10:02 UTC
(rev 8228)
+++ trunk/tp/t/results/invalid_nestings/center.pl 2018-09-24 11:50:06 UTC
(rev 8229)
@@ -112,14 +112,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {},
- {},
- {},
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -160,9 +153,7 @@
'extra' => {
'index_entry' => {
'command' => {},
- 'content' => [
- {}
- ],
+ 'content' => [],
'content_normalized' => [],
'in_code' => 0,
'index_at_command' => 'cindex',
@@ -190,10 +181,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -239,9 +227,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -292,9 +278,7 @@
'cmdname' => 'center',
'extra' => {
'invalid_nesting' => 1,
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {
@@ -311,10 +295,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -360,9 +341,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -431,9 +410,7 @@
'cmdname' => 'center',
'extra' => {
'invalid_nesting' => 1,
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -446,10 +423,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -515,9 +489,7 @@
'cmdname' => 'center',
'extra' => {
'invalid_nesting' => 1,
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -585,11 +557,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {
@@ -697,9 +665,7 @@
],
'cmdname' => 'item',
'extra' => {
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {
@@ -743,11 +709,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {
@@ -856,9 +818,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -916,9 +876,7 @@
'cmdname' => 'center',
'extra' => {
'invalid_nesting' => 1,
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -931,10 +889,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -991,9 +946,7 @@
'cmdname' => 'center',
'extra' => {
'invalid_nesting' => 1,
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -1006,11 +959,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -1154,11 +1103,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {
@@ -1192,9 +1137,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {
@@ -1337,10 +1280,7 @@
],
'cmdname' => 'center',
'extra' => {
- 'misc_content' => [
- {},
- {}
- ],
+ 'misc_content' => [],
'spaces_before_argument' => ' '
},
'line_nr' => {},
@@ -1411,12 +1351,7 @@
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} =
$result_trees{'center'}{'contents'}[0]{'args'}[0];
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[0];
-$result_trees{'center'}{'contents'}[0]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[0]{'extra'}{'misc_content'}[1] =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[0]{'extra'}{'misc_content'}[2] =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'center'}{'contents'}[0]{'extra'}{'misc_content'}[3] =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'center'}{'contents'}[0]{'extra'}{'misc_content'}[4] =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'center'}{'contents'}[0]{'extra'}{'misc_content'}[5] =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'center'}{'contents'}[0]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[0]{'line_nr'} =
$result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[0]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[1]{'parent'} = $result_trees{'center'};
@@ -1424,13 +1359,12 @@
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
= $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
=
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'center'}{'contents'}[2]{'args'}[0];
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[2];
-$result_trees{'center'}{'contents'}[2]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[2]{'extra'}{'misc_content'}[1] =
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[2]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[2]{'line_nr'} =
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'center'}{'contents'}[2]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[3]{'parent'} = $result_trees{'center'};
@@ -1438,7 +1372,7 @@
$result_trees{'center'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[4]{'args'}[0]{'contents'}[0];
$result_trees{'center'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[4]{'args'}[0];
$result_trees{'center'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[4];
-$result_trees{'center'}{'contents'}[4]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[4]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[4]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[4]{'line_nr'} =
$result_trees{'center'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[4]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[5];
@@ -1447,11 +1381,10 @@
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[7]{'args'}[0];
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'center'}{'contents'}[7]{'args'}[0];
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[7];
-$result_trees{'center'}{'contents'}[7]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[7]{'extra'}{'misc_content'}[1] =
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[7]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[7]{'line_nr'} =
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'center'}{'contents'}[7]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[8]{'parent'} = $result_trees{'center'};
@@ -1459,7 +1392,7 @@
$result_trees{'center'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[9]{'args'}[0]{'contents'}[0];
$result_trees{'center'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[9]{'args'}[0];
$result_trees{'center'}{'contents'}[9]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[9];
-$result_trees{'center'}{'contents'}[9]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[9]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[9]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[9]{'line_nr'} =
$result_trees{'center'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[9]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[10]{'parent'} = $result_trees{'center'};
@@ -1470,12 +1403,11 @@
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[13]{'args'}[0];
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'} =
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'center'}{'contents'}[13]{'args'}[0];
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[13];
-$result_trees{'center'}{'contents'}[13]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[13]{'extra'}{'misc_content'}[1] =
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[13]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[13]{'line_nr'} =
$result_trees{'center'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[13]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[14]{'parent'} = $result_trees{'center'};
@@ -1486,7 +1418,7 @@
$result_trees{'center'}{'contents'}[17]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[18]{'args'}[0];
$result_trees{'center'}{'contents'}[18]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[18];
-$result_trees{'center'}{'contents'}[18]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[18]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[18]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[18]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[18]{'line_nr'} =
$result_trees{'center'}{'contents'}[17]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[18]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[19]{'parent'} = $result_trees{'center'};
@@ -1496,9 +1428,7 @@
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
=
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
=
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[20]{'contents'}[0];
$result_trees{'center'}{'contents'}[20]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[20];
$result_trees{'center'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[20]{'contents'}[1]{'args'}[0];
@@ -1513,7 +1443,7 @@
$result_trees{'center'}{'contents'}[22]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[22];
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0];
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[22]{'contents'}[0];
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
@@ -1520,9 +1450,7 @@
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'misc_content'}[1]
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'misc_content'}[2]
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1];
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'center'}{'contents'}[22]{'contents'}[0];
$result_trees{'center'}{'contents'}[22]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[22];
@@ -1539,7 +1467,7 @@
$result_trees{'center'}{'contents'}[25]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[25]{'args'}[0]{'contents'}[0];
$result_trees{'center'}{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[25]{'args'}[0];
$result_trees{'center'}{'contents'}[25]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[25];
-$result_trees{'center'}{'contents'}[25]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[25]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[25]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[25]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[25]{'line_nr'} =
$result_trees{'center'}{'contents'}[25]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[25]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[26]{'parent'} = $result_trees{'center'};
@@ -1548,12 +1476,11 @@
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[27]{'args'}[0];
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'} =
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'center'}{'contents'}[27]{'args'}[0];
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[27];
-$result_trees{'center'}{'contents'}[27]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[27]{'extra'}{'misc_content'}[1] =
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[27]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[27]{'line_nr'} =
$result_trees{'center'}{'contents'}[27]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[27]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[28]{'parent'} = $result_trees{'center'};
@@ -1562,13 +1489,11 @@
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'center'}{'contents'}[29]{'args'}[0];
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2];
-$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'line_nr'} =
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'parent'} =
$result_trees{'center'}{'contents'}[29]{'args'}[0];
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[29];
-$result_trees{'center'}{'contents'}[29]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[29]{'extra'}{'misc_content'}[1] =
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[29]{'extra'}{'misc_content'}[2] =
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[2];
+$result_trees{'center'}{'contents'}[29]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[29]{'line_nr'} =
$result_trees{'center'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'center'}{'contents'}[29]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[30]{'parent'} = $result_trees{'center'};
@@ -1591,14 +1516,12 @@
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'misc_content'}[1]
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'misc_content'}[2]
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'misc_content'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'}
=
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'center'}{'contents'}[33]{'contents'}[0]{'contents'}[0];
@@ -1620,8 +1543,7 @@
$result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'line_nr'} =
$result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'center'}{'contents'}[35]{'args'}[0];
$result_trees{'center'}{'contents'}[35]{'args'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[35];
-$result_trees{'center'}{'contents'}[35]{'extra'}{'misc_content'}[0] =
$result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[35]{'extra'}{'misc_content'}[1] =
$result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[35]{'extra'}{'misc_content'} =
$result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'};
$result_trees{'center'}{'contents'}[35]{'line_nr'} =
$result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'center'}{'contents'}[35]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[36]{'parent'} = $result_trees{'center'};
Modified: trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
2018-09-24 11:10:02 UTC (rev 8228)
+++ trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
2018-09-24 11:50:06 UTC (rev 8229)
@@ -74,9 +74,7 @@
'extra' => {
'index_entry' => {
'command' => {},
- 'content' => [
- {}
- ],
+ 'content' => [],
'content_normalized' => [],
'in_code' => 1,
'index_at_command' => 'vindex',
@@ -166,9 +164,9 @@
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'multitable_item_in_index'}{'contents'}[0];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[1]{'args'}[0];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8229] no _trim_spaces_comment_from_content,
gavinsmith0123 <=