[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8262] change meaning of columnfractions extra value
|
From: |
gavinsmith0123 |
|
Subject: |
[8262] change meaning of columnfractions extra value |
|
Date: |
Sat, 6 Oct 2018 04:47:22 -0400 (EDT) |
Revision: 8262
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8262
Author: gavin
Date: 2018-10-06 04:47:22 -0400 (Sat, 06 Oct 2018)
Log Message:
-----------
change meaning of columnfractions extra value
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/DocBook.pm
trunk/tp/Texinfo/Convert/HTML.pm
trunk/tp/Texinfo/Convert/Plaintext.pm
trunk/tp/Texinfo/Convert/TexinfoXML.pm
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/columnfractions/good.pl
trunk/tp/t/results/columnfractions/good_comment.pl
trunk/tp/t/results/columnfractions/good_space_comment.pl
trunk/tp/t/results/columnfractions/something_before_columnfractions.pl
trunk/tp/t/results/coverage/formats_only_title_comments.pl
trunk/tp/t/results/coverage/formats_only_titles.pl
trunk/tp/t/results/coverage/formats_titles.pl
trunk/tp/t/results/coverage/multitable.pl
trunk/tp/t/results/coverage/symbol_after_block.pl
trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
trunk/tp/t/results/multitable/empty_item_tab.pl
trunk/tp/t/results/multitable/inter_item_commands_in_multitable.pl
trunk/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl
trunk/tp/t/results/multitable/ref_in_multitable.pl
trunk/tp/t/results/paragraph/commands_in_flushright.pl
trunk/tp/t/results/xml_tests/commands_and_spaces.pl
trunk/tp/t/results/xml_tests/comments_end_lines.pl
trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/ChangeLog 2018-10-06 08:47:22 UTC (rev 8262)
@@ -1,10 +1,24 @@
2018-10-06 Gavin Smith <address@hidden>
+ * tp/Texinfo/Parser.pm (_end_line) <@columnfractions>: Set the
+ 'columnfractions' extra value to the element for the
+ @columnfractions command, rather than to the 'misc_args' array
+ of that element. This is to make a 'misc_args' array only
+ referenced by one element, which makes it possible to free the
+ memory properly in the C rewrite.
+
+ * tp/Texinfo/Convert/DocBook.pm (_convert),
+ * tp/Texinfo/Convert/HTML.pm (_convert_tab_command),
+ * tp/Texinfo/Convert/Plaintext.pm (_convert),
+ * tp/Texinfo/Convert/TexinfoXML.pm (_convert): Update.
+
+2018-10-06 Gavin Smith <address@hidden>
+
* tp/t/README: Add more advice.
2018-09-30 Gavin Smith <address@hidden>
- * tp/test_utils.pl: Set 'TEST' to 1 for converters.
+ * tp/t/test_utils.pl: Set 'TEST' to 1 for converters.
2018-09-30 Gavin Smith <address@hidden>
Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2018-10-06 08:47:22 UTC (rev 8262)
@@ -1223,7 +1223,7 @@
Texinfo::Convert::Unicode::string_width($prototype_text);
}
} elsif ($root->{'extra'}->{'columnfractions'}) {
- @fractions = @{$root->{'extra'}->{'columnfractions'}};
+ @fractions =
@{$root->{'extra'}->{'columnfractions'}->{'extra'}->{'misc_args'}};
$multiply = 100;
}
foreach my $fraction (@fractions) {
Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm 2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/Texinfo/Convert/HTML.pm 2018-10-06 08:47:22 UTC (rev 8262)
@@ -3126,10 +3126,13 @@
my $multitable = $row->{'parent'}->{'parent'};
my $fractions = '';
- if ($multitable->{'extra'}->{'columnfractions'} and
- exists($multitable->{'extra'}->{'columnfractions'}->[$cell_nr-1])) {
- my $fraction = sprintf('%d',
100*$multitable->{'extra'}->{'columnfractions'}->[$cell_nr-1]);
- $fractions = " width=\"$fraction%\"";
+ my $cf = $multitable->{'extra'}->{'columnfractions'};
+ if ($cf) {
+ if (exists($cf->{'extra'}->{'misc_args'}->[$cell_nr-1])) {
+ my $fraction = sprintf('%d',
+ 100*$cf->{'extra'}->{'misc_args'}->[$cell_nr-1]);
+ $fractions = " width=\"$fraction%\"";
+ }
}
$content =~ s/^\s*//;
Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm 2018-10-06 08:38:16 UTC (rev
8261)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm 2018-10-06 08:47:22 UTC (rev
8262)
@@ -2402,7 +2402,8 @@
} elsif ($command eq 'multitable') {
my $columnsize;
if ($root->{'extra'}->{'columnfractions'}) {
- foreach my $fraction (@{$root->{'extra'}->{'columnfractions'}}) {
+ foreach my $fraction (@{$root->{'extra'}->{'columnfractions'}
+ ->{'extra'}->{'misc_args'}}) {
push @$columnsize, int($fraction *
$self->{'text_element_context'}->[-1]->{'max'} +0.5);
}
} elsif ($root->{'extra'}->{'prototypes'}) {
Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-10-06 08:38:16 UTC (rev
8261)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-10-06 08:47:22 UTC (rev
8262)
@@ -1441,7 +1441,8 @@
}
my $attribute = [$self->_texinfo_line($cmd)];
$result .= $self->open_element('columnfractions', $attribute);
- foreach my $fraction
(@{$root->{'extra'}->{'columnfractions'}}) {
+ foreach my $fraction (@{$root->{'extra'}->{'columnfractions'}
+ ->{'extra'}->{'misc_args'}}) {
$result .= $self->open_element('columnfraction',
['value', $fraction])
.$self->close_element('columnfraction');
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/Texinfo/Parser.pm 2018-10-06 08:47:22 UTC (rev 8262)
@@ -3268,7 +3268,7 @@
if (defined($misc_cmd->{'extra'}->{'misc_args'})) {
$current->{'extra'}->{'max_columns'} =
scalar(@{$misc_cmd->{'extra'}->{'misc_args'}});
- $current->{'extra'}->{'columnfractions'} =
$misc_cmd->{'extra'}->{'misc_args'};
+ $current->{'extra'}->{'columnfractions'} = $misc_cmd;
}
push @{$current->{'contents'}}, { 'type' => 'before_item',
'contents' => [], 'parent', $current };
@@ -6876,8 +6876,8 @@
The key I<max_columns> holds the maximal number of columns. If there
are prototypes on the line they are in the array associated with
I<prototypes>. If there is a C<@columnfractions> as argument, then the
-I<columnfractions> key is associated with the array of columnfractions
-arguments, holding all the column fractions.
+I<columnfractions> key is associated with the element for the
address@hidden command.
=item C<@enumerate>
Modified: trunk/tp/t/results/columnfractions/good.pl
===================================================================
--- trunk/tp/t/results/columnfractions/good.pl 2018-10-06 08:38:16 UTC (rev
8261)
+++ trunk/tp/t/results/columnfractions/good.pl 2018-10-06 08:47:22 UTC (rev
8262)
@@ -79,7 +79,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 3,
'spaces_before_argument' => ' '
@@ -97,7 +97,7 @@
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'good'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'good'}{'contents'}[0]{'contents'}[0];
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'good'}{'contents'}[0];
-$result_trees{'good'}{'contents'}[0]{'extra'}{'columnfractions'} =
$result_trees{'good'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'good'}{'contents'}[0]{'extra'}{'columnfractions'} =
$result_trees{'good'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'good'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'good'}{'contents'}[0]{'contents'}[0];
$result_trees{'good'}{'contents'}[0]{'line_nr'} =
$result_trees{'good'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'good'}{'contents'}[0]{'parent'} = $result_trees{'good'};
Modified: trunk/tp/t/results/columnfractions/good_comment.pl
===================================================================
--- trunk/tp/t/results/columnfractions/good_comment.pl 2018-10-06 08:38:16 UTC
(rev 8261)
+++ trunk/tp/t/results/columnfractions/good_comment.pl 2018-10-06 08:47:22 UTC
(rev 8262)
@@ -93,7 +93,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 3,
'spaces_before_argument' => ' '
@@ -113,7 +113,7 @@
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'good_comment'}{'contents'}[0]{'contents'}[0];
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'good_comment'}{'contents'}[0];
-$result_trees{'good_comment'}{'contents'}[0]{'extra'}{'columnfractions'} =
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'good_comment'}{'contents'}[0]{'extra'}{'columnfractions'} =
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'good_comment'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0];
$result_trees{'good_comment'}{'contents'}[0]{'line_nr'} =
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'good_comment'}{'contents'}[0]{'parent'} =
$result_trees{'good_comment'};
Modified: trunk/tp/t/results/columnfractions/good_space_comment.pl
===================================================================
--- trunk/tp/t/results/columnfractions/good_space_comment.pl 2018-10-06
08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/columnfractions/good_space_comment.pl 2018-10-06
08:47:22 UTC (rev 8262)
@@ -95,7 +95,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -115,7 +115,7 @@
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'good_space_comment'}{'contents'}[0];
-$result_trees{'good_space_comment'}{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'good_space_comment'}{'contents'}[0]{'extra'}{'columnfractions'}
= $result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'line_nr'} =
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'good_space_comment'}{'contents'}[0]{'parent'} =
$result_trees{'good_space_comment'};
Modified: trunk/tp/t/results/columnfractions/something_before_columnfractions.pl
===================================================================
--- trunk/tp/t/results/columnfractions/something_before_columnfractions.pl
2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/columnfractions/something_before_columnfractions.pl
2018-10-06 08:47:22 UTC (rev 8262)
@@ -82,7 +82,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -101,7 +101,7 @@
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0];
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0];
-$result_trees{'something_before_columnfractions'}{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'misc_args'};
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0];
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'line_nr'} =
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'parent'} =
$result_trees{'something_before_columnfractions'};
Modified: trunk/tp/t/results/coverage/formats_only_title_comments.pl
===================================================================
--- trunk/tp/t/results/coverage/formats_only_title_comments.pl 2018-10-06
08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/coverage/formats_only_title_comments.pl 2018-10-06
08:47:22 UTC (rev 8262)
@@ -543,7 +543,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -625,7 +625,7 @@
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1]{'args'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1];
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[8];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'formats_only_title_comments'}{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'extra'}{'end_command'}
= $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1];
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'line_nr'} =
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'formats_only_title_comments'}{'contents'}[8]{'parent'} =
$result_trees{'formats_only_title_comments'};
Modified: trunk/tp/t/results/coverage/formats_only_titles.pl
===================================================================
--- trunk/tp/t/results/coverage/formats_only_titles.pl 2018-10-06 08:38:16 UTC
(rev 8261)
+++ trunk/tp/t/results/coverage/formats_only_titles.pl 2018-10-06 08:47:22 UTC
(rev 8262)
@@ -437,7 +437,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -508,7 +508,7 @@
$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1]{'args'}[0];
$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1];
$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1]{'parent'} =
$result_trees{'formats_only_titles'}{'contents'}[8];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'formats_only_titles'}{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_trees{'formats_only_titles'}{'contents'}[8]{'extra'}{'end_command'} =
$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1];
$result_trees{'formats_only_titles'}{'contents'}[8]{'line_nr'} =
$result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'formats_only_titles'}{'contents'}[8]{'parent'} =
$result_trees{'formats_only_titles'};
Modified: trunk/tp/t/results/coverage/formats_titles.pl
===================================================================
--- trunk/tp/t/results/coverage/formats_titles.pl 2018-10-06 08:38:16 UTC
(rev 8261)
+++ trunk/tp/t/results/coverage/formats_titles.pl 2018-10-06 08:47:22 UTC
(rev 8262)
@@ -642,7 +642,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -741,7 +741,7 @@
$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2]{'args'}[0];
$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2];
$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2]{'parent'} =
$result_trees{'formats_titles'}{'contents'}[8];
-$result_trees{'formats_titles'}{'contents'}[8]{'extra'}{'columnfractions'} =
$result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'formats_titles'}{'contents'}[8]{'extra'}{'columnfractions'} =
$result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_trees{'formats_titles'}{'contents'}[8]{'extra'}{'end_command'} =
$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2];
$result_trees{'formats_titles'}{'contents'}[8]{'line_nr'} =
$result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'formats_titles'}{'contents'}[8]{'parent'} =
$result_trees{'formats_titles'};
Modified: trunk/tp/t/results/coverage/multitable.pl
===================================================================
--- trunk/tp/t/results/coverage/multitable.pl 2018-10-06 08:38:16 UTC (rev
8261)
+++ trunk/tp/t/results/coverage/multitable.pl 2018-10-06 08:47:22 UTC (rev
8262)
@@ -361,7 +361,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -586,7 +586,7 @@
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'contents'}[2];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'multitable'}{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'extra'}{'columnfractions'} =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'multitable'}{'contents'}[1]{'extra'}{'columnfractions'} =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'end_command'} =
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2];
$result_trees{'multitable'}{'contents'}[1]{'line_nr'} =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'multitable'}{'contents'}[1]{'parent'} =
$result_trees{'multitable'};
Modified: trunk/tp/t/results/coverage/symbol_after_block.pl
===================================================================
--- trunk/tp/t/results/coverage/symbol_after_block.pl 2018-10-06 08:38:16 UTC
(rev 8261)
+++ trunk/tp/t/results/coverage/symbol_after_block.pl 2018-10-06 08:47:22 UTC
(rev 8262)
@@ -970,7 +970,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -1187,7 +1187,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -1658,7 +1658,7 @@
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[26];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'symbol_after_block'}{'contents'}[26]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[26]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[26]{'line_nr'} =
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'symbol_after_block'}{'contents'}[26]{'parent'} =
$result_trees{'symbol_after_block'};
@@ -1689,7 +1689,7 @@
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[28];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'symbol_after_block'}{'contents'}[28]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[28]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[28]{'line_nr'} =
$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'symbol_after_block'}{'contents'}[28]{'parent'} =
$result_trees{'symbol_after_block'};
Modified: trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
===================================================================
--- trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
2018-10-06 08:47:22 UTC (rev 8262)
@@ -277,7 +277,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -361,7 +361,7 @@
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'columnfractions'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'columnfractions'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'line_nr'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0];
Modified: trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
===================================================================
--- trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
2018-10-06 08:47:22 UTC (rev 8262)
@@ -420,7 +420,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -1017,7 +1017,7 @@
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'line_nr'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
Modified: trunk/tp/t/results/multitable/empty_item_tab.pl
===================================================================
--- trunk/tp/t/results/multitable/empty_item_tab.pl 2018-10-06 08:38:16 UTC
(rev 8261)
+++ trunk/tp/t/results/multitable/empty_item_tab.pl 2018-10-06 08:47:22 UTC
(rev 8262)
@@ -224,7 +224,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 1,
'spaces_before_argument' => ' '
@@ -706,7 +706,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -742,7 +742,7 @@
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[1];
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'empty_item_tab'}{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'extra'}{'columnfractions'} =
$result_trees{'empty_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'empty_item_tab'}{'contents'}[0]{'extra'}{'columnfractions'} =
$result_trees{'empty_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'empty_item_tab'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[1];
$result_trees{'empty_item_tab'}{'contents'}[0]{'line_nr'} =
$result_trees{'empty_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'empty_item_tab'}{'contents'}[0]{'parent'} =
$result_trees{'empty_item_tab'};
@@ -807,7 +807,7 @@
$result_trees{'empty_item_tab'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_tab'}{'contents'}[2]{'contents'}[1]{'args'}[0];
$result_trees{'empty_item_tab'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'empty_item_tab'}{'contents'}[2]{'contents'}[1];
$result_trees{'empty_item_tab'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'empty_item_tab'}{'contents'}[2];
-$result_trees{'empty_item_tab'}{'contents'}[2]{'extra'}{'columnfractions'} =
$result_trees{'empty_item_tab'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'empty_item_tab'}{'contents'}[2]{'extra'}{'columnfractions'} =
$result_trees{'empty_item_tab'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_trees{'empty_item_tab'}{'contents'}[2]{'extra'}{'end_command'} =
$result_trees{'empty_item_tab'}{'contents'}[2]{'contents'}[1];
$result_trees{'empty_item_tab'}{'contents'}[2]{'line_nr'} =
$result_trees{'empty_item_tab'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'empty_item_tab'}{'contents'}[2]{'parent'} =
$result_trees{'empty_item_tab'};
Modified: trunk/tp/t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
--- trunk/tp/t/results/multitable/inter_item_commands_in_multitable.pl
2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/multitable/inter_item_commands_in_multitable.pl
2018-10-06 08:47:22 UTC (rev 8262)
@@ -614,7 +614,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -891,7 +891,7 @@
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'contents'}[2];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'inter_item_commands_in_multitable'}{'contents'}[2];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'extra'}{'end_command'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'contents'}[2];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'line_nr'} =
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[2]{'parent'} =
$result_trees{'inter_item_commands_in_multitable'};
Modified: trunk/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
2018-10-06 08:47:22 UTC (rev 8262)
@@ -295,7 +295,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -346,7 +346,7 @@
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[1];
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0];
-$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[1];
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'line_nr'}
=
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'parent'}
= $result_trees{'multitable_two_columns_too_much_cells'};
Modified: trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl
2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl
2018-10-06 08:47:22 UTC (rev 8262)
@@ -222,7 +222,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -263,7 +263,7 @@
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[1];
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[1];
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'line_nr'} =
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_with_empty_item_tab'};
Modified: trunk/tp/t/results/multitable/ref_in_multitable.pl
===================================================================
--- trunk/tp/t/results/multitable/ref_in_multitable.pl 2018-10-06 08:38:16 UTC
(rev 8261)
+++ trunk/tp/t/results/multitable/ref_in_multitable.pl 2018-10-06 08:47:22 UTC
(rev 8262)
@@ -470,7 +470,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -601,7 +601,7 @@
$result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[1];
$result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'ref_in_multitable'}{'contents'}[4];
-$result_trees{'ref_in_multitable'}{'contents'}[4]{'extra'}{'columnfractions'}
=
$result_trees{'ref_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'ref_in_multitable'}{'contents'}[4]{'extra'}{'columnfractions'}
= $result_trees{'ref_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0];
$result_trees{'ref_in_multitable'}{'contents'}[4]{'extra'}{'end_command'} =
$result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[1];
$result_trees{'ref_in_multitable'}{'contents'}[4]{'line_nr'} =
$result_trees{'ref_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'ref_in_multitable'}{'contents'}[4]{'parent'} =
$result_trees{'ref_in_multitable'};
Modified: trunk/tp/t/results/paragraph/commands_in_flushright.pl
===================================================================
--- trunk/tp/t/results/paragraph/commands_in_flushright.pl 2018-10-06
08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/paragraph/commands_in_flushright.pl 2018-10-06
08:47:22 UTC (rev 8262)
@@ -693,7 +693,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -1281,7 +1281,7 @@
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
= $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'extra'}{'columnfractions'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'extra'}{'columnfractions'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'line_nr'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[10]{'parent'}
= $result_trees{'commands_in_flushright'}{'contents'}[0];
Modified: trunk/tp/t/results/xml_tests/commands_and_spaces.pl
===================================================================
--- trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2018-10-06 08:38:16 UTC
(rev 8261)
+++ trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2018-10-06 08:47:22 UTC
(rev 8262)
@@ -875,7 +875,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -1904,7 +1904,7 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'args'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'columnfractions'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'columnfractions'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'end_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
Modified: trunk/tp/t/results/xml_tests/comments_end_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_end_lines.pl 2018-10-06 08:38:16 UTC
(rev 8261)
+++ trunk/tp/t/results/xml_tests/comments_end_lines.pl 2018-10-06 08:47:22 UTC
(rev 8262)
@@ -738,7 +738,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -1133,7 +1133,7 @@
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
=
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'extra'}{'comment_at_end'};
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
=
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'parent'} =
$result_trees{'comments_end_lines'}{'contents'}[12];
-$result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'columnfractions'}
=
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'columnfractions'}
=
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0];
$result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'end_command'} =
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1];
$result_trees{'comments_end_lines'}{'contents'}[12]{'line_nr'} =
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'comments_end_lines'}{'contents'}[12]{'parent'} =
$result_trees{'comments_end_lines'};
Modified: trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
2018-10-06 08:38:16 UTC (rev 8261)
+++ trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
2018-10-06 08:47:22 UTC (rev 8262)
@@ -1313,7 +1313,7 @@
}
],
'extra' => {
- 'columnfractions' => [],
+ 'columnfractions' => {},
'end_command' => {},
'max_columns' => 2,
'spaces_before_argument' => ' '
@@ -1966,7 +1966,7 @@
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]{'args'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[22];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'columnfractions'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'columnfractions'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'line_nr'} =
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8262] change meaning of columnfractions extra value,
gavinsmith0123 <=