[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7224] closed raw block do not call _start_empty_line_after_command
|
From: |
gavinsmith0123 |
|
Subject: |
[7224] closed raw block do not call _start_empty_line_after_command |
|
Date: |
Tue, 14 Jun 2016 17:58:31 +0000 (UTC) |
Revision: 7224
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7224
Author: gavin
Date: 2016-06-14 17:58:30 +0000 (Tue, 14 Jun 2016)
Log Message:
-----------
closed raw block do not call _start_empty_line_after_command
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
trunk/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
trunk/tp/t/results/conditionals/end_ifset_in_format.pl
trunk/tp/t/results/conditionals/macro_in_ifset.pl
trunk/tp/t/results/conditionals/macro_in_ifset_set.pl
trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl
trunk/tp/t/results/conditionals/nested_ignore.pl
trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
trunk/tp/t/results/coverage/symbol_after_block.pl
trunk/tp/t/results/coverage_braces/test_image.pl
trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
trunk/tp/t/results/html_tests/xml_protected_in_verb.pl
trunk/tp/t/results/include/cpp_lines.pl
trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
trunk/tp/t/results/include/macro_definition_in_include.pl
trunk/tp/t/results/include/macro_in_early_commands.pl
trunk/tp/t/results/info_tests/def_in_copying.pl
trunk/tp/t/results/invalid_nestings/ignore_in_xref.pl
trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl
trunk/tp/t/results/macro/arg_body_expansion_order.pl
trunk/tp/t/results/macro/arg_not_closed.pl
trunk/tp/t/results/macro/backslash_in_arg.pl
trunk/tp/t/results/macro/bad_argument.pl
trunk/tp/t/results/macro/bad_formal_arg.pl
trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl
trunk/tp/t/results/macro/complete_macro_for_end.pl
trunk/tp/t/results/macro/complex_argument.pl
trunk/tp/t/results/macro/double_macro_definition.pl
trunk/tp/t/results/macro/double_recursive_macro_call.pl
trunk/tp/t/results/macro/empty_end.pl
trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl
trunk/tp/t/results/macro/empty_macro_no_arg.pl
trunk/tp/t/results/macro/expand_two_same.pl
trunk/tp/t/results/macro/expansion_order.pl
trunk/tp/t/results/macro/form_feeds.pl
trunk/tp/t/results/macro/ifclear_in_macro.pl
trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
trunk/tp/t/results/macro/ifset_in_macro.pl
trunk/tp/t/results/macro/ifset_in_macro_set.pl
trunk/tp/t/results/macro/ignored_macro_definition.pl
trunk/tp/t/results/macro/implicit_quoting_one_arg.pl
trunk/tp/t/results/macro/implicit_quoting_recursion.pl
trunk/tp/t/results/macro/leading_spaces_ignore.pl
trunk/tp/t/results/macro/leading_spaces_no_ignore.pl
trunk/tp/t/results/macro/macro_expands_to_empty.pl
trunk/tp/t/results/macro/macro_expansion.pl
trunk/tp/t/results/macro/macro_for_end.pl
trunk/tp/t/results/macro/macro_for_ignored_line_command.pl
trunk/tp/t/results/macro/macro_in_accent.pl
trunk/tp/t/results/macro/macro_in_brace_command.pl
trunk/tp/t/results/macro/macro_in_end_argument.pl
trunk/tp/t/results/macro/macro_in_ifset.pl
trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
trunk/tp/t/results/macro/macro_in_index_commands.pl
trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
trunk/tp/t/results/macro/macro_in_macro_arg.pl
trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl
trunk/tp/t/results/macro/macro_in_menu.pl
trunk/tp/t/results/macro/macro_in_misc_commands.pl
trunk/tp/t/results/macro/macro_name_with_digit.pl
trunk/tp/t/results/macro/macro_name_with_hyphen.pl
trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl
trunk/tp/t/results/macro/macro_no_arg_expansion.pl
trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl
trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
trunk/tp/t/results/macro/macro_zero.pl
trunk/tp/t/results/macro/nested_macro_call.pl
trunk/tp/t/results/macro/no_macrobody.pl
trunk/tp/t/results/macro/paragraph_and_macro.pl
trunk/tp/t/results/macro/protect_comma_macro_line.pl
trunk/tp/t/results/macro/protect_in_body.pl
trunk/tp/t/results/macro/protect_in_body_line_arg.pl
trunk/tp/t/results/macro/protect_in_body_one_arg.pl
trunk/tp/t/results/macro/recursive_call_in_argument.pl
trunk/tp/t/results/macro/recursive_call_in_macro.pl
trunk/tp/t/results/macro/redefine_texinfo_macro.pl
trunk/tp/t/results/macro/simple_imbricated_macro.pl
trunk/tp/t/results/macro/space_macro_after_end.pl
trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl
trunk/tp/t/results/macro/text_before_after.pl
trunk/tp/t/results/macro/too_much_args.pl
trunk/tp/t/results/macro/two_macros_on_a_line.pl
trunk/tp/t/results/macro/zero_argument.pl
trunk/tp/t/results/menu/block_commands_in_menu_description.pl
trunk/tp/t/results/menu/formats_in_menu.pl
trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
trunk/tp/t/results/misc_commands/kbdinputstyle.pl
trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
trunk/tp/t/results/raw/misc_raw.pl
trunk/tp/t/results/raw/misc_raw_comments.pl
trunk/tp/t/results/raw/nested_macros.pl
trunk/tp/t/results/raw/raw_commands_and_end_of_lines.pl
trunk/tp/t/results/raw/raw_in_para.pl
trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl
trunk/tp/t/results/raw/verbatim_in_brace_command.pl
trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
trunk/tp/t/results/value_and_macro/macro_in_value.pl
trunk/tp/t/results/value_and_macro/value_in_macro_body.pl
trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
trunk/tp/t/results/xml_tests/commands_and_spaces.pl
trunk/tp/t/results/xml_tests/macro_and_args.pl
trunk/tp/t/results/xml_tests/spaces_info_lost.pl
trunk/tp/t/results/xtable/table_nested.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/ChangeLog 2016-06-14 17:58:30 UTC (rev 7224)
@@ -1,3 +1,14 @@
+2016-06-14 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Parser.pm (_parse_texi) <closed raw block command>:
+ Do not call _start_empty_line_after_command, and add an
+ 'empty_line_after_command' element. This led to an inconsistent
+ meaning for the 'spaces_after_command' extra value, and an
+ existing extra value could be overwritten, for example for a
+ @verbatim block, where the 'spaces_after_command' could be
+ immediately after the '@verbatim' line, or after the entire
+ block.
+
2016-06-13 Vincent Bela\xEFche <address@hidden>
* util/texi2dvi (run_tex): Inline function listing unusual
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/Texinfo/Parser.pm 2016-06-14 17:58:30 UTC (rev 7224)
@@ -3886,7 +3886,13 @@
last;
} else {
print STDERR "CLOSED raw $end_command\n" if ($self->{'DEBUG'});
- $line = _start_empty_line_after_command($line, $current,
$raw_command);
+ $line =~ s/^([^\S\r\n]*)//;
+ push @{$current->{'contents'}},
+ { 'type' => 'empty_line_after_command',
+ 'text' => $1,
+ 'parent' => $current,
+ 'extra' => {'command' => $raw_command }
+ };
}
} else {
if (@{$current->{'contents'}}
Modified: trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
===================================================================
--- trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' truc
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -296,10 +295,9 @@
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
-$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
-$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'command_conditionals_user_defined'};
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'parent'} =
$result_trees{'command_conditionals_user_defined'};
-$result_trees{'command_conditionals_user_defined'}{'contents'}[1] =
$result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'command_conditionals_user_defined'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
+$result_trees{'command_conditionals_user_defined'}{'contents'}[1]{'parent'} =
$result_trees{'command_conditionals_user_defined'};
$result_trees{'command_conditionals_user_defined'}{'contents'}[2]{'parent'} =
$result_trees{'command_conditionals_user_defined'};
$result_trees{'command_conditionals_user_defined'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'command_conditionals_user_defined'}{'contents'}[3];
$result_trees{'command_conditionals_user_defined'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'command_conditionals_user_defined'}{'contents'}[3]{'args'}[0];
Modified: trunk/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
===================================================================
--- trunk/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -63,15 +63,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -80,7 +72,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
@@ -92,10 +92,10 @@
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
-$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
-$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'empty_ifset_in_ifset_set'};
+$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}
= $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[0];
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'parent'} =
$result_trees{'empty_ifset_in_ifset_set'};
-$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[4] =
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
+$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[4]{'parent'} =
$result_trees{'empty_ifset_in_ifset_set'};
$result_texis{'empty_ifset_in_ifset_set'} = '
@set notset
Modified: trunk/tp/t/results/conditionals/end_ifset_in_format.pl
===================================================================
--- trunk/tp/t/results/conditionals/end_ifset_in_format.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/conditionals/end_ifset_in_format.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -68,15 +68,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -85,8 +77,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -123,15 +123,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -140,11 +132,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -201,20 +201,20 @@
$result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'end_ifset_in_format'}{'contents'}[3];
$result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'end_ifset_in_format'}{'contents'}[3];
$result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'end_ifset_in_format'}{'contents'}[3];
-$result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'end_ifset_in_format'}{'contents'}[3];
-$result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'end_ifset_in_format'};
+$result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'}
= $result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[0];
$result_trees{'end_ifset_in_format'}{'contents'}[3]{'parent'} =
$result_trees{'end_ifset_in_format'};
-$result_trees{'end_ifset_in_format'}{'contents'}[4] =
$result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'end_ifset_in_format'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'end_ifset_in_format'}{'contents'}[3];
+$result_trees{'end_ifset_in_format'}{'contents'}[4]{'parent'} =
$result_trees{'end_ifset_in_format'};
$result_trees{'end_ifset_in_format'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'end_ifset_in_format'}{'contents'}[5];
$result_trees{'end_ifset_in_format'}{'contents'}[5]{'parent'} =
$result_trees{'end_ifset_in_format'};
$result_trees{'end_ifset_in_format'}{'contents'}[6]{'parent'} =
$result_trees{'end_ifset_in_format'};
$result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'end_ifset_in_format'}{'contents'}[7];
$result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'end_ifset_in_format'}{'contents'}[7];
$result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[1]{'parent'} =
$result_trees{'end_ifset_in_format'}{'contents'}[7];
-$result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'end_ifset_in_format'}{'contents'}[7];
-$result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'end_ifset_in_format'};
+$result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'}
= $result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[0];
$result_trees{'end_ifset_in_format'}{'contents'}[7]{'parent'} =
$result_trees{'end_ifset_in_format'};
-$result_trees{'end_ifset_in_format'}{'contents'}[8] =
$result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'};
+$result_trees{'end_ifset_in_format'}{'contents'}[8]{'extra'}{'command'} =
$result_trees{'end_ifset_in_format'}{'contents'}[7];
+$result_trees{'end_ifset_in_format'}{'contents'}[8]{'parent'} =
$result_trees{'end_ifset_in_format'};
$result_trees{'end_ifset_in_format'}{'contents'}[9]{'parent'} =
$result_trees{'end_ifset_in_format'};
$result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0];
$result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0];
Modified: trunk/tp/t/results/conditionals/macro_in_ifset.pl
===================================================================
--- trunk/tp/t/results/conditionals/macro_in_ifset.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/conditionals/macro_in_ifset.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -37,16 +37,7 @@
],
'extra' => {
'arg_line' => ' truc {}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -55,11 +46,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -86,10 +85,9 @@
$result_trees{'macro_in_ifset'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'macro_in_ifset'}{'contents'}[1];
$result_trees{'macro_in_ifset'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_ifset'}{'contents'}[1];
$result_trees{'macro_in_ifset'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_ifset'}{'contents'}[1];
-$result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_ifset'}{'contents'}[1];
-$result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_ifset'};
$result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_ifset'};
-$result_trees{'macro_in_ifset'}{'contents'}[2] =
$result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_ifset'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'macro_in_ifset'}{'contents'}[1];
+$result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_ifset'};
$result_trees{'macro_in_ifset'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_ifset'};
$result_trees{'macro_in_ifset'}{'contents'}[4]{'parent'} =
$result_trees{'macro_in_ifset'};
$result_trees{'macro_in_ifset'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_ifset'}{'contents'}[5];
Modified: trunk/tp/t/results/conditionals/macro_in_ifset_set.pl
===================================================================
--- trunk/tp/t/results/conditionals/macro_in_ifset_set.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/conditionals/macro_in_ifset_set.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -67,16 +67,7 @@
],
'extra' => {
'arg_line' => ' truc {}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -85,11 +76,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -134,16 +133,7 @@
],
'extra' => {
'arg_line' => ' truc{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -152,11 +142,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -181,20 +179,18 @@
$result_trees{'macro_in_ifset_set'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[3];
$result_trees{'macro_in_ifset_set'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[3];
$result_trees{'macro_in_ifset_set'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[3];
-$result_trees{'macro_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_ifset_set'}{'contents'}[3];
-$result_trees{'macro_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_ifset_set'};
$result_trees{'macro_in_ifset_set'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_ifset_set'};
-$result_trees{'macro_in_ifset_set'}{'contents'}[4] =
$result_trees{'macro_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_ifset_set'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[3];
+$result_trees{'macro_in_ifset_set'}{'contents'}[4]{'parent'} =
$result_trees{'macro_in_ifset_set'};
$result_trees{'macro_in_ifset_set'}{'contents'}[5]{'parent'} =
$result_trees{'macro_in_ifset_set'};
$result_trees{'macro_in_ifset_set'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[6];
$result_trees{'macro_in_ifset_set'}{'contents'}[6]{'parent'} =
$result_trees{'macro_in_ifset_set'};
$result_trees{'macro_in_ifset_set'}{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[7];
$result_trees{'macro_in_ifset_set'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[7];
$result_trees{'macro_in_ifset_set'}{'contents'}[7]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[7];
-$result_trees{'macro_in_ifset_set'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_ifset_set'}{'contents'}[7];
-$result_trees{'macro_in_ifset_set'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_ifset_set'};
$result_trees{'macro_in_ifset_set'}{'contents'}[7]{'parent'} =
$result_trees{'macro_in_ifset_set'};
-$result_trees{'macro_in_ifset_set'}{'contents'}[8] =
$result_trees{'macro_in_ifset_set'}{'contents'}[7]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_ifset_set'}{'contents'}[8]{'extra'}{'command'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[7];
+$result_trees{'macro_in_ifset_set'}{'contents'}[8]{'parent'} =
$result_trees{'macro_in_ifset_set'};
$result_trees{'macro_in_ifset_set'}{'contents'}[9]{'parent'} =
$result_trees{'macro_in_ifset_set'};
$result_trees{'macro_in_ifset_set'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_ifset_set'}{'contents'}[10];
$result_trees{'macro_in_ifset_set'}{'contents'}[10]{'parent'} =
$result_trees{'macro_in_ifset_set'};
Modified: trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl
===================================================================
--- trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -79,16 +79,7 @@
],
'extra' => {
'arg_line' => ' conditionals{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -97,11 +88,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -326,10 +325,9 @@
$result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[6]{'parent'}
= $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
$result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[7]{'parent'}
= $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
$result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[8]{'parent'}
= $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
-$result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
-$result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_ifset_ifclear'};
$result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'parent'} =
$result_trees{'nested_ifset_ifclear'};
-$result_trees{'nested_ifset_ifclear'}{'contents'}[2] =
$result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'nested_ifset_ifclear'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'nested_ifset_ifclear'}{'contents'}[1];
+$result_trees{'nested_ifset_ifclear'}{'contents'}[2]{'parent'} =
$result_trees{'nested_ifset_ifclear'};
$result_trees{'nested_ifset_ifclear'}{'contents'}[3]{'parent'} =
$result_trees{'nested_ifset_ifclear'};
$result_trees{'nested_ifset_ifclear'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'nested_ifset_ifclear'}{'contents'}[4];
$result_trees{'nested_ifset_ifclear'}{'contents'}[4]{'args'}[1]{'parent'} =
$result_trees{'nested_ifset_ifclear'}{'contents'}[4];
Modified: trunk/tp/t/results/conditionals/nested_ignore.pl
===================================================================
--- trunk/tp/t/results/conditionals/nested_ignore.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/conditionals/nested_ignore.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -38,15 +38,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -55,11 +47,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -93,15 +93,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -110,11 +102,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -148,15 +148,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -165,7 +157,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
@@ -174,30 +174,30 @@
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[0];
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[0];
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[0];
-$result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_ignore'}{'contents'}[0];
-$result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_ignore'};
+$result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
$result_trees{'nested_ignore'}{'contents'}[0]{'parent'} =
$result_trees{'nested_ignore'};
-$result_trees{'nested_ignore'}{'contents'}[1] =
$result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'nested_ignore'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'nested_ignore'}{'contents'}[0];
+$result_trees{'nested_ignore'}{'contents'}[1]{'parent'} =
$result_trees{'nested_ignore'};
$result_trees{'nested_ignore'}{'contents'}[2]{'parent'} =
$result_trees{'nested_ignore'};
$result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'nested_ignore'}{'contents'}[3];
$result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[3];
$result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[3];
$result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[3];
$result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[3]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[3];
-$result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_ignore'}{'contents'}[3];
-$result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_ignore'};
+$result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'}
= $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[0];
$result_trees{'nested_ignore'}{'contents'}[3]{'parent'} =
$result_trees{'nested_ignore'};
-$result_trees{'nested_ignore'}{'contents'}[4] =
$result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'nested_ignore'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'nested_ignore'}{'contents'}[3];
+$result_trees{'nested_ignore'}{'contents'}[4]{'parent'} =
$result_trees{'nested_ignore'};
$result_trees{'nested_ignore'}{'contents'}[5]{'parent'} =
$result_trees{'nested_ignore'};
$result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'nested_ignore'}{'contents'}[6];
$result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[6];
$result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[6];
$result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[2]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[6];
$result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[3]{'parent'} =
$result_trees{'nested_ignore'}{'contents'}[6];
-$result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_ignore'}{'contents'}[6];
-$result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_ignore'};
+$result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'}
= $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[0];
$result_trees{'nested_ignore'}{'contents'}[6]{'parent'} =
$result_trees{'nested_ignore'};
-$result_trees{'nested_ignore'}{'contents'}[7] =
$result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'};
+$result_trees{'nested_ignore'}{'contents'}[7]{'extra'}{'command'} =
$result_trees{'nested_ignore'}{'contents'}[6];
+$result_trees{'nested_ignore'}{'contents'}[7]{'parent'} =
$result_trees{'nested_ignore'};
$result_texis{'nested_ignore'} = '@ignore
@ignore
Modified: trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_raw.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/converters_tests/at_commands_in_raw.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -71,16 +71,7 @@
],
'extra' => {
'arg_line' => ' othermacro{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -89,11 +80,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -1297,16 +1296,7 @@
],
'extra' => {
'arg_line' => ' mymacro{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1315,11 +1305,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -1354,15 +1352,6 @@
',
'args_index' => {
'arg' => 0
- },
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
}
},
'line_nr' => {
@@ -1372,11 +1361,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -2001,10 +1998,9 @@
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'at_commands_in_raw'}{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[2] =
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'at_commands_in_raw'}{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'at_commands_in_raw'}{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4];
@@ -2219,19 +2215,17 @@
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'extra'}{'spaces_after_command'}{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[23]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'extra'}{'spaces_after_command'};
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[23]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[23]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[24]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'args'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'extra'}{'spaces_after_command'}{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[26]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'extra'}{'spaces_after_command'};
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[26]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[26]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[27]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
Modified: trunk/tp/t/results/coverage/symbol_after_block.pl
===================================================================
--- trunk/tp/t/results/coverage/symbol_after_block.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/coverage/symbol_after_block.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -216,14 +216,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -269,14 +262,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1920,8 +1906,7 @@
$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[6];
$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[6];
$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[6];
-$result_trees{'symbol_after_block'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[6];
-$result_trees{'symbol_after_block'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[6]{'extra'}{'spaces_after_command'}
= $result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[6]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[7];
$result_trees{'symbol_after_block'}{'contents'}[7]{'parent'} =
$result_trees{'symbol_after_block'};
@@ -1929,8 +1914,7 @@
$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[9];
$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[9];
$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[9];
-$result_trees{'symbol_after_block'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[9];
-$result_trees{'symbol_after_block'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[9]{'extra'}{'spaces_after_command'}
= $result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[9]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[10];
$result_trees{'symbol_after_block'}{'contents'}[10]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[10];
Modified: trunk/tp/t/results/coverage_braces/test_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/test_image.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/coverage_braces/test_image.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -45,16 +45,7 @@
],
'extra' => {
'arg_line' => ' files-char
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -63,11 +54,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -3407,10 +3406,9 @@
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'test_image'}{'contents'}[0];
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'test_image'}{'contents'}[0];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[1] =
$result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'test_image'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
+$result_trees{'test_image'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'test_image'}{'contents'}[0];
$result_trees{'test_image'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'test_image'}{'contents'}[0];
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[3];
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'test_image'}{'contents'}[0]{'contents'}[3];
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
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -193,15 +193,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -210,7 +202,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'extra' => {
'cell_number' => 1,
@@ -434,10 +434,10 @@
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
Modified: trunk/tp/t/results/html_tests/xml_protected_in_verb.pl
===================================================================
--- trunk/tp/t/results/html_tests/xml_protected_in_verb.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/html_tests/xml_protected_in_verb.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -27,15 +27,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -44,11 +36,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -137,10 +137,10 @@
$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'xml_protected_in_verb'}{'contents'}[0];
$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'xml_protected_in_verb'}{'contents'}[0];
$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'xml_protected_in_verb'}{'contents'}[0];
-$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'xml_protected_in_verb'}{'contents'}[0];
-$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'xml_protected_in_verb'};
+$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0];
$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'parent'} =
$result_trees{'xml_protected_in_verb'};
-$result_trees{'xml_protected_in_verb'}{'contents'}[1] =
$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'xml_protected_in_verb'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'xml_protected_in_verb'}{'contents'}[0];
+$result_trees{'xml_protected_in_verb'}{'contents'}[1]{'parent'} =
$result_trees{'xml_protected_in_verb'};
$result_trees{'xml_protected_in_verb'}{'contents'}[2]{'parent'} =
$result_trees{'xml_protected_in_verb'};
$result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0];
$result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0];
Modified: trunk/tp/t/results/include/cpp_lines.pl
===================================================================
--- trunk/tp/t/results/include/cpp_lines.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/include/cpp_lines.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -211,15 +211,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => 'g_f',
@@ -228,11 +220,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -259,16 +259,7 @@
],
'extra' => {
'arg_line' => ' macr
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => 'g_f',
@@ -277,11 +268,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -661,18 +660,17 @@
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4] =
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4]{'extra'}{'command'} =
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7] =
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command'};
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'extra'}{'command'} =
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0];
Modified: trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
===================================================================
--- trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -33,16 +33,7 @@
],
'extra' => {
'arg_line' => ' begin-file
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -51,11 +42,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -135,16 +134,7 @@
],
'extra' => {
'arg_line' => ' latin1
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -153,11 +143,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -239,16 +237,7 @@
],
'extra' => {
'arg_line' => ' multiinclude
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -257,11 +246,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -376,16 +373,7 @@
],
'extra' => {
'arg_line' => ' themacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => 't/include_dir/macro_included.texi',
@@ -394,8 +382,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -533,10 +529,9 @@
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[1]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -551,10 +546,9 @@
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6]{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[7]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0];
@@ -569,10 +563,9 @@
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[11]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[11]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[12]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'};
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1];
@@ -593,10 +586,9 @@
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
Modified: trunk/tp/t/results/include/macro_definition_in_include.pl
===================================================================
--- trunk/tp/t/results/include/macro_definition_in_include.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/include/macro_definition_in_include.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' themacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => 't/include_dir/macro_included.texi',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -78,10 +77,9 @@
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_definition_in_include'}{'contents'}[0];
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_definition_in_include'}{'contents'}[0];
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_definition_in_include'}{'contents'}[0];
-$result_trees{'macro_definition_in_include'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_definition_in_include'}{'contents'}[0];
-$result_trees{'macro_definition_in_include'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_definition_in_include'};
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'parent'} =
$result_trees{'macro_definition_in_include'};
-$result_trees{'macro_definition_in_include'}{'contents'}[1] =
$result_trees{'macro_definition_in_include'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_definition_in_include'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_definition_in_include'}{'contents'}[0];
+$result_trees{'macro_definition_in_include'}{'contents'}[1]{'parent'} =
$result_trees{'macro_definition_in_include'};
$result_trees{'macro_definition_in_include'}{'contents'}[2]{'parent'} =
$result_trees{'macro_definition_in_include'};
$result_trees{'macro_definition_in_include'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_definition_in_include'}{'contents'}[3];
$result_trees{'macro_definition_in_include'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'macro_definition_in_include'}{'contents'}[3];
Modified: trunk/tp/t/results/include/macro_in_early_commands.pl
===================================================================
--- trunk/tp/t/results/include/macro_in_early_commands.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/include/macro_in_early_commands.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -33,16 +33,7 @@
],
'extra' => {
'arg_line' => ' begin-file
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -51,8 +42,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -81,16 +80,7 @@
],
'extra' => {
'arg_line' => ' end-file-name {ext}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -99,11 +89,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -175,16 +173,7 @@
],
'extra' => {
'arg_line' => ' latin1
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -193,11 +182,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -224,16 +221,7 @@
],
'extra' => {
'arg_line' => ' documentencoding-command
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -242,11 +230,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -326,16 +322,7 @@
],
'extra' => {
'arg_line' => ' multiinclude
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -344,11 +331,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -463,16 +458,7 @@
],
'extra' => {
'arg_line' => ' themacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => 't/include_dir/macro_included.texi',
@@ -481,8 +467,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -569,18 +563,16 @@
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1] =
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3] =
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0];
@@ -593,18 +585,16 @@
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[8] =
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[8]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[8]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[9]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11] =
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[12]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
@@ -618,10 +608,9 @@
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[2]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[16] =
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[16]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[17]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_early_commands'};
$result_trees{'macro_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[1];
@@ -642,10 +631,9 @@
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2];
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2];
-$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2] =
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
+$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2];
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3];
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2];
$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'macro_in_early_commands'}{'contents'}[2];
Modified: trunk/tp/t/results/info_tests/def_in_copying.pl
===================================================================
--- trunk/tp/t/results/info_tests/def_in_copying.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/info_tests/def_in_copying.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -51,16 +51,7 @@
],
'extra' => {
'arg_line' => ' mymacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -69,11 +60,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -822,10 +821,9 @@
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
-$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
-$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'def_in_copying'}{'contents'}[0];
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'def_in_copying'}{'contents'}[0];
-$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[1] =
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
+$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'def_in_copying'}{'contents'}[0];
$result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'def_in_copying'}{'contents'}[0];
$result_trees{'def_in_copying'}{'contents'}[0]{'parent'} =
$result_trees{'def_in_copying'};
$result_trees{'def_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'def_in_copying'}{'contents'}[1];
Modified: trunk/tp/t/results/invalid_nestings/ignore_in_xref.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/ignore_in_xref.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/invalid_nestings/ignore_in_xref.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -95,15 +95,7 @@
],
'extra' => {
'invalid_nesting' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -112,7 +104,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'parent' => {},
'type' => 'brace_command_arg'
@@ -192,14 +192,14 @@
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
+$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
= $result_trees{'ignore_in_xref'}{'contents'}[1];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1];
Modified: trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -115,15 +115,7 @@
],
'extra' => {
'invalid_nesting' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -132,11 +124,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_spaces_before_paragraph'
},
{
@@ -190,10 +190,10 @@
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
-$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
-$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_in_ref'}{'contents'}[1];
+$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'verbatim_in_ref'}{'contents'}[1];
-$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[3] =
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
+$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'verbatim_in_ref'}{'contents'}[1];
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'verbatim_in_ref'}{'contents'}[1];
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5];
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'verbatim_in_ref'}{'contents'}[1];
Modified: trunk/tp/t/results/macro/arg_body_expansion_order.pl
===================================================================
--- trunk/tp/t/results/macro/arg_body_expansion_order.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/arg_body_expansion_order.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -37,16 +37,7 @@
],
'extra' => {
'arg_line' => ' othermacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -55,11 +46,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -100,22 +99,21 @@
],
'extra' => {
'arg_line' => ' othermacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
'text' => '\\arg\\',
'type' => 'raw'
},
@@ -128,16 +126,7 @@
],
'extra' => {
'arg_line' => ' redefineothermacro {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -146,11 +135,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -195,16 +192,7 @@
],
'extra' => {
'arg_line' => ' othermacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -213,8 +201,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -232,36 +228,32 @@
$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[1];
$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[1];
$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[1];
-$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[1];
-$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'parent'} =
$result_trees{'arg_body_expansion_order'};
-$result_trees{'arg_body_expansion_order'}{'contents'}[2] =
$result_trees{'arg_body_expansion_order'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'arg_body_expansion_order'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'arg_body_expansion_order'}{'contents'}[1];
+$result_trees{'arg_body_expansion_order'}{'contents'}[2]{'parent'} =
$result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[3]{'parent'} =
$result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'args'}[1]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
-$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
-$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
-$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[2] =
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
+$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[3]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[4]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
-$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[4];
-$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'parent'} =
$result_trees{'arg_body_expansion_order'};
-$result_trees{'arg_body_expansion_order'}{'contents'}[5] =
$result_trees{'arg_body_expansion_order'}{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'arg_body_expansion_order'}{'contents'}[5]{'extra'}{'command'} =
$result_trees{'arg_body_expansion_order'}{'contents'}[4];
+$result_trees{'arg_body_expansion_order'}{'contents'}[5]{'parent'} =
$result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[6]{'parent'} =
$result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[7]{'args'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[7];
$result_trees{'arg_body_expansion_order'}{'contents'}[7]{'parent'} =
$result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'args'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[8];
$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'contents'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[8];
$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'contents'}[1]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[8];
-$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[8];
-$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'parent'} =
$result_trees{'arg_body_expansion_order'};
-$result_trees{'arg_body_expansion_order'}{'contents'}[9] =
$result_trees{'arg_body_expansion_order'}{'contents'}[8]{'extra'}{'spaces_after_command'};
+$result_trees{'arg_body_expansion_order'}{'contents'}[9]{'extra'}{'command'} =
$result_trees{'arg_body_expansion_order'}{'contents'}[8];
+$result_trees{'arg_body_expansion_order'}{'contents'}[9]{'parent'} =
$result_trees{'arg_body_expansion_order'};
$result_trees{'arg_body_expansion_order'}{'contents'}[10]{'contents'}[0]{'parent'}
= $result_trees{'arg_body_expansion_order'}{'contents'}[10];
$result_trees{'arg_body_expansion_order'}{'contents'}[10]{'parent'} =
$result_trees{'arg_body_expansion_order'};
Modified: trunk/tp/t/results/macro/arg_not_closed.pl
===================================================================
--- trunk/tp/t/results/macro/arg_not_closed.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/arg_not_closed.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' foo {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -79,10 +78,9 @@
$result_trees{'arg_not_closed'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'arg_not_closed'}{'contents'}[0];
$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'arg_not_closed'}{'contents'}[0];
$result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'arg_not_closed'}{'contents'}[0];
-$result_trees{'arg_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'arg_not_closed'}{'contents'}[0];
-$result_trees{'arg_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'arg_not_closed'};
$result_trees{'arg_not_closed'}{'contents'}[0]{'parent'} =
$result_trees{'arg_not_closed'};
-$result_trees{'arg_not_closed'}{'contents'}[1] =
$result_trees{'arg_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'arg_not_closed'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'arg_not_closed'}{'contents'}[0];
+$result_trees{'arg_not_closed'}{'contents'}[1]{'parent'} =
$result_trees{'arg_not_closed'};
$result_trees{'arg_not_closed'}{'contents'}[2]{'parent'} =
$result_trees{'arg_not_closed'};
$result_trees{'arg_not_closed'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'arg_not_closed'}{'contents'}[3];
$result_trees{'arg_not_closed'}{'contents'}[3]{'parent'} =
$result_trees{'arg_not_closed'};
Modified: trunk/tp/t/results/macro/backslash_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/backslash_in_arg.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/backslash_in_arg.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -76,16 +76,7 @@
],
'extra' => {
'arg_line' => ' funindex {TEXT}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -94,11 +85,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -393,10 +392,9 @@
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'backslash_in_arg'}{'contents'}[1];
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'backslash_in_arg'}{'contents'}[1];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2] =
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'backslash_in_arg'}{'contents'}[1];
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'backslash_in_arg'}{'contents'}[1];
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4];
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0];
Modified: trunk/tp/t/results/macro/bad_argument.pl
===================================================================
--- trunk/tp/t/results/macro/bad_argument.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/bad_argument.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -25,16 +25,7 @@
'extra' => {
'arg_line' => '
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -43,11 +34,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -75,16 +74,7 @@
'extra' => {
'arg_line' => ' abar aaa
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -93,11 +83,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -130,16 +128,7 @@
'extra' => {
'arg_line' => ' aftername {ggg} more
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -148,11 +137,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -173,16 +170,7 @@
'extra' => {
'arg_line' => ' #badname
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -191,40 +179,44 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[0];
$result_trees{'bad_argument'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[0];
-$result_trees{'bad_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_argument'}{'contents'}[0];
-$result_trees{'bad_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[0]{'parent'} =
$result_trees{'bad_argument'};
-$result_trees{'bad_argument'}{'contents'}[1] =
$result_trees{'bad_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'bad_argument'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'bad_argument'}{'contents'}[0];
+$result_trees{'bad_argument'}{'contents'}[1]{'parent'} =
$result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[2]{'parent'} =
$result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[3];
$result_trees{'bad_argument'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[3];
$result_trees{'bad_argument'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[3];
-$result_trees{'bad_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_argument'}{'contents'}[3];
-$result_trees{'bad_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[3]{'parent'} =
$result_trees{'bad_argument'};
-$result_trees{'bad_argument'}{'contents'}[4] =
$result_trees{'bad_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'bad_argument'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'bad_argument'}{'contents'}[3];
+$result_trees{'bad_argument'}{'contents'}[4]{'parent'} =
$result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[5]{'parent'} =
$result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[6];
$result_trees{'bad_argument'}{'contents'}[6]{'args'}[1]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[6];
$result_trees{'bad_argument'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[6];
$result_trees{'bad_argument'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[6];
-$result_trees{'bad_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_argument'}{'contents'}[6];
-$result_trees{'bad_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[6]{'parent'} =
$result_trees{'bad_argument'};
-$result_trees{'bad_argument'}{'contents'}[7] =
$result_trees{'bad_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'};
+$result_trees{'bad_argument'}{'contents'}[7]{'extra'}{'command'} =
$result_trees{'bad_argument'}{'contents'}[6];
+$result_trees{'bad_argument'}{'contents'}[7]{'parent'} =
$result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[8]{'parent'} =
$result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[9]{'contents'}[0]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[9];
$result_trees{'bad_argument'}{'contents'}[9]{'contents'}[1]{'parent'} =
$result_trees{'bad_argument'}{'contents'}[9];
-$result_trees{'bad_argument'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_argument'}{'contents'}[9];
-$result_trees{'bad_argument'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_argument'};
$result_trees{'bad_argument'}{'contents'}[9]{'parent'} =
$result_trees{'bad_argument'};
-$result_trees{'bad_argument'}{'contents'}[10] =
$result_trees{'bad_argument'}{'contents'}[9]{'extra'}{'spaces_after_command'};
+$result_trees{'bad_argument'}{'contents'}[10]{'extra'}{'command'} =
$result_trees{'bad_argument'}{'contents'}[9];
+$result_trees{'bad_argument'}{'contents'}[10]{'parent'} =
$result_trees{'bad_argument'};
$result_texis{'bad_argument'} = '@macro
in macro
Modified: trunk/tp/t/results/macro/bad_formal_arg.pl
===================================================================
--- trunk/tp/t/results/macro/bad_formal_arg.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/bad_formal_arg.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -48,16 +48,7 @@
'extra' => {
'arg_line' => ' bad { , not_empty}
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -66,11 +57,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -108,16 +107,7 @@
'extra' => {
'arg_line' => ' badspace{first, in 2arg}
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -126,11 +116,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -171,26 +169,11 @@
],
'extra' => {
'arg_line' => ' foo {? aaa}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'parent' => {}
},
- {}
- ],
- 'extra' => {
- 'arg_line' => ' abar {:::}
-',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
+ {
'extra' => {
'command' => {}
},
@@ -199,6 +182,11 @@
',
'type' => 'empty_line_after_command'
}
+ ],
+ 'extra' => {
+ 'arg_line' => ' abar {:::}
+',
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -207,7 +195,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
@@ -217,34 +213,30 @@
$result_trees{'bad_formal_arg'}{'contents'}[1]{'args'}[2]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[1];
$result_trees{'bad_formal_arg'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[1];
$result_trees{'bad_formal_arg'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[1];
-$result_trees{'bad_formal_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_formal_arg'}{'contents'}[1];
-$result_trees{'bad_formal_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_formal_arg'};
$result_trees{'bad_formal_arg'}{'contents'}[1]{'parent'} =
$result_trees{'bad_formal_arg'};
-$result_trees{'bad_formal_arg'}{'contents'}[2] =
$result_trees{'bad_formal_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'bad_formal_arg'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'bad_formal_arg'}{'contents'}[1];
+$result_trees{'bad_formal_arg'}{'contents'}[2]{'parent'} =
$result_trees{'bad_formal_arg'};
$result_trees{'bad_formal_arg'}{'contents'}[3]{'parent'} =
$result_trees{'bad_formal_arg'};
$result_trees{'bad_formal_arg'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[4];
$result_trees{'bad_formal_arg'}{'contents'}[4]{'args'}[1]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[4];
$result_trees{'bad_formal_arg'}{'contents'}[4]{'args'}[2]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[4];
$result_trees{'bad_formal_arg'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[4];
$result_trees{'bad_formal_arg'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[4];
-$result_trees{'bad_formal_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_formal_arg'}{'contents'}[4];
-$result_trees{'bad_formal_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_formal_arg'};
$result_trees{'bad_formal_arg'}{'contents'}[4]{'parent'} =
$result_trees{'bad_formal_arg'};
-$result_trees{'bad_formal_arg'}{'contents'}[5] =
$result_trees{'bad_formal_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'bad_formal_arg'}{'contents'}[5]{'extra'}{'command'} =
$result_trees{'bad_formal_arg'}{'contents'}[4];
+$result_trees{'bad_formal_arg'}{'contents'}[5]{'parent'} =
$result_trees{'bad_formal_arg'};
$result_trees{'bad_formal_arg'}{'contents'}[6]{'parent'} =
$result_trees{'bad_formal_arg'};
$result_trees{'bad_formal_arg'}{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[7];
$result_trees{'bad_formal_arg'}{'contents'}[7]{'args'}[1]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[7];
$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[7];
$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
-$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
-$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_formal_arg'}{'contents'}[7];
$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[7];
-$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[2] =
$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_after_command'};
-$result_trees{'bad_formal_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_formal_arg'}{'contents'}[7];
-$result_trees{'bad_formal_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_formal_arg'};
+$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
+$result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[2]{'parent'} =
$result_trees{'bad_formal_arg'}{'contents'}[7];
$result_trees{'bad_formal_arg'}{'contents'}[7]{'parent'} =
$result_trees{'bad_formal_arg'};
-$result_trees{'bad_formal_arg'}{'contents'}[8] =
$result_trees{'bad_formal_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'};
+$result_trees{'bad_formal_arg'}{'contents'}[8]{'extra'}{'command'} =
$result_trees{'bad_formal_arg'}{'contents'}[7];
+$result_trees{'bad_formal_arg'}{'contents'}[8]{'parent'} =
$result_trees{'bad_formal_arg'};
$result_texis{'bad_formal_arg'} = '
@macro bad { , not_empty}
Modified: trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl
===================================================================
--- trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -32,16 +32,7 @@
'extra' => {
'arg_line' => ' the_macro {arg1, arg2}
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -50,17 +41,24 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
-$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
-$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'bad_macro_name_with_underscore'};
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'parent'} =
$result_trees{'bad_macro_name_with_underscore'};
-$result_trees{'bad_macro_name_with_underscore'}{'contents'}[1] =
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'bad_macro_name_with_underscore'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
+$result_trees{'bad_macro_name_with_underscore'}{'contents'}[1]{'parent'} =
$result_trees{'bad_macro_name_with_underscore'};
$result_texis{'bad_macro_name_with_underscore'} = '@macro the_macro {arg1,
arg2}
In macro
Modified: trunk/tp/t/results/macro/complete_macro_for_end.pl
===================================================================
--- trunk/tp/t/results/macro/complete_macro_for_end.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/complete_macro_for_end.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' theend
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -121,10 +120,9 @@
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'complete_macro_for_end'}{'contents'}[0];
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'complete_macro_for_end'}{'contents'}[0];
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'complete_macro_for_end'}{'contents'}[0];
-$result_trees{'complete_macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'complete_macro_for_end'}{'contents'}[0];
-$result_trees{'complete_macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'complete_macro_for_end'};
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'parent'} =
$result_trees{'complete_macro_for_end'};
-$result_trees{'complete_macro_for_end'}{'contents'}[1] =
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'complete_macro_for_end'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'complete_macro_for_end'}{'contents'}[0];
+$result_trees{'complete_macro_for_end'}{'contents'}[1]{'parent'} =
$result_trees{'complete_macro_for_end'};
$result_trees{'complete_macro_for_end'}{'contents'}[2]{'parent'} =
$result_trees{'complete_macro_for_end'};
$result_trees{'complete_macro_for_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'complete_macro_for_end'}{'contents'}[3];
$result_trees{'complete_macro_for_end'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'complete_macro_for_end'}{'contents'}[3];
Modified: trunk/tp/t/results/macro/complex_argument.pl
===================================================================
--- trunk/tp/t/results/macro/complex_argument.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/complex_argument.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' macrotwo{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -103,16 +102,7 @@
],
'extra' => {
'arg_line' => ' macrofour {}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -121,11 +111,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -168,16 +166,7 @@
],
'extra' => {
'arg_line' => ' macrothree{text, arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -186,11 +175,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -375,15 +372,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -392,8 +381,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'cmdname' => 'ignore',
'contents' => [
{
@@ -418,15 +415,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -435,8 +424,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -465,16 +462,7 @@
],
'extra' => {
'arg_line' => ' macroseven {truc}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -483,8 +471,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -589,10 +585,9 @@
$result_trees{'complex_argument'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[0];
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[0];
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'complex_argument'}{'contents'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[0]{'parent'} =
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[1] =
$result_trees{'complex_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'complex_argument'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'complex_argument'}{'contents'}[0];
+$result_trees{'complex_argument'}{'contents'}[1]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[2]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[3];
$result_trees{'complex_argument'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[3];
@@ -600,10 +595,9 @@
$result_trees{'complex_argument'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[3];
$result_trees{'complex_argument'}{'contents'}[3]{'contents'}[3]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[3];
$result_trees{'complex_argument'}{'contents'}[3]{'contents'}[4]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[3];
-$result_trees{'complex_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'complex_argument'}{'contents'}[3];
-$result_trees{'complex_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[3]{'parent'} =
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[4] =
$result_trees{'complex_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'complex_argument'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'complex_argument'}{'contents'}[3];
+$result_trees{'complex_argument'}{'contents'}[4]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[5]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[6];
$result_trees{'complex_argument'}{'contents'}[6]{'args'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[6];
@@ -611,10 +605,9 @@
$result_trees{'complex_argument'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[6];
$result_trees{'complex_argument'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[6];
$result_trees{'complex_argument'}{'contents'}[6]{'contents'}[2]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[6];
-$result_trees{'complex_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'complex_argument'}{'contents'}[6];
-$result_trees{'complex_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[6]{'parent'} =
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[7] =
$result_trees{'complex_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'};
+$result_trees{'complex_argument'}{'contents'}[7]{'extra'}{'command'} =
$result_trees{'complex_argument'}{'contents'}[6];
+$result_trees{'complex_argument'}{'contents'}[7]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[8]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0];
$result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0];
@@ -647,26 +640,25 @@
$result_trees{'complex_argument'}{'contents'}[10]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'complex_argument'}{'contents'}[10];
$result_trees{'complex_argument'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[10];
$result_trees{'complex_argument'}{'contents'}[10]{'contents'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[10];
-$result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'complex_argument'}{'contents'}[10];
-$result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'complex_argument'};
+$result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'}
= $result_trees{'complex_argument'}{'contents'}[10]{'contents'}[0];
$result_trees{'complex_argument'}{'contents'}[10]{'parent'} =
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[11] =
$result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'};
+$result_trees{'complex_argument'}{'contents'}[11]{'extra'}{'command'} =
$result_trees{'complex_argument'}{'contents'}[10];
+$result_trees{'complex_argument'}{'contents'}[11]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'complex_argument'}{'contents'}[12];
$result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[12];
$result_trees{'complex_argument'}{'contents'}[12]{'contents'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[12];
$result_trees{'complex_argument'}{'contents'}[12]{'contents'}[2]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[12];
-$result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'complex_argument'}{'contents'}[12];
-$result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'complex_argument'};
+$result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'}
= $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0];
$result_trees{'complex_argument'}{'contents'}[12]{'parent'} =
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[13] =
$result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'};
+$result_trees{'complex_argument'}{'contents'}[13]{'extra'}{'command'} =
$result_trees{'complex_argument'}{'contents'}[12];
+$result_trees{'complex_argument'}{'contents'}[13]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[14]{'args'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[14];
$result_trees{'complex_argument'}{'contents'}[14]{'args'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[14];
$result_trees{'complex_argument'}{'contents'}[14]{'contents'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[14];
$result_trees{'complex_argument'}{'contents'}[14]{'contents'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[14];
-$result_trees{'complex_argument'}{'contents'}[14]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'complex_argument'}{'contents'}[14];
-$result_trees{'complex_argument'}{'contents'}[14]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[14]{'parent'} =
$result_trees{'complex_argument'};
-$result_trees{'complex_argument'}{'contents'}[15] =
$result_trees{'complex_argument'}{'contents'}[14]{'extra'}{'spaces_after_command'};
+$result_trees{'complex_argument'}{'contents'}[15]{'extra'}{'command'} =
$result_trees{'complex_argument'}{'contents'}[14];
+$result_trees{'complex_argument'}{'contents'}[15]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[16]{'contents'}[0]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[16];
$result_trees{'complex_argument'}{'contents'}[16]{'contents'}[1]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[16];
$result_trees{'complex_argument'}{'contents'}[16]{'contents'}[2]{'parent'} =
$result_trees{'complex_argument'}{'contents'}[16];
Modified: trunk/tp/t/results/macro/double_macro_definition.pl
===================================================================
--- trunk/tp/t/results/macro/double_macro_definition.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/double_macro_definition.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -19,16 +19,7 @@
'contents' => [],
'extra' => {
'arg_line' => ' foo
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -37,11 +28,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -56,16 +55,7 @@
'contents' => [],
'extra' => {
'arg_line' => ' foo
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -74,21 +64,27 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
$result_trees{'double_macro_definition'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'double_macro_definition'}{'contents'}[0];
-$result_trees{'double_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'double_macro_definition'}{'contents'}[0];
-$result_trees{'double_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'double_macro_definition'};
$result_trees{'double_macro_definition'}{'contents'}[0]{'parent'} =
$result_trees{'double_macro_definition'};
-$result_trees{'double_macro_definition'}{'contents'}[1] =
$result_trees{'double_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'double_macro_definition'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'double_macro_definition'}{'contents'}[0];
+$result_trees{'double_macro_definition'}{'contents'}[1]{'parent'} =
$result_trees{'double_macro_definition'};
$result_trees{'double_macro_definition'}{'contents'}[2]{'parent'} =
$result_trees{'double_macro_definition'};
$result_trees{'double_macro_definition'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'double_macro_definition'}{'contents'}[3];
-$result_trees{'double_macro_definition'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'double_macro_definition'}{'contents'}[3];
-$result_trees{'double_macro_definition'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'double_macro_definition'};
$result_trees{'double_macro_definition'}{'contents'}[3]{'parent'} =
$result_trees{'double_macro_definition'};
-$result_trees{'double_macro_definition'}{'contents'}[4] =
$result_trees{'double_macro_definition'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'double_macro_definition'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'double_macro_definition'}{'contents'}[3];
+$result_trees{'double_macro_definition'}{'contents'}[4]{'parent'} =
$result_trees{'double_macro_definition'};
$result_texis{'double_macro_definition'} = '@macro foo
@end macro
Modified: trunk/tp/t/results/macro/double_recursive_macro_call.pl
===================================================================
--- trunk/tp/t/results/macro/double_recursive_macro_call.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/double_recursive_macro_call.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -42,16 +42,7 @@
],
'extra' => {
'arg_line' => ' macone {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -60,11 +51,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -96,16 +95,7 @@
],
'extra' => {
'arg_line' => ' mactwo{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -114,11 +104,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -135,19 +133,17 @@
$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[1];
$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[1];
$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[1];
-$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[1];
-$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'double_recursive_macro_call'};
$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'parent'} =
$result_trees{'double_recursive_macro_call'};
-$result_trees{'double_recursive_macro_call'}{'contents'}[2] =
$result_trees{'double_recursive_macro_call'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'double_recursive_macro_call'}{'contents'}[2]{'extra'}{'command'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[1];
+$result_trees{'double_recursive_macro_call'}{'contents'}[2]{'parent'} =
$result_trees{'double_recursive_macro_call'};
$result_trees{'double_recursive_macro_call'}{'contents'}[3]{'parent'} =
$result_trees{'double_recursive_macro_call'};
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[4];
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'args'}[1]{'parent'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[4];
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[4];
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[4];
-$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[4];
-$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'double_recursive_macro_call'};
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'parent'} =
$result_trees{'double_recursive_macro_call'};
-$result_trees{'double_recursive_macro_call'}{'contents'}[5] =
$result_trees{'double_recursive_macro_call'}{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'double_recursive_macro_call'}{'contents'}[5]{'extra'}{'command'}
= $result_trees{'double_recursive_macro_call'}{'contents'}[4];
+$result_trees{'double_recursive_macro_call'}{'contents'}[5]{'parent'} =
$result_trees{'double_recursive_macro_call'};
$result_trees{'double_recursive_macro_call'}{'contents'}[6]{'parent'} =
$result_trees{'double_recursive_macro_call'};
$result_trees{'double_recursive_macro_call'}{'contents'}[7]{'parent'} =
$result_trees{'double_recursive_macro_call'};
Modified: trunk/tp/t/results/macro/empty_end.pl
===================================================================
--- trunk/tp/t/results/macro/empty_end.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/empty_end.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -36,15 +36,7 @@
],
'extra' => {
'arg_line' => ' foo {aaa, }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -53,7 +45,14 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
@@ -61,10 +60,9 @@
$result_trees{'empty_end'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'empty_end'}{'contents'}[0];
$result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'empty_end'}{'contents'}[0];
$result_trees{'empty_end'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'empty_end'}{'contents'}[0];
-$result_trees{'empty_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'empty_end'}{'contents'}[0];
-$result_trees{'empty_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'empty_end'};
$result_trees{'empty_end'}{'contents'}[0]{'parent'} =
$result_trees{'empty_end'};
-$result_trees{'empty_end'}{'contents'}[1] =
$result_trees{'empty_end'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'empty_end'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'empty_end'}{'contents'}[0];
+$result_trees{'empty_end'}{'contents'}[1]{'parent'} =
$result_trees{'empty_end'};
$result_texis{'empty_end'} = '@macro foo {aaa, }
in foo
Modified: trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl
===================================================================
--- trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -19,16 +19,7 @@
'contents' => [],
'extra' => {
'arg_line' => ' texnl{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -37,11 +28,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -78,16 +77,7 @@
'contents' => [],
'extra' => {
'arg_line' => ' texnltwo
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -96,11 +86,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -118,20 +116,18 @@
'type' => 'text_root'
};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
-$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
-$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
-$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1] =
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[2]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[3]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[4];
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[4]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[5]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
-$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
-$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
-$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7] =
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'extra'}{'spaces_after_command'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7]{'extra'}{'command'}
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[8]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9]{'contents'}[0]{'parent'}
= $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9];
$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9]{'parent'} =
$result_trees{'empty_macro_in_text_no_arg'};
Modified: trunk/tp/t/results/macro/empty_macro_no_arg.pl
===================================================================
--- trunk/tp/t/results/macro/empty_macro_no_arg.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/empty_macro_no_arg.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -19,16 +19,7 @@
'contents' => [],
'extra' => {
'arg_line' => ' foo
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -37,11 +28,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -66,10 +65,9 @@
'type' => 'text_root'
};
$result_trees{'empty_macro_no_arg'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'empty_macro_no_arg'}{'contents'}[0];
-$result_trees{'empty_macro_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'empty_macro_no_arg'}{'contents'}[0];
-$result_trees{'empty_macro_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'empty_macro_no_arg'};
$result_trees{'empty_macro_no_arg'}{'contents'}[0]{'parent'} =
$result_trees{'empty_macro_no_arg'};
-$result_trees{'empty_macro_no_arg'}{'contents'}[1] =
$result_trees{'empty_macro_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'empty_macro_no_arg'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'empty_macro_no_arg'}{'contents'}[0];
+$result_trees{'empty_macro_no_arg'}{'contents'}[1]{'parent'} =
$result_trees{'empty_macro_no_arg'};
$result_trees{'empty_macro_no_arg'}{'contents'}[2]{'parent'} =
$result_trees{'empty_macro_no_arg'};
$result_trees{'empty_macro_no_arg'}{'contents'}[3]{'parent'} =
$result_trees{'empty_macro_no_arg'};
$result_trees{'empty_macro_no_arg'}{'contents'}[4]{'parent'} =
$result_trees{'empty_macro_no_arg'};
Modified: trunk/tp/t/results/macro/expand_two_same.pl
===================================================================
--- trunk/tp/t/results/macro/expand_two_same.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/expand_two_same.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -42,16 +42,7 @@
],
'extra' => {
'arg_line' => ' macrotwo { arg }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -60,8 +51,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -186,10 +185,9 @@
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[0];
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[0];
$result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[0];
-$result_trees{'expand_two_same'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'expand_two_same'}{'contents'}[0];
-$result_trees{'expand_two_same'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'expand_two_same'};
$result_trees{'expand_two_same'}{'contents'}[0]{'parent'} =
$result_trees{'expand_two_same'};
-$result_trees{'expand_two_same'}{'contents'}[1] =
$result_trees{'expand_two_same'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'expand_two_same'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'expand_two_same'}{'contents'}[0];
+$result_trees{'expand_two_same'}{'contents'}[1]{'parent'} =
$result_trees{'expand_two_same'};
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[2];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[2];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2]{'args'}[0];
Modified: trunk/tp/t/results/macro/expansion_order.pl
===================================================================
--- trunk/tp/t/results/macro/expansion_order.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/expansion_order.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' bidule{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -91,16 +90,7 @@
],
'extra' => {
'arg_line' => ' machin
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -109,11 +99,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -140,19 +138,17 @@
$result_trees{'expansion_order'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'expansion_order'}{'contents'}[0];
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'expansion_order'}{'contents'}[0];
$result_trees{'expansion_order'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'expansion_order'}{'contents'}[0];
-$result_trees{'expansion_order'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'expansion_order'}{'contents'}[0];
-$result_trees{'expansion_order'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'expansion_order'};
$result_trees{'expansion_order'}{'contents'}[0]{'parent'} =
$result_trees{'expansion_order'};
-$result_trees{'expansion_order'}{'contents'}[1] =
$result_trees{'expansion_order'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'expansion_order'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'expansion_order'}{'contents'}[0];
+$result_trees{'expansion_order'}{'contents'}[1]{'parent'} =
$result_trees{'expansion_order'};
$result_trees{'expansion_order'}{'contents'}[2]{'parent'} =
$result_trees{'expansion_order'};
$result_trees{'expansion_order'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'expansion_order'}{'contents'}[3];
$result_trees{'expansion_order'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'expansion_order'}{'contents'}[3];
$result_trees{'expansion_order'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'expansion_order'}{'contents'}[3];
$result_trees{'expansion_order'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'expansion_order'}{'contents'}[3];
-$result_trees{'expansion_order'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'expansion_order'}{'contents'}[3];
-$result_trees{'expansion_order'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'expansion_order'};
$result_trees{'expansion_order'}{'contents'}[3]{'parent'} =
$result_trees{'expansion_order'};
-$result_trees{'expansion_order'}{'contents'}[4] =
$result_trees{'expansion_order'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'expansion_order'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'expansion_order'}{'contents'}[3];
+$result_trees{'expansion_order'}{'contents'}[4]{'parent'} =
$result_trees{'expansion_order'};
$result_trees{'expansion_order'}{'contents'}[5]{'parent'} =
$result_trees{'expansion_order'};
$result_trees{'expansion_order'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'expansion_order'}{'contents'}[6];
$result_trees{'expansion_order'}{'contents'}[6]{'parent'} =
$result_trees{'expansion_order'};
Modified: trunk/tp/t/results/macro/form_feeds.pl
===================================================================
--- trunk/tp/t/results/macro/form_feeds.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/form_feeds.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -41,16 +41,7 @@
],
'extra' => {
'arg_line' => ' mymacro{a, b}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -59,11 +50,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -95,16 +94,7 @@
],
'extra' => {
'arg_line' => ' oneargmacro{c}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -113,11 +103,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -250,19 +248,17 @@
$result_trees{'form_feeds'}{'contents'}[0]{'args'}[2]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[0];
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[0];
$result_trees{'form_feeds'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[0];
-$result_trees{'form_feeds'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'form_feeds'}{'contents'}[0];
-$result_trees{'form_feeds'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'form_feeds'};
$result_trees{'form_feeds'}{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[1] =
$result_trees{'form_feeds'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'form_feeds'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'form_feeds'}{'contents'}[0];
+$result_trees{'form_feeds'}{'contents'}[1]{'parent'} =
$result_trees{'form_feeds'};
$result_trees{'form_feeds'}{'contents'}[2]{'parent'} =
$result_trees{'form_feeds'};
$result_trees{'form_feeds'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[3];
$result_trees{'form_feeds'}{'contents'}[3]{'args'}[1]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[3];
$result_trees{'form_feeds'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[3];
$result_trees{'form_feeds'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[3];
-$result_trees{'form_feeds'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'form_feeds'}{'contents'}[3];
-$result_trees{'form_feeds'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'form_feeds'};
$result_trees{'form_feeds'}{'contents'}[3]{'parent'} =
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[4] =
$result_trees{'form_feeds'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'form_feeds'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'form_feeds'}{'contents'}[3];
+$result_trees{'form_feeds'}{'contents'}[4]{'parent'} =
$result_trees{'form_feeds'};
$result_trees{'form_feeds'}{'contents'}[5]{'parent'} =
$result_trees{'form_feeds'};
$result_trees{'form_feeds'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[6];
$result_trees{'form_feeds'}{'contents'}[6]{'parent'} =
$result_trees{'form_feeds'};
Modified: trunk/tp/t/results/macro/ifclear_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifclear_in_macro.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/ifclear_in_macro.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -48,16 +48,7 @@
],
'extra' => {
'arg_line' => ' note {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -66,11 +57,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -99,10 +98,9 @@
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'ifclear_in_macro'}{'contents'}[0];
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'ifclear_in_macro'}{'contents'}[0];
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'ifclear_in_macro'}{'contents'}[0];
-$result_trees{'ifclear_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'ifclear_in_macro'}{'contents'}[0];
-$result_trees{'ifclear_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'ifclear_in_macro'};
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'parent'} =
$result_trees{'ifclear_in_macro'};
-$result_trees{'ifclear_in_macro'}{'contents'}[1] =
$result_trees{'ifclear_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'ifclear_in_macro'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'ifclear_in_macro'}{'contents'}[0];
+$result_trees{'ifclear_in_macro'}{'contents'}[1]{'parent'} =
$result_trees{'ifclear_in_macro'};
$result_trees{'ifclear_in_macro'}{'contents'}[2]{'parent'} =
$result_trees{'ifclear_in_macro'};
$result_trees{'ifclear_in_macro'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'ifclear_in_macro'}{'contents'}[3];
$result_trees{'ifclear_in_macro'}{'contents'}[3]{'parent'} =
$result_trees{'ifclear_in_macro'};
Modified: trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' beginifset {}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -80,16 +79,7 @@
],
'extra' => {
'arg_line' => ' endifset {}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -98,11 +88,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -111,18 +109,16 @@
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'ifset_and_end_isef_in_macro'};
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'parent'} =
$result_trees{'ifset_and_end_isef_in_macro'};
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[1] =
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
+$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[1]{'parent'} =
$result_trees{'ifset_and_end_isef_in_macro'};
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[2]{'parent'} =
$result_trees{'ifset_and_end_isef_in_macro'};
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'ifset_and_end_isef_in_macro'};
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'parent'} =
$result_trees{'ifset_and_end_isef_in_macro'};
-$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[4] =
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[4]{'extra'}{'command'}
= $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
+$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[4]{'parent'} =
$result_trees{'ifset_and_end_isef_in_macro'};
$result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[5]{'parent'} =
$result_trees{'ifset_and_end_isef_in_macro'};
$result_texis{'ifset_and_end_isef_in_macro'} = '@macro beginifset {}
Modified: trunk/tp/t/results/macro/ifset_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_in_macro.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/ifset_in_macro.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -48,16 +48,7 @@
],
'extra' => {
'arg_line' => ' note {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -66,11 +57,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -82,10 +81,9 @@
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'ifset_in_macro'}{'contents'}[0];
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'ifset_in_macro'}{'contents'}[0];
$result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'ifset_in_macro'}{'contents'}[0];
-$result_trees{'ifset_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'ifset_in_macro'}{'contents'}[0];
-$result_trees{'ifset_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'ifset_in_macro'};
$result_trees{'ifset_in_macro'}{'contents'}[0]{'parent'} =
$result_trees{'ifset_in_macro'};
-$result_trees{'ifset_in_macro'}{'contents'}[1] =
$result_trees{'ifset_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'ifset_in_macro'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'ifset_in_macro'}{'contents'}[0];
+$result_trees{'ifset_in_macro'}{'contents'}[1]{'parent'} =
$result_trees{'ifset_in_macro'};
$result_trees{'ifset_in_macro'}{'contents'}[2]{'parent'} =
$result_trees{'ifset_in_macro'};
$result_texis{'ifset_in_macro'} = '@macro note {arg}
Modified: trunk/tp/t/results/macro/ifset_in_macro_set.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_in_macro_set.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/ifset_in_macro_set.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -48,16 +48,7 @@
],
'extra' => {
'arg_line' => ' note {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -66,11 +57,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -99,10 +98,9 @@
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
-$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'ifset_in_macro_set'}{'contents'}[0];
-$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'ifset_in_macro_set'};
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'parent'} =
$result_trees{'ifset_in_macro_set'};
-$result_trees{'ifset_in_macro_set'}{'contents'}[1] =
$result_trees{'ifset_in_macro_set'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'ifset_in_macro_set'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'ifset_in_macro_set'}{'contents'}[0];
+$result_trees{'ifset_in_macro_set'}{'contents'}[1]{'parent'} =
$result_trees{'ifset_in_macro_set'};
$result_trees{'ifset_in_macro_set'}{'contents'}[2]{'parent'} =
$result_trees{'ifset_in_macro_set'};
$result_trees{'ifset_in_macro_set'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'ifset_in_macro_set'}{'contents'}[3];
$result_trees{'ifset_in_macro_set'}{'contents'}[3]{'parent'} =
$result_trees{'ifset_in_macro_set'};
Modified: trunk/tp/t/results/macro/ignored_macro_definition.pl
===================================================================
--- trunk/tp/t/results/macro/ignored_macro_definition.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/ignored_macro_definition.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' mymacro{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -126,16 +125,7 @@
],
'extra' => {
'arg_line' => ' mymacro{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -144,7 +134,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'parent' => {},
'type' => 'brace_command_arg'
@@ -204,10 +202,9 @@
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[0];
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[0];
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[0];
-$result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'ignored_macro_definition'}{'contents'}[0];
-$result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'ignored_macro_definition'};
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'parent'} =
$result_trees{'ignored_macro_definition'};
-$result_trees{'ignored_macro_definition'}{'contents'}[1] =
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'ignored_macro_definition'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'ignored_macro_definition'}{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[1]{'parent'} =
$result_trees{'ignored_macro_definition'};
$result_trees{'ignored_macro_definition'}{'contents'}[2]{'parent'} =
$result_trees{'ignored_macro_definition'};
$result_trees{'ignored_macro_definition'}{'contents'}[3]{'parent'} =
$result_trees{'ignored_macro_definition'};
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0];
@@ -218,15 +215,14 @@
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3]{'extra'}{'command'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[4];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[4];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'parent'} =
$result_trees{'ignored_macro_definition'};
Modified: trunk/tp/t/results/macro/implicit_quoting_one_arg.pl
===================================================================
--- trunk/tp/t/results/macro/implicit_quoting_one_arg.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/implicit_quoting_one_arg.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -42,16 +42,7 @@
],
'extra' => {
'arg_line' => ' FIXME{a}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -60,11 +51,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -108,10 +107,9 @@
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
-$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
-$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'implicit_quoting_one_arg'};
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'parent'} =
$result_trees{'implicit_quoting_one_arg'};
-$result_trees{'implicit_quoting_one_arg'}{'contents'}[2] =
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'implicit_quoting_one_arg'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
+$result_trees{'implicit_quoting_one_arg'}{'contents'}[2]{'parent'} =
$result_trees{'implicit_quoting_one_arg'};
$result_trees{'implicit_quoting_one_arg'}{'contents'}[3]{'parent'} =
$result_trees{'implicit_quoting_one_arg'};
$result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0];
Modified: trunk/tp/t/results/macro/implicit_quoting_recursion.pl
===================================================================
--- trunk/tp/t/results/macro/implicit_quoting_recursion.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/implicit_quoting_recursion.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -41,16 +41,7 @@
],
'extra' => {
'arg_line' => ' cat{a,b}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -59,11 +50,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -85,10 +84,9 @@
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
-$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
-$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'implicit_quoting_recursion'};
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'parent'} =
$result_trees{'implicit_quoting_recursion'};
-$result_trees{'implicit_quoting_recursion'}{'contents'}[1] =
$result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'implicit_quoting_recursion'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
+$result_trees{'implicit_quoting_recursion'}{'contents'}[1]{'parent'} =
$result_trees{'implicit_quoting_recursion'};
$result_trees{'implicit_quoting_recursion'}{'contents'}[2]{'parent'} =
$result_trees{'implicit_quoting_recursion'};
$result_trees{'implicit_quoting_recursion'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'implicit_quoting_recursion'}{'contents'}[3];
$result_trees{'implicit_quoting_recursion'}{'contents'}[3]{'parent'} =
$result_trees{'implicit_quoting_recursion'};
Modified: trunk/tp/t/results/macro/leading_spaces_ignore.pl
===================================================================
--- trunk/tp/t/results/macro/leading_spaces_ignore.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/leading_spaces_ignore.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -37,16 +37,7 @@
],
'extra' => {
'arg_line' => ' mymacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -55,11 +46,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -85,10 +84,9 @@
$result_trees{'leading_spaces_ignore'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'leading_spaces_ignore'}{'contents'}[0];
$result_trees{'leading_spaces_ignore'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'leading_spaces_ignore'}{'contents'}[0];
$result_trees{'leading_spaces_ignore'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'leading_spaces_ignore'}{'contents'}[0];
-$result_trees{'leading_spaces_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'leading_spaces_ignore'}{'contents'}[0];
-$result_trees{'leading_spaces_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'leading_spaces_ignore'};
$result_trees{'leading_spaces_ignore'}{'contents'}[0]{'parent'} =
$result_trees{'leading_spaces_ignore'};
-$result_trees{'leading_spaces_ignore'}{'contents'}[1] =
$result_trees{'leading_spaces_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'leading_spaces_ignore'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'leading_spaces_ignore'}{'contents'}[0];
+$result_trees{'leading_spaces_ignore'}{'contents'}[1]{'parent'} =
$result_trees{'leading_spaces_ignore'};
$result_trees{'leading_spaces_ignore'}{'contents'}[2]{'parent'} =
$result_trees{'leading_spaces_ignore'};
$result_trees{'leading_spaces_ignore'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'leading_spaces_ignore'}{'contents'}[3];
$result_trees{'leading_spaces_ignore'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'leading_spaces_ignore'}{'contents'}[3];
Modified: trunk/tp/t/results/macro/leading_spaces_no_ignore.pl
===================================================================
--- trunk/tp/t/results/macro/leading_spaces_no_ignore.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/leading_spaces_no_ignore.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -37,16 +37,7 @@
],
'extra' => {
'arg_line' => ' mymacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -55,11 +46,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -90,10 +89,9 @@
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
-$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
-$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'leading_spaces_no_ignore'};
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'parent'} =
$result_trees{'leading_spaces_no_ignore'};
-$result_trees{'leading_spaces_no_ignore'}{'contents'}[1] =
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'leading_spaces_no_ignore'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
+$result_trees{'leading_spaces_no_ignore'}{'contents'}[1]{'parent'} =
$result_trees{'leading_spaces_no_ignore'};
$result_trees{'leading_spaces_no_ignore'}{'contents'}[2]{'parent'} =
$result_trees{'leading_spaces_no_ignore'};
$result_trees{'leading_spaces_no_ignore'}{'contents'}[3]{'parent'} =
$result_trees{'leading_spaces_no_ignore'};
$result_trees{'leading_spaces_no_ignore'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'leading_spaces_no_ignore'}{'contents'}[4];
Modified: trunk/tp/t/results/macro/macro_expands_to_empty.pl
===================================================================
--- trunk/tp/t/results/macro/macro_expands_to_empty.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_expands_to_empty.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' foo {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -85,10 +84,9 @@
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'macro_expands_to_empty'}{'contents'}[0];
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_expands_to_empty'}{'contents'}[0];
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_expands_to_empty'}{'contents'}[0];
-$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_expands_to_empty'}{'contents'}[0];
-$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_expands_to_empty'};
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'parent'} =
$result_trees{'macro_expands_to_empty'};
-$result_trees{'macro_expands_to_empty'}{'contents'}[1] =
$result_trees{'macro_expands_to_empty'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_expands_to_empty'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_expands_to_empty'}{'contents'}[0];
+$result_trees{'macro_expands_to_empty'}{'contents'}[1]{'parent'} =
$result_trees{'macro_expands_to_empty'};
$result_trees{'macro_expands_to_empty'}{'contents'}[2]{'parent'} =
$result_trees{'macro_expands_to_empty'};
$result_trees{'macro_expands_to_empty'}{'contents'}[3]{'parent'} =
$result_trees{'macro_expands_to_empty'};
$result_trees{'macro_expands_to_empty'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'macro_expands_to_empty'}{'contents'}[4];
Modified: trunk/tp/t/results/macro/macro_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_expansion.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/macro_expansion.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -65,16 +65,7 @@
],
'extra' => {
'arg_line' => ' macroone {arg1, arg2 }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -83,11 +74,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -121,14 +120,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -211,14 +203,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -275,14 +260,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -291,8 +269,15 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -340,14 +325,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -404,14 +382,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -497,14 +468,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -535,18 +499,16 @@
$result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[1];
$result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[1];
$result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[1];
-$result_trees{'macro_expansion'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[1];
-$result_trees{'macro_expansion'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[1]{'parent'} =
$result_trees{'macro_expansion'};
-$result_trees{'macro_expansion'}{'contents'}[2] =
$result_trees{'macro_expansion'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_expansion'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'macro_expansion'}{'contents'}[1];
+$result_trees{'macro_expansion'}{'contents'}[2]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[3]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[4];
$result_trees{'macro_expansion'}{'contents'}[4]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[5];
$result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[5];
$result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[1]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[5];
-$result_trees{'macro_expansion'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[5];
-$result_trees{'macro_expansion'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_expansion'};
+$result_trees{'macro_expansion'}{'contents'}[5]{'extra'}{'spaces_after_command'}
= $result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[0];
$result_trees{'macro_expansion'}{'contents'}[5]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[6];
$result_trees{'macro_expansion'}{'contents'}[6]{'parent'} =
$result_trees{'macro_expansion'};
@@ -560,8 +522,7 @@
$result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[9];
$result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[9];
$result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[1]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[9];
-$result_trees{'macro_expansion'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[9];
-$result_trees{'macro_expansion'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_expansion'};
+$result_trees{'macro_expansion'}{'contents'}[9]{'extra'}{'spaces_after_command'}
= $result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[0];
$result_trees{'macro_expansion'}{'contents'}[9]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[10];
$result_trees{'macro_expansion'}{'contents'}[10]{'parent'} =
$result_trees{'macro_expansion'};
@@ -571,10 +532,10 @@
$result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[13];
$result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[13];
$result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[1]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[13];
-$result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[13];
-$result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_expansion'};
+$result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'}
= $result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[0];
$result_trees{'macro_expansion'}{'contents'}[13]{'parent'} =
$result_trees{'macro_expansion'};
-$result_trees{'macro_expansion'}{'contents'}[14] =
$result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_expansion'}{'contents'}[14]{'extra'}{'command'} =
$result_trees{'macro_expansion'}{'contents'}[13];
+$result_trees{'macro_expansion'}{'contents'}[14]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[15]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[15];
$result_trees{'macro_expansion'}{'contents'}[15]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[16]{'parent'} =
$result_trees{'macro_expansion'};
@@ -583,8 +544,7 @@
$result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[18];
$result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[18];
$result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[1]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[18];
-$result_trees{'macro_expansion'}{'contents'}[18]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[18];
-$result_trees{'macro_expansion'}{'contents'}[18]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_expansion'};
+$result_trees{'macro_expansion'}{'contents'}[18]{'extra'}{'spaces_after_command'}
= $result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[0];
$result_trees{'macro_expansion'}{'contents'}[18]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[19]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[19];
$result_trees{'macro_expansion'}{'contents'}[19]{'parent'} =
$result_trees{'macro_expansion'};
@@ -594,8 +554,7 @@
$result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[22];
$result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[22];
$result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[1]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[22];
-$result_trees{'macro_expansion'}{'contents'}[22]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[22];
-$result_trees{'macro_expansion'}{'contents'}[22]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_expansion'};
+$result_trees{'macro_expansion'}{'contents'}[22]{'extra'}{'spaces_after_command'}
= $result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[0];
$result_trees{'macro_expansion'}{'contents'}[22]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[23]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[23];
$result_trees{'macro_expansion'}{'contents'}[23]{'parent'} =
$result_trees{'macro_expansion'};
@@ -610,8 +569,7 @@
$result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[1]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[28];
$result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[2]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[28];
$result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[3]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[28];
-$result_trees{'macro_expansion'}{'contents'}[28]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_expansion'}{'contents'}[28];
-$result_trees{'macro_expansion'}{'contents'}[28]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_expansion'};
+$result_trees{'macro_expansion'}{'contents'}[28]{'extra'}{'spaces_after_command'}
= $result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[0];
$result_trees{'macro_expansion'}{'contents'}[28]{'parent'} =
$result_trees{'macro_expansion'};
$result_trees{'macro_expansion'}{'contents'}[29]{'contents'}[0]{'parent'} =
$result_trees{'macro_expansion'}{'contents'}[29];
$result_trees{'macro_expansion'}{'contents'}[29]{'parent'} =
$result_trees{'macro_expansion'};
Modified: trunk/tp/t/results/macro/macro_for_end.pl
===================================================================
--- trunk/tp/t/results/macro/macro_for_end.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/macro_for_end.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' myend
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -127,10 +126,9 @@
$result_trees{'macro_for_end'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_for_end'}{'contents'}[0];
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'macro_for_end'}{'contents'}[0];
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'macro_for_end'}{'contents'}[0];
-$result_trees{'macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_for_end'}{'contents'}[0];
-$result_trees{'macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_for_end'};
$result_trees{'macro_for_end'}{'contents'}[0]{'parent'} =
$result_trees{'macro_for_end'};
-$result_trees{'macro_for_end'}{'contents'}[1] =
$result_trees{'macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_for_end'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_for_end'}{'contents'}[0];
+$result_trees{'macro_for_end'}{'contents'}[1]{'parent'} =
$result_trees{'macro_for_end'};
$result_trees{'macro_for_end'}{'contents'}[2]{'parent'} =
$result_trees{'macro_for_end'};
$result_trees{'macro_for_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_for_end'}{'contents'}[3];
$result_trees{'macro_for_end'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'macro_for_end'}{'contents'}[3];
Modified: trunk/tp/t/results/macro/macro_for_ignored_line_command.pl
===================================================================
--- trunk/tp/t/results/macro/macro_for_ignored_line_command.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/macro_for_ignored_line_command.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' pagemacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -74,10 +73,9 @@
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
-$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
-$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_for_ignored_line_command'};
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'parent'} =
$result_trees{'macro_for_ignored_line_command'};
-$result_trees{'macro_for_ignored_line_command'}{'contents'}[1] =
$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[1]{'parent'} =
$result_trees{'macro_for_ignored_line_command'};
$result_trees{'macro_for_ignored_line_command'}{'contents'}[2]{'parent'} =
$result_trees{'macro_for_ignored_line_command'};
$result_trees{'macro_for_ignored_line_command'}{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'macro_for_ignored_line_command'}{'contents'}[3];
$result_trees{'macro_for_ignored_line_command'}{'contents'}[3]{'parent'} =
$result_trees{'macro_for_ignored_line_command'};
Modified: trunk/tp/t/results/macro/macro_in_accent.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_accent.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/macro_in_accent.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' aletter
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -80,16 +79,7 @@
],
'extra' => {
'arg_line' => ' aspace
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -98,11 +88,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -270,18 +268,16 @@
$result_trees{'macro_in_accent'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_in_accent'}{'contents'}[0];
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_accent'}{'contents'}[0];
$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_accent'}{'contents'}[0];
-$result_trees{'macro_in_accent'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_accent'}{'contents'}[0];
-$result_trees{'macro_in_accent'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_accent'};
$result_trees{'macro_in_accent'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_accent'};
-$result_trees{'macro_in_accent'}{'contents'}[1] =
$result_trees{'macro_in_accent'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_accent'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_in_accent'}{'contents'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_accent'};
$result_trees{'macro_in_accent'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_accent'};
$result_trees{'macro_in_accent'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'macro_in_accent'}{'contents'}[3];
$result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_accent'}{'contents'}[3];
$result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_accent'}{'contents'}[3];
-$result_trees{'macro_in_accent'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_accent'}{'contents'}[3];
-$result_trees{'macro_in_accent'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_accent'};
$result_trees{'macro_in_accent'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_accent'};
-$result_trees{'macro_in_accent'}{'contents'}[4] =
$result_trees{'macro_in_accent'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_accent'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'macro_in_accent'}{'contents'}[3];
+$result_trees{'macro_in_accent'}{'contents'}[4]{'parent'} =
$result_trees{'macro_in_accent'};
$result_trees{'macro_in_accent'}{'contents'}[5]{'parent'} =
$result_trees{'macro_in_accent'};
$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0];
Modified: trunk/tp/t/results/macro/macro_in_brace_command.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_brace_command.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_in_brace_command.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' foo
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -80,16 +79,7 @@
],
'extra' => {
'arg_line' => ' abar
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -98,11 +88,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -276,18 +274,16 @@
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_in_brace_command'}{'contents'}[0];
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_brace_command'}{'contents'}[0];
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_brace_command'}{'contents'}[0];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_brace_command'}{'contents'}[0];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_brace_command'};
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_brace_command'};
-$result_trees{'macro_in_brace_command'}{'contents'}[1] =
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_brace_command'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_in_brace_command'}{'contents'}[0];
+$result_trees{'macro_in_brace_command'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_brace_command'};
$result_trees{'macro_in_brace_command'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_brace_command'};
$result_trees{'macro_in_brace_command'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'macro_in_brace_command'}{'contents'}[3];
$result_trees{'macro_in_brace_command'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_brace_command'}{'contents'}[3];
$result_trees{'macro_in_brace_command'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_brace_command'}{'contents'}[3];
-$result_trees{'macro_in_brace_command'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_brace_command'}{'contents'}[3];
-$result_trees{'macro_in_brace_command'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_brace_command'};
$result_trees{'macro_in_brace_command'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_brace_command'};
-$result_trees{'macro_in_brace_command'}{'contents'}[4] =
$result_trees{'macro_in_brace_command'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_brace_command'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'macro_in_brace_command'}{'contents'}[3];
+$result_trees{'macro_in_brace_command'}{'contents'}[4]{'parent'} =
$result_trees{'macro_in_brace_command'};
$result_trees{'macro_in_brace_command'}{'contents'}[5]{'parent'} =
$result_trees{'macro_in_brace_command'};
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_brace_command'}{'contents'}[6];
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0];
Modified: trunk/tp/t/results/macro/macro_in_end_argument.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_end_argument.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_in_end_argument.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' acartouche
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -127,10 +126,9 @@
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_in_end_argument'}{'contents'}[0];
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_end_argument'}{'contents'}[0];
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_end_argument'}{'contents'}[0];
-$result_trees{'macro_in_end_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_end_argument'}{'contents'}[0];
-$result_trees{'macro_in_end_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_end_argument'};
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_end_argument'};
-$result_trees{'macro_in_end_argument'}{'contents'}[1] =
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_end_argument'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_in_end_argument'}{'contents'}[0];
+$result_trees{'macro_in_end_argument'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_end_argument'};
$result_trees{'macro_in_end_argument'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_end_argument'};
$result_trees{'macro_in_end_argument'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_end_argument'}{'contents'}[3];
$result_trees{'macro_in_end_argument'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_end_argument'}{'contents'}[3];
Modified: trunk/tp/t/results/macro/macro_in_ifset.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_ifset.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/macro_in_ifset.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' macroone {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -68,10 +67,9 @@
$result_trees{'macro_in_ifset'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'macro_in_ifset'}{'contents'}[0];
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_ifset'}{'contents'}[0];
$result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_ifset'}{'contents'}[0];
-$result_trees{'macro_in_ifset'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_ifset'}{'contents'}[0];
-$result_trees{'macro_in_ifset'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_ifset'};
$result_trees{'macro_in_ifset'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_ifset'};
-$result_trees{'macro_in_ifset'}{'contents'}[1] =
$result_trees{'macro_in_ifset'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_in_ifset'}{'contents'}[0];
+$result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_ifset'};
$result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_ifset'};
$result_texis{'macro_in_ifset'} = '@macro macroone {arg}
Modified: trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' macroone {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -123,10 +122,9 @@
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
-$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
-$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_ifset_end_in_arg'};
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_ifset_end_in_arg'};
-$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[1] =
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
+$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_ifset_end_in_arg'};
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_ifset_end_in_arg'};
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_ifset_end_in_arg'};
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[4];
Modified: trunk/tp/t/results/macro/macro_in_index_commands.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_index_commands.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_in_index_commands.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -33,16 +33,7 @@
],
'extra' => {
'arg_line' => ' cp
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -51,8 +42,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -76,16 +75,7 @@
],
'extra' => {
'arg_line' => ' fn
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -94,8 +84,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -119,16 +117,7 @@
],
'extra' => {
'arg_line' => ' syncodeindexcommand
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -137,11 +126,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -258,16 +255,7 @@
],
'extra' => {
'arg_line' => ' truc
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -276,11 +264,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -370,16 +366,7 @@
],
'extra' => {
'arg_line' => ' trucindexcommand
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -388,11 +375,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -419,16 +414,7 @@
],
'extra' => {
'arg_line' => ' codeidx
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -437,11 +423,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -515,16 +509,7 @@
],
'extra' => {
'arg_line' => ' defcodeindexentry
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -533,11 +518,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -1041,24 +1034,21 @@
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1] =
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[3] =
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5] =
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[6]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0];
@@ -1078,10 +1068,9 @@
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11] =
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[12]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
@@ -1097,18 +1086,16 @@
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[16] =
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[16]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[19] =
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[19]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[19]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[20]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21]{'args'}[0];
@@ -1121,10 +1108,9 @@
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'args'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
-$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[24] =
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[24]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
+$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[24]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[25]{'parent'}
= $result_trees{'macro_in_index_commands'}{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_index_commands'};
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1];
Modified: trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' badmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,8 +40,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -95,10 +94,9 @@
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
-$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
-$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_invalid_documentencoding'};
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_invalid_documentencoding'};
-$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[1] =
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
+$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_invalid_documentencoding'};
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2];
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0];
$result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0];
Modified: trunk/tp/t/results/macro/macro_in_macro_arg.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_macro_arg.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_in_macro_arg.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -37,16 +37,7 @@
],
'extra' => {
'arg_line' => ' macroone
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -55,11 +46,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -91,16 +90,7 @@
],
'extra' => {
'arg_line' => ' macrotwo{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -109,11 +99,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -156,16 +154,7 @@
],
'extra' => {
'arg_line' => ' macrothree{text, arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -174,11 +163,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -204,19 +201,17 @@
$result_trees{'macro_in_macro_arg'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[1];
$result_trees{'macro_in_macro_arg'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[1];
$result_trees{'macro_in_macro_arg'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[1];
-$result_trees{'macro_in_macro_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_macro_arg'}{'contents'}[1];
-$result_trees{'macro_in_macro_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_macro_arg'};
-$result_trees{'macro_in_macro_arg'}{'contents'}[2] =
$result_trees{'macro_in_macro_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_macro_arg'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[1];
+$result_trees{'macro_in_macro_arg'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
$result_trees{'macro_in_macro_arg'}{'contents'}[4]{'args'}[1]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
$result_trees{'macro_in_macro_arg'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
$result_trees{'macro_in_macro_arg'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
-$result_trees{'macro_in_macro_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_macro_arg'}{'contents'}[4];
-$result_trees{'macro_in_macro_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[4]{'parent'} =
$result_trees{'macro_in_macro_arg'};
-$result_trees{'macro_in_macro_arg'}{'contents'}[5] =
$result_trees{'macro_in_macro_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_macro_arg'}{'contents'}[5]{'extra'}{'command'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[4];
+$result_trees{'macro_in_macro_arg'}{'contents'}[5]{'parent'} =
$result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[6]{'parent'} =
$result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'args'}[1]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
@@ -224,10 +219,9 @@
$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[2]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
-$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_macro_arg'}{'contents'}[7];
-$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'parent'} =
$result_trees{'macro_in_macro_arg'};
-$result_trees{'macro_in_macro_arg'}{'contents'}[8] =
$result_trees{'macro_in_macro_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_macro_arg'}{'contents'}[8]{'extra'}{'command'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[7];
+$result_trees{'macro_in_macro_arg'}{'contents'}[8]{'parent'} =
$result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[9]{'parent'} =
$result_trees{'macro_in_macro_arg'};
$result_trees{'macro_in_macro_arg'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[10];
$result_trees{'macro_in_macro_arg'}{'contents'}[10]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_macro_arg'}{'contents'}[10];
Modified: trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' macrooneone
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -96,16 +95,7 @@
],
'extra' => {
'arg_line' => ' macrothree{text, arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -114,11 +104,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -143,10 +141,9 @@
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'};
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_macro_arg_simpler'};
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[1] =
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
+$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_macro_arg_simpler'};
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_macro_arg_simpler'};
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'args'}[1]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
@@ -154,10 +151,9 @@
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'};
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_macro_arg_simpler'};
-$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[4] =
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[4]{'extra'}{'command'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
+$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[4]{'parent'} =
$result_trees{'macro_in_macro_arg_simpler'};
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[5]{'parent'} =
$result_trees{'macro_in_macro_arg_simpler'};
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6];
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6];
Modified: trunk/tp/t/results/macro/macro_in_menu.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_menu.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/macro_in_menu.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -37,16 +37,7 @@
],
'extra' => {
'arg_line' => ' astar
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -55,11 +46,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -86,16 +85,7 @@
],
'extra' => {
'arg_line' => ' starspaces
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -104,11 +94,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -135,16 +133,7 @@
],
'extra' => {
'arg_line' => ' spaces
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -153,11 +142,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -184,16 +181,7 @@
],
'extra' => {
'arg_line' => ' aspace
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -202,11 +190,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -233,16 +229,7 @@
],
'extra' => {
'arg_line' => ' twocolon
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -251,11 +238,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -282,16 +277,7 @@
],
'extra' => {
'arg_line' => ' acolon
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -300,11 +286,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -703,50 +697,44 @@
$result_trees{'macro_in_menu'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[1];
$result_trees{'macro_in_menu'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[1];
$result_trees{'macro_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_menu'}{'contents'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[2] =
$result_trees{'macro_in_menu'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_menu'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'macro_in_menu'}{'contents'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[4];
$result_trees{'macro_in_menu'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[4];
$result_trees{'macro_in_menu'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[4];
-$result_trees{'macro_in_menu'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_menu'}{'contents'}[4];
-$result_trees{'macro_in_menu'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[4]{'parent'} =
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[5] =
$result_trees{'macro_in_menu'}{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_menu'}{'contents'}[5]{'extra'}{'command'} =
$result_trees{'macro_in_menu'}{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[5]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[6]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[7];
$result_trees{'macro_in_menu'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[7];
$result_trees{'macro_in_menu'}{'contents'}[7]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_menu'}{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[7]{'parent'} =
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[8] =
$result_trees{'macro_in_menu'}{'contents'}[7]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_menu'}{'contents'}[8]{'extra'}{'command'} =
$result_trees{'macro_in_menu'}{'contents'}[7];
+$result_trees{'macro_in_menu'}{'contents'}[8]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[9]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[10]{'args'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[10];
$result_trees{'macro_in_menu'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[10];
$result_trees{'macro_in_menu'}{'contents'}[10]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[10];
-$result_trees{'macro_in_menu'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_menu'}{'contents'}[10];
-$result_trees{'macro_in_menu'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[10]{'parent'} =
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[11] =
$result_trees{'macro_in_menu'}{'contents'}[10]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_menu'}{'contents'}[11]{'extra'}{'command'} =
$result_trees{'macro_in_menu'}{'contents'}[10];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[12]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[13]{'args'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[13];
$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[13];
$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[13];
-$result_trees{'macro_in_menu'}{'contents'}[13]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_menu'}{'contents'}[13];
-$result_trees{'macro_in_menu'}{'contents'}[13]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[13]{'parent'} =
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[14] =
$result_trees{'macro_in_menu'}{'contents'}[13]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_menu'}{'contents'}[14]{'extra'}{'command'} =
$result_trees{'macro_in_menu'}{'contents'}[13];
+$result_trees{'macro_in_menu'}{'contents'}[14]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[15]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[16]{'args'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[16];
$result_trees{'macro_in_menu'}{'contents'}[16]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[16];
$result_trees{'macro_in_menu'}{'contents'}[16]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[16];
-$result_trees{'macro_in_menu'}{'contents'}[16]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_menu'}{'contents'}[16];
-$result_trees{'macro_in_menu'}{'contents'}[16]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[16]{'parent'} =
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[17] =
$result_trees{'macro_in_menu'}{'contents'}[16]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_menu'}{'contents'}[17]{'extra'}{'command'} =
$result_trees{'macro_in_menu'}{'contents'}[16];
+$result_trees{'macro_in_menu'}{'contents'}[17]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[18]{'parent'} =
$result_trees{'macro_in_menu'};
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_menu'}{'contents'}[19];
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[0]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[19];
Modified: trunk/tp/t/results/macro/macro_in_misc_commands.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_misc_commands.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_in_misc_commands.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -33,16 +33,7 @@
],
'extra' => {
'arg_line' => ' text
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -51,11 +42,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -82,16 +81,7 @@
],
'extra' => {
'arg_line' => ' Top
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -100,11 +90,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -313,16 +311,7 @@
],
'extra' => {
'arg_line' => ' en
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -331,8 +320,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -356,16 +353,7 @@
],
'extra' => {
'arg_line' => ' documentlanguagecommand
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -374,11 +362,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -521,16 +517,7 @@
],
'extra' => {
'arg_line' => ' pagesizesarg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -539,11 +526,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -570,16 +565,7 @@
],
'extra' => {
'arg_line' => ' afourpapermacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -588,11 +574,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -762,16 +756,7 @@
],
'extra' => {
'arg_line' => ' needarg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -780,11 +765,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -858,16 +851,7 @@
],
'extra' => {
'arg_line' => ' raisesectionsmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -876,8 +860,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -913,16 +905,7 @@
],
'extra' => {
'arg_line' => ' lowersectionsmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -931,8 +914,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -1076,16 +1067,7 @@
],
'extra' => {
'arg_line' => ' definfoenclosename
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1094,8 +1076,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -1207,16 +1197,7 @@
],
'extra' => {
'arg_line' => ' strongmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1225,8 +1206,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -1250,16 +1239,7 @@
],
'extra' => {
'arg_line' => ' strongname
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1268,11 +1248,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -1470,16 +1458,7 @@
],
'extra' => {
'arg_line' => ' kbdinputstylearg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1488,8 +1467,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -1709,16 +1696,7 @@
],
'extra' => {
'arg_line' => ' asisarg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1727,8 +1705,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -1752,16 +1738,7 @@
],
'extra' => {
'arg_line' => ' zero
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1770,8 +1747,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -1795,16 +1780,7 @@
],
'extra' => {
'arg_line' => ' nonearg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1813,8 +1789,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -1838,16 +1822,7 @@
],
'extra' => {
'arg_line' => ' four
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1856,8 +1831,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -1881,16 +1864,7 @@
],
'extra' => {
'arg_line' => ' six
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -1899,11 +1873,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -2182,16 +2164,7 @@
],
'extra' => {
'arg_line' => ' endarg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2200,8 +2173,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -2225,16 +2206,7 @@
],
'extra' => {
'arg_line' => ' separatearg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2243,8 +2215,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -2356,16 +2336,7 @@
],
'extra' => {
'arg_line' => ' onarg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2374,8 +2345,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -2399,16 +2378,7 @@
],
'extra' => {
'arg_line' => ' offarg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2417,8 +2387,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -2548,16 +2526,7 @@
],
'extra' => {
'arg_line' => ' ten
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2566,8 +2535,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -2650,16 +2627,7 @@
],
'extra' => {
'arg_line' => ' falsearg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2668,8 +2636,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -2693,16 +2669,7 @@
],
'extra' => {
'arg_line' => ' truearg
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2711,8 +2678,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -2830,16 +2805,7 @@
],
'extra' => {
'arg_line' => ' pagemacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2848,8 +2814,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -2873,16 +2847,7 @@
],
'extra' => {
'arg_line' => ' noindentmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2891,8 +2856,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -2916,16 +2889,7 @@
],
'extra' => {
'arg_line' => ' refillmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -2934,11 +2898,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -3265,16 +3237,7 @@
],
'extra' => {
'arg_line' => ' contentsmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -3283,8 +3246,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -3355,16 +3326,7 @@
],
'extra' => {
'arg_line' => ' cropmarksmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -3373,8 +3335,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -3416,16 +3386,7 @@
],
'extra' => {
'arg_line' => ' exdentmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -3434,8 +3395,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -3506,16 +3475,7 @@
],
'extra' => {
'arg_line' => ' two
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -3524,8 +3484,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -3596,16 +3564,7 @@
],
'extra' => {
'arg_line' => ' resultmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -3614,11 +3573,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -3924,16 +3891,7 @@
],
'extra' => {
'arg_line' => ' shortcontentsmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -3942,8 +3900,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -3990,16 +3956,7 @@
],
'extra' => {
'arg_line' => ' byemacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -4008,11 +3965,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
}
],
@@ -4049,18 +4014,16 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[1] =
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[4] =
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
+$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_misc_commands'};
$result_trees{'macro_in_misc_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[1];
@@ -4096,17 +4059,15 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[8]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
@@ -4132,18 +4093,16 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[14] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[14]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[14]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[15]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[17] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[17]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[17]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[18]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19]{'args'}[0];
@@ -4170,10 +4129,9 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28]{'args'}[0];
@@ -4186,19 +4144,17 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[31] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[31]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[31]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[36]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4222,10 +4178,9 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0];
@@ -4243,17 +4198,15 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[51]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0];
@@ -4284,10 +4237,9 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0];
@@ -4324,38 +4276,33 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[69] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[69]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[69]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[78]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79]{'args'}[0];
@@ -4403,17 +4350,15 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[87] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[87]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[87]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[89] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[89]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[89]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0];
@@ -4432,17 +4377,15 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[96] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[96]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[96]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0];
@@ -4463,10 +4406,9 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[102] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[102]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[102]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0];
@@ -4479,17 +4421,15 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0];
@@ -4509,24 +4449,21 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[118] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[118]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[118]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120];
@@ -4590,10 +4527,9 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[136] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[136]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[136]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[138]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4603,20 +4539,18 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[142] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[142]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[142]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[144]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[146] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[146]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[146]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0];
@@ -4629,10 +4563,9 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[150] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[150]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[150]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0];
@@ -4644,10 +4577,9 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154] =
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[155]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -4700,20 +4632,18 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4] =
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
+$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[6]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
-$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[8] =
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[8]{'extra'}{'command'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[8]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[9]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[4];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'extra'}{'misc_content'}[0]
=
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'args'}[0]{'contents'}[1];
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'extra'}{'spaces_after_command'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[4]{'args'}[0]{'contents'}[0];
Modified: trunk/tp/t/results/macro/macro_name_with_digit.pl
===================================================================
--- trunk/tp/t/results/macro/macro_name_with_digit.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_name_with_digit.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' macro1
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -85,16 +84,7 @@
],
'extra' => {
'arg_line' => ' macro11 {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -103,11 +93,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -127,19 +125,17 @@
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_name_with_digit'}{'contents'}[0];
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
-$result_trees{'macro_name_with_digit'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
-$result_trees{'macro_name_with_digit'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_name_with_digit'};
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'parent'} =
$result_trees{'macro_name_with_digit'};
-$result_trees{'macro_name_with_digit'}{'contents'}[1] =
$result_trees{'macro_name_with_digit'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_name_with_digit'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_name_with_digit'}{'contents'}[0];
+$result_trees{'macro_name_with_digit'}{'contents'}[1]{'parent'} =
$result_trees{'macro_name_with_digit'};
$result_trees{'macro_name_with_digit'}{'contents'}[2]{'parent'} =
$result_trees{'macro_name_with_digit'};
$result_trees{'macro_name_with_digit'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'macro_name_with_digit'}{'contents'}[3];
$result_trees{'macro_name_with_digit'}{'contents'}[3]{'args'}[1]{'parent'} =
$result_trees{'macro_name_with_digit'}{'contents'}[3];
$result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[3];
$result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[3];
-$result_trees{'macro_name_with_digit'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_name_with_digit'}{'contents'}[3];
-$result_trees{'macro_name_with_digit'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_name_with_digit'};
$result_trees{'macro_name_with_digit'}{'contents'}[3]{'parent'} =
$result_trees{'macro_name_with_digit'};
-$result_trees{'macro_name_with_digit'}{'contents'}[4] =
$result_trees{'macro_name_with_digit'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_name_with_digit'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'macro_name_with_digit'}{'contents'}[3];
+$result_trees{'macro_name_with_digit'}{'contents'}[4]{'parent'} =
$result_trees{'macro_name_with_digit'};
$result_trees{'macro_name_with_digit'}{'contents'}[5]{'parent'} =
$result_trees{'macro_name_with_digit'};
$result_trees{'macro_name_with_digit'}{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[6];
$result_trees{'macro_name_with_digit'}{'contents'}[6]{'parent'} =
$result_trees{'macro_name_with_digit'};
Modified: trunk/tp/t/results/macro/macro_name_with_hyphen.pl
===================================================================
--- trunk/tp/t/results/macro/macro_name_with_hyphen.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_name_with_hyphen.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -41,16 +41,7 @@
],
'extra' => {
'arg_line' => ' macro-one {arg-one, arg2}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -59,11 +50,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -111,10 +110,9 @@
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'args'}[2]{'parent'} =
$result_trees{'macro_name_with_hyphen'}{'contents'}[0];
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
-$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
-$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_name_with_hyphen'};
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'parent'} =
$result_trees{'macro_name_with_hyphen'};
-$result_trees{'macro_name_with_hyphen'}{'contents'}[1] =
$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_name_with_hyphen'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_name_with_hyphen'}{'contents'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[1]{'parent'} =
$result_trees{'macro_name_with_hyphen'};
$result_trees{'macro_name_with_hyphen'}{'contents'}[2]{'parent'} =
$result_trees{'macro_name_with_hyphen'};
$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[3];
$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[1]{'args'}[0];
Modified: trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' testone
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -73,10 +72,9 @@
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
-$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
-$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_no_arg_bad_expansion'};
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'parent'} =
$result_trees{'macro_no_arg_bad_expansion'};
-$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[1] =
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
+$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[1]{'parent'} =
$result_trees{'macro_no_arg_bad_expansion'};
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[2]{'parent'} =
$result_trees{'macro_no_arg_bad_expansion'};
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3];
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'parent'} =
$result_trees{'macro_no_arg_bad_expansion'};
Modified: trunk/tp/t/results/macro/macro_no_arg_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_no_arg_expansion.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/macro_no_arg_expansion.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' testone
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -73,10 +72,9 @@
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_no_arg_expansion'}{'contents'}[0];
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
-$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
-$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_no_arg_expansion'};
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'parent'} =
$result_trees{'macro_no_arg_expansion'};
-$result_trees{'macro_no_arg_expansion'}{'contents'}[1] =
$result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_no_arg_expansion'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_no_arg_expansion'}{'contents'}[0];
+$result_trees{'macro_no_arg_expansion'}{'contents'}[1]{'parent'} =
$result_trees{'macro_no_arg_expansion'};
$result_trees{'macro_no_arg_expansion'}{'contents'}[2]{'parent'} =
$result_trees{'macro_no_arg_expansion'};
$result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_no_arg_expansion'}{'contents'}[3];
$result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'parent'} =
$result_trees{'macro_no_arg_expansion'};
Modified: trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl
===================================================================
--- trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' onearg{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -78,10 +77,9 @@
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
-$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
-$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_one_arg_end_of_file'};
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'parent'} =
$result_trees{'macro_one_arg_end_of_file'};
-$result_trees{'macro_one_arg_end_of_file'}{'contents'}[1] =
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_one_arg_end_of_file'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
+$result_trees{'macro_one_arg_end_of_file'}{'contents'}[1]{'parent'} =
$result_trees{'macro_one_arg_end_of_file'};
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[2]{'parent'} =
$result_trees{'macro_one_arg_end_of_file'};
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3];
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'parent'} =
$result_trees{'macro_one_arg_end_of_file'};
Modified: trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
===================================================================
--- trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' witherror{string}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -98,10 +97,9 @@
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
-$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
-$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_with_error_at_end_line_after_macro'};
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'parent'}
= $result_trees{'macro_with_error_at_end_line_after_macro'};
-$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[1] =
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
+$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[1]{'parent'}
= $result_trees{'macro_with_error_at_end_line_after_macro'};
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[2]{'parent'}
= $result_trees{'macro_with_error_at_end_line_after_macro'};
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3];
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3]{'args'}[0];
Modified: trunk/tp/t/results/macro/macro_zero.pl
===================================================================
--- trunk/tp/t/results/macro/macro_zero.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/macro_zero.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' zero
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -78,10 +77,9 @@
$result_trees{'macro_zero'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_zero'}{'contents'}[0];
$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'macro_zero'}{'contents'}[0];
$result_trees{'macro_zero'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'macro_zero'}{'contents'}[0];
-$result_trees{'macro_zero'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_zero'}{'contents'}[0];
-$result_trees{'macro_zero'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_zero'};
$result_trees{'macro_zero'}{'contents'}[0]{'parent'} =
$result_trees{'macro_zero'};
-$result_trees{'macro_zero'}{'contents'}[1] =
$result_trees{'macro_zero'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_zero'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_zero'}{'contents'}[0];
+$result_trees{'macro_zero'}{'contents'}[1]{'parent'} =
$result_trees{'macro_zero'};
$result_trees{'macro_zero'}{'contents'}[2]{'parent'} =
$result_trees{'macro_zero'};
$result_trees{'macro_zero'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'macro_zero'}{'contents'}[3];
$result_trees{'macro_zero'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'macro_zero'}{'contents'}[3];
Modified: trunk/tp/t/results/macro/nested_macro_call.pl
===================================================================
--- trunk/tp/t/results/macro/nested_macro_call.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/nested_macro_call.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' machin{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -86,16 +85,7 @@
],
'extra' => {
'arg_line' => ' truc{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -104,11 +94,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -133,19 +131,17 @@
$result_trees{'nested_macro_call'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[0];
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[0];
$result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[0];
-$result_trees{'nested_macro_call'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_macro_call'}{'contents'}[0];
-$result_trees{'nested_macro_call'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_macro_call'};
$result_trees{'nested_macro_call'}{'contents'}[0]{'parent'} =
$result_trees{'nested_macro_call'};
-$result_trees{'nested_macro_call'}{'contents'}[1] =
$result_trees{'nested_macro_call'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'nested_macro_call'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'nested_macro_call'}{'contents'}[0];
+$result_trees{'nested_macro_call'}{'contents'}[1]{'parent'} =
$result_trees{'nested_macro_call'};
$result_trees{'nested_macro_call'}{'contents'}[2]{'parent'} =
$result_trees{'nested_macro_call'};
$result_trees{'nested_macro_call'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[3];
$result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[3];
$result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[3];
$result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[3];
-$result_trees{'nested_macro_call'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_macro_call'}{'contents'}[3];
-$result_trees{'nested_macro_call'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_macro_call'};
$result_trees{'nested_macro_call'}{'contents'}[3]{'parent'} =
$result_trees{'nested_macro_call'};
-$result_trees{'nested_macro_call'}{'contents'}[4] =
$result_trees{'nested_macro_call'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'nested_macro_call'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'nested_macro_call'}{'contents'}[3];
+$result_trees{'nested_macro_call'}{'contents'}[4]{'parent'} =
$result_trees{'nested_macro_call'};
$result_trees{'nested_macro_call'}{'contents'}[5]{'parent'} =
$result_trees{'nested_macro_call'};
$result_trees{'nested_macro_call'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[6];
$result_trees{'nested_macro_call'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'nested_macro_call'}{'contents'}[6];
Modified: trunk/tp/t/results/macro/no_macrobody.pl
===================================================================
--- trunk/tp/t/results/macro/no_macrobody.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/no_macrobody.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -24,16 +24,7 @@
'contents' => [],
'extra' => {
'arg_line' => ' nomacrobody {arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -42,11 +33,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -77,10 +76,9 @@
};
$result_trees{'no_macrobody'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'no_macrobody'}{'contents'}[0];
$result_trees{'no_macrobody'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'no_macrobody'}{'contents'}[0];
-$result_trees{'no_macrobody'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'no_macrobody'}{'contents'}[0];
-$result_trees{'no_macrobody'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'no_macrobody'};
$result_trees{'no_macrobody'}{'contents'}[0]{'parent'} =
$result_trees{'no_macrobody'};
-$result_trees{'no_macrobody'}{'contents'}[1] =
$result_trees{'no_macrobody'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'no_macrobody'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'no_macrobody'}{'contents'}[0];
+$result_trees{'no_macrobody'}{'contents'}[1]{'parent'} =
$result_trees{'no_macrobody'};
$result_trees{'no_macrobody'}{'contents'}[2]{'parent'} =
$result_trees{'no_macrobody'};
$result_trees{'no_macrobody'}{'contents'}[3]{'parent'} =
$result_trees{'no_macrobody'};
$result_trees{'no_macrobody'}{'contents'}[4]{'parent'} =
$result_trees{'no_macrobody'};
Modified: trunk/tp/t/results/macro/paragraph_and_macro.pl
===================================================================
--- trunk/tp/t/results/macro/paragraph_and_macro.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/paragraph_and_macro.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -19,16 +19,7 @@
'contents' => [],
'extra' => {
'arg_line' => ' aempty
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -37,11 +28,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -68,16 +67,7 @@
],
'extra' => {
'arg_line' => ' aspace
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -86,11 +76,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -117,16 +115,7 @@
],
'extra' => {
'arg_line' => ' word
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -135,11 +124,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -232,26 +229,23 @@
'type' => 'text_root'
};
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'paragraph_and_macro'}{'contents'}[0];
-$result_trees{'paragraph_and_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'paragraph_and_macro'}{'contents'}[0];
-$result_trees{'paragraph_and_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'parent'} =
$result_trees{'paragraph_and_macro'};
-$result_trees{'paragraph_and_macro'}{'contents'}[1] =
$result_trees{'paragraph_and_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'paragraph_and_macro'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'paragraph_and_macro'}{'contents'}[0];
+$result_trees{'paragraph_and_macro'}{'contents'}[1]{'parent'} =
$result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[2]{'parent'} =
$result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'paragraph_and_macro'}{'contents'}[3];
$result_trees{'paragraph_and_macro'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'paragraph_and_macro'}{'contents'}[3];
$result_trees{'paragraph_and_macro'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'paragraph_and_macro'}{'contents'}[3];
-$result_trees{'paragraph_and_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'paragraph_and_macro'}{'contents'}[3];
-$result_trees{'paragraph_and_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[3]{'parent'} =
$result_trees{'paragraph_and_macro'};
-$result_trees{'paragraph_and_macro'}{'contents'}[4] =
$result_trees{'paragraph_and_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'paragraph_and_macro'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'paragraph_and_macro'}{'contents'}[3];
+$result_trees{'paragraph_and_macro'}{'contents'}[4]{'parent'} =
$result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[5]{'parent'} =
$result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'paragraph_and_macro'}{'contents'}[6];
$result_trees{'paragraph_and_macro'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'paragraph_and_macro'}{'contents'}[6];
$result_trees{'paragraph_and_macro'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'paragraph_and_macro'}{'contents'}[6];
-$result_trees{'paragraph_and_macro'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'paragraph_and_macro'}{'contents'}[6];
-$result_trees{'paragraph_and_macro'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[6]{'parent'} =
$result_trees{'paragraph_and_macro'};
-$result_trees{'paragraph_and_macro'}{'contents'}[7] =
$result_trees{'paragraph_and_macro'}{'contents'}[6]{'extra'}{'spaces_after_command'};
+$result_trees{'paragraph_and_macro'}{'contents'}[7]{'extra'}{'command'} =
$result_trees{'paragraph_and_macro'}{'contents'}[6];
+$result_trees{'paragraph_and_macro'}{'contents'}[7]{'parent'} =
$result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[8]{'parent'} =
$result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[9]{'parent'} =
$result_trees{'paragraph_and_macro'};
$result_trees{'paragraph_and_macro'}{'contents'}[10]{'parent'} =
$result_trees{'paragraph_and_macro'};
Modified: trunk/tp/t/results/macro/protect_comma_macro_line.pl
===================================================================
--- trunk/tp/t/results/macro/protect_comma_macro_line.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/protect_comma_macro_line.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -54,16 +54,7 @@
],
'extra' => {
'arg_line' => ' macrotwo { arg }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -72,11 +63,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -122,10 +121,9 @@
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'protect_comma_macro_line'}{'contents'}[0];
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'protect_comma_macro_line'}{'contents'}[0];
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'protect_comma_macro_line'}{'contents'}[0];
-$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'protect_comma_macro_line'}{'contents'}[0];
-$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'protect_comma_macro_line'};
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'parent'} =
$result_trees{'protect_comma_macro_line'};
-$result_trees{'protect_comma_macro_line'}{'contents'}[1] =
$result_trees{'protect_comma_macro_line'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'protect_comma_macro_line'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'protect_comma_macro_line'}{'contents'}[0];
+$result_trees{'protect_comma_macro_line'}{'contents'}[1]{'parent'} =
$result_trees{'protect_comma_macro_line'};
$result_trees{'protect_comma_macro_line'}{'contents'}[2]{'parent'} =
$result_trees{'protect_comma_macro_line'};
$result_trees{'protect_comma_macro_line'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'protect_comma_macro_line'}{'contents'}[3];
$result_trees{'protect_comma_macro_line'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'protect_comma_macro_line'}{'contents'}[3];
Modified: trunk/tp/t/results/macro/protect_in_body.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/protect_in_body.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -41,16 +41,7 @@
],
'extra' => {
'arg_line' => ' macroone { arg1 , arg2 }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -59,11 +50,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -147,10 +146,9 @@
$result_trees{'protect_in_body'}{'contents'}[0]{'args'}[2]{'parent'} =
$result_trees{'protect_in_body'}{'contents'}[0];
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'protect_in_body'}{'contents'}[0];
$result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'protect_in_body'}{'contents'}[0];
-$result_trees{'protect_in_body'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'protect_in_body'}{'contents'}[0];
-$result_trees{'protect_in_body'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'protect_in_body'};
$result_trees{'protect_in_body'}{'contents'}[0]{'parent'} =
$result_trees{'protect_in_body'};
-$result_trees{'protect_in_body'}{'contents'}[1] =
$result_trees{'protect_in_body'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'protect_in_body'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'protect_in_body'}{'contents'}[0];
+$result_trees{'protect_in_body'}{'contents'}[1]{'parent'} =
$result_trees{'protect_in_body'};
$result_trees{'protect_in_body'}{'contents'}[2]{'parent'} =
$result_trees{'protect_in_body'};
$result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'protect_in_body'}{'contents'}[3];
$result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
Modified: trunk/tp/t/results/macro/protect_in_body_line_arg.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body_line_arg.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/protect_in_body_line_arg.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -41,16 +41,7 @@
],
'extra' => {
'arg_line' => ' macroone { arg1 , arg2 }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -59,11 +50,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -149,10 +148,9 @@
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
-$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
-$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'protect_in_body_line_arg'};
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'parent'} =
$result_trees{'protect_in_body_line_arg'};
-$result_trees{'protect_in_body_line_arg'}{'contents'}[1] =
$result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'protect_in_body_line_arg'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'protect_in_body_line_arg'}{'contents'}[0];
+$result_trees{'protect_in_body_line_arg'}{'contents'}[1]{'parent'} =
$result_trees{'protect_in_body_line_arg'};
$result_trees{'protect_in_body_line_arg'}{'contents'}[2]{'parent'} =
$result_trees{'protect_in_body_line_arg'};
$result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'protect_in_body_line_arg'}{'contents'}[3];
$result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[1];
Modified: trunk/tp/t/results/macro/protect_in_body_one_arg.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body_one_arg.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/protect_in_body_one_arg.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -41,16 +41,7 @@
],
'extra' => {
'arg_line' => ' macroone { arg1 , arg2 }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -59,11 +50,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -142,10 +141,9 @@
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'args'}[2]{'parent'} =
$result_trees{'protect_in_body_one_arg'}{'contents'}[0];
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
-$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
-$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'protect_in_body_one_arg'};
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'parent'} =
$result_trees{'protect_in_body_one_arg'};
-$result_trees{'protect_in_body_one_arg'}{'contents'}[1] =
$result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'protect_in_body_one_arg'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'protect_in_body_one_arg'}{'contents'}[0];
+$result_trees{'protect_in_body_one_arg'}{'contents'}[1]{'parent'} =
$result_trees{'protect_in_body_one_arg'};
$result_trees{'protect_in_body_one_arg'}{'contents'}[2]{'parent'} =
$result_trees{'protect_in_body_one_arg'};
$result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'protect_in_body_one_arg'}{'contents'}[3];
$result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
Modified: trunk/tp/t/results/macro/recursive_call_in_argument.pl
===================================================================
--- trunk/tp/t/results/macro/recursive_call_in_argument.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/recursive_call_in_argument.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' anorecurse{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -79,10 +78,9 @@
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'recursive_call_in_argument'}{'contents'}[0];
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'recursive_call_in_argument'}{'contents'}[0];
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'recursive_call_in_argument'}{'contents'}[0];
-$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'recursive_call_in_argument'}{'contents'}[0];
-$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'recursive_call_in_argument'};
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'parent'} =
$result_trees{'recursive_call_in_argument'};
-$result_trees{'recursive_call_in_argument'}{'contents'}[1] =
$result_trees{'recursive_call_in_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'recursive_call_in_argument'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'recursive_call_in_argument'}{'contents'}[0];
+$result_trees{'recursive_call_in_argument'}{'contents'}[1]{'parent'} =
$result_trees{'recursive_call_in_argument'};
$result_trees{'recursive_call_in_argument'}{'contents'}[2]{'parent'} =
$result_trees{'recursive_call_in_argument'};
$result_trees{'recursive_call_in_argument'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'recursive_call_in_argument'}{'contents'}[3];
$result_trees{'recursive_call_in_argument'}{'contents'}[3]{'parent'} =
$result_trees{'recursive_call_in_argument'};
Modified: trunk/tp/t/results/macro/recursive_call_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/recursive_call_in_macro.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/recursive_call_in_macro.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' anorecurse{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -74,10 +73,9 @@
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'recursive_call_in_macro'}{'contents'}[0];
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'recursive_call_in_macro'}{'contents'}[0];
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'recursive_call_in_macro'}{'contents'}[0];
-$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'recursive_call_in_macro'}{'contents'}[0];
-$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'recursive_call_in_macro'};
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'parent'} =
$result_trees{'recursive_call_in_macro'};
-$result_trees{'recursive_call_in_macro'}{'contents'}[1] =
$result_trees{'recursive_call_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'recursive_call_in_macro'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'recursive_call_in_macro'}{'contents'}[0];
+$result_trees{'recursive_call_in_macro'}{'contents'}[1]{'parent'} =
$result_trees{'recursive_call_in_macro'};
$result_trees{'recursive_call_in_macro'}{'contents'}[2]{'parent'} =
$result_trees{'recursive_call_in_macro'};
$result_trees{'recursive_call_in_macro'}{'contents'}[3]{'parent'} =
$result_trees{'recursive_call_in_macro'};
Modified: trunk/tp/t/results/macro/redefine_texinfo_macro.pl
===================================================================
--- trunk/tp/t/results/macro/redefine_texinfo_macro.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/redefine_texinfo_macro.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -36,16 +36,7 @@
],
'extra' => {
'arg_line' => ' code{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,11 +45,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -101,10 +100,9 @@
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'redefine_texinfo_macro'}{'contents'}[0];
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
-$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
-$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'redefine_texinfo_macro'};
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'parent'} =
$result_trees{'redefine_texinfo_macro'};
-$result_trees{'redefine_texinfo_macro'}{'contents'}[1] =
$result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'redefine_texinfo_macro'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'redefine_texinfo_macro'}{'contents'}[0];
+$result_trees{'redefine_texinfo_macro'}{'contents'}[1]{'parent'} =
$result_trees{'redefine_texinfo_macro'};
$result_trees{'redefine_texinfo_macro'}{'contents'}[2]{'parent'} =
$result_trees{'redefine_texinfo_macro'};
$result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0];
$result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0];
Modified: trunk/tp/t/results/macro/simple_imbricated_macro.pl
===================================================================
--- trunk/tp/t/results/macro/simple_imbricated_macro.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/simple_imbricated_macro.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -40,25 +40,11 @@
],
'extra' => {
'arg_line' => ' bidule {}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'parent' => {}
},
- {}
- ],
- 'extra' => {
- 'arg_line' => ' truc {}
-',
- 'spaces_after_command' => {
+ {
'extra' => {
'command' => {}
},
@@ -67,6 +53,10 @@
',
'type' => 'empty_line_after_command'
}
+ ],
+ 'extra' => {
+ 'arg_line' => ' truc {}
+'
},
'line_nr' => {
'file_name' => '',
@@ -75,11 +65,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -113,16 +111,7 @@
],
'extra' => {
'arg_line' => ' bidule {}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -131,7 +120,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'parent' => {},
'type' => 'paragraph'
@@ -160,23 +157,20 @@
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0];
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0];
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2] =
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'};
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0];
-$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'simple_imbricated_macro'};
+$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
+$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[0];
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'parent'} =
$result_trees{'simple_imbricated_macro'};
-$result_trees{'simple_imbricated_macro'}{'contents'}[1] =
$result_trees{'simple_imbricated_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'simple_imbricated_macro'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'simple_imbricated_macro'}{'contents'}[0];
+$result_trees{'simple_imbricated_macro'}{'contents'}[1]{'parent'} =
$result_trees{'simple_imbricated_macro'};
$result_trees{'simple_imbricated_macro'}{'contents'}[2]{'parent'} =
$result_trees{'simple_imbricated_macro'};
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3];
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
-$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
-$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3];
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3];
-$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[2] =
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
+$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[3];
$result_trees{'simple_imbricated_macro'}{'contents'}[3]{'parent'} =
$result_trees{'simple_imbricated_macro'};
$result_trees{'simple_imbricated_macro'}{'contents'}[4]{'parent'} =
$result_trees{'simple_imbricated_macro'};
$result_trees{'simple_imbricated_macro'}{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'simple_imbricated_macro'}{'contents'}[5];
Modified: trunk/tp/t/results/macro/space_macro_after_end.pl
===================================================================
--- trunk/tp/t/results/macro/space_macro_after_end.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/space_macro_after_end.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' spaces
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -137,10 +136,9 @@
$result_trees{'space_macro_after_end'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'space_macro_after_end'}{'contents'}[0];
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'space_macro_after_end'}{'contents'}[0];
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'space_macro_after_end'}{'contents'}[0];
-$result_trees{'space_macro_after_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'space_macro_after_end'}{'contents'}[0];
-$result_trees{'space_macro_after_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'space_macro_after_end'};
$result_trees{'space_macro_after_end'}{'contents'}[0]{'parent'} =
$result_trees{'space_macro_after_end'};
-$result_trees{'space_macro_after_end'}{'contents'}[1] =
$result_trees{'space_macro_after_end'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'space_macro_after_end'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'space_macro_after_end'}{'contents'}[0];
+$result_trees{'space_macro_after_end'}{'contents'}[1]{'parent'} =
$result_trees{'space_macro_after_end'};
$result_trees{'space_macro_after_end'}{'contents'}[2]{'parent'} =
$result_trees{'space_macro_after_end'};
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'space_macro_after_end'}{'contents'}[3];
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'space_macro_after_end'}{'contents'}[3];
Modified: trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl
===================================================================
--- trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' spaces
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -76,14 +75,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -92,25 +84,31 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'space_macro_after_end_verbatim'};
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'parent'} =
$result_trees{'space_macro_after_end_verbatim'};
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[1] =
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'space_macro_after_end_verbatim'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
+$result_trees{'space_macro_after_end_verbatim'}{'contents'}[1]{'parent'} =
$result_trees{'space_macro_after_end_verbatim'};
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[2]{'parent'} =
$result_trees{'space_macro_after_end_verbatim'};
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'space_macro_after_end_verbatim'};
+$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0];
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'parent'} =
$result_trees{'space_macro_after_end_verbatim'};
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[4] =
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'space_macro_after_end_verbatim'}{'contents'}[4]{'extra'}{'command'}
= $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
+$result_trees{'space_macro_after_end_verbatim'}{'contents'}[4]{'parent'} =
$result_trees{'space_macro_after_end_verbatim'};
$result_texis{'space_macro_after_end_verbatim'} = '@macro spaces
Modified: trunk/tp/t/results/macro/text_before_after.pl
===================================================================
--- trunk/tp/t/results/macro/text_before_after.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/text_before_after.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -37,15 +37,7 @@
],
'extra' => {
'arg_line' => ' mymacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -54,9 +46,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
'text' => 'after
'
}
@@ -71,10 +70,9 @@
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
-$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
-$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'text_before_after'}{'contents'}[0];
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'text_before_after'}{'contents'}[0];
-$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[2] =
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
+$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'text_before_after'}{'contents'}[0];
$result_trees{'text_before_after'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'text_before_after'}{'contents'}[0];
$result_trees{'text_before_after'}{'contents'}[0]{'parent'} =
$result_trees{'text_before_after'};
Modified: trunk/tp/t/results/macro/too_much_args.pl
===================================================================
--- trunk/tp/t/results/macro/too_much_args.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/too_much_args.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -47,16 +47,7 @@
],
'extra' => {
'arg_line' => ' twoargs {first, second}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -65,11 +56,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -97,10 +96,9 @@
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'too_much_args'}{'contents'}[0];
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'too_much_args'}{'contents'}[0];
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'too_much_args'}{'contents'}[0];
-$result_trees{'too_much_args'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'too_much_args'}{'contents'}[0];
-$result_trees{'too_much_args'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'too_much_args'};
$result_trees{'too_much_args'}{'contents'}[0]{'parent'} =
$result_trees{'too_much_args'};
-$result_trees{'too_much_args'}{'contents'}[1] =
$result_trees{'too_much_args'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'too_much_args'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'too_much_args'}{'contents'}[0];
+$result_trees{'too_much_args'}{'contents'}[1]{'parent'} =
$result_trees{'too_much_args'};
$result_trees{'too_much_args'}{'contents'}[2]{'parent'} =
$result_trees{'too_much_args'};
$result_trees{'too_much_args'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'too_much_args'}{'contents'}[3];
$result_trees{'too_much_args'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'too_much_args'}{'contents'}[3];
Modified: trunk/tp/t/results/macro/two_macros_on_a_line.pl
===================================================================
--- trunk/tp/t/results/macro/two_macros_on_a_line.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/macro/two_macros_on_a_line.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' mymacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -97,16 +96,7 @@
],
'extra' => {
'arg_line' => ' mymacrowithargs{arg}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -115,11 +105,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -332,10 +330,9 @@
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'two_macros_on_a_line'}{'contents'}[0];
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'two_macros_on_a_line'}{'contents'}[0];
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'two_macros_on_a_line'}{'contents'}[0];
-$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'two_macros_on_a_line'}{'contents'}[0];
-$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'two_macros_on_a_line'};
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'parent'} =
$result_trees{'two_macros_on_a_line'};
-$result_trees{'two_macros_on_a_line'}{'contents'}[1] =
$result_trees{'two_macros_on_a_line'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'two_macros_on_a_line'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'two_macros_on_a_line'}{'contents'}[0];
+$result_trees{'two_macros_on_a_line'}{'contents'}[1]{'parent'} =
$result_trees{'two_macros_on_a_line'};
$result_trees{'two_macros_on_a_line'}{'contents'}[2]{'parent'} =
$result_trees{'two_macros_on_a_line'};
$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'two_macros_on_a_line'}{'contents'}[3];
$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'args'}[1]{'parent'} =
$result_trees{'two_macros_on_a_line'}{'contents'}[3];
@@ -343,10 +340,9 @@
$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'two_macros_on_a_line'}{'contents'}[3];
$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'two_macros_on_a_line'}{'contents'}[3];
$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[3]{'parent'}
= $result_trees{'two_macros_on_a_line'}{'contents'}[3];
-$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'two_macros_on_a_line'}{'contents'}[3];
-$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'two_macros_on_a_line'};
$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'parent'} =
$result_trees{'two_macros_on_a_line'};
-$result_trees{'two_macros_on_a_line'}{'contents'}[4] =
$result_trees{'two_macros_on_a_line'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'two_macros_on_a_line'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'two_macros_on_a_line'}{'contents'}[3];
+$result_trees{'two_macros_on_a_line'}{'contents'}[4]{'parent'} =
$result_trees{'two_macros_on_a_line'};
$result_trees{'two_macros_on_a_line'}{'contents'}[5]{'parent'} =
$result_trees{'two_macros_on_a_line'};
$result_trees{'two_macros_on_a_line'}{'contents'}[6]{'parent'} =
$result_trees{'two_macros_on_a_line'};
$result_trees{'two_macros_on_a_line'}{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'two_macros_on_a_line'}{'contents'}[7];
Modified: trunk/tp/t/results/macro/zero_argument.pl
===================================================================
--- trunk/tp/t/results/macro/zero_argument.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/macro/zero_argument.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -31,16 +31,7 @@
],
'extra' => {
'arg_line' => ' foo {}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -49,11 +40,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -80,15 +79,7 @@
],
'extra' => {
'arg_line' => ' abar
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -97,25 +88,30 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
$result_trees{'zero_argument'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'zero_argument'}{'contents'}[0];
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'zero_argument'}{'contents'}[0];
$result_trees{'zero_argument'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'zero_argument'}{'contents'}[0];
-$result_trees{'zero_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'zero_argument'}{'contents'}[0];
-$result_trees{'zero_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'zero_argument'};
$result_trees{'zero_argument'}{'contents'}[0]{'parent'} =
$result_trees{'zero_argument'};
-$result_trees{'zero_argument'}{'contents'}[1] =
$result_trees{'zero_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'zero_argument'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'zero_argument'}{'contents'}[0];
+$result_trees{'zero_argument'}{'contents'}[1]{'parent'} =
$result_trees{'zero_argument'};
$result_trees{'zero_argument'}{'contents'}[2]{'parent'} =
$result_trees{'zero_argument'};
$result_trees{'zero_argument'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'zero_argument'}{'contents'}[3];
$result_trees{'zero_argument'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'zero_argument'}{'contents'}[3];
$result_trees{'zero_argument'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'zero_argument'}{'contents'}[3];
-$result_trees{'zero_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'zero_argument'}{'contents'}[3];
-$result_trees{'zero_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'zero_argument'};
$result_trees{'zero_argument'}{'contents'}[3]{'parent'} =
$result_trees{'zero_argument'};
-$result_trees{'zero_argument'}{'contents'}[4] =
$result_trees{'zero_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'zero_argument'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'zero_argument'}{'contents'}[3];
+$result_trees{'zero_argument'}{'contents'}[4]{'parent'} =
$result_trees{'zero_argument'};
$result_texis{'zero_argument'} = '@macro foo {}
in foo
Modified: trunk/tp/t/results/menu/block_commands_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/menu/block_commands_in_menu_description.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/menu/block_commands_in_menu_description.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -582,15 +582,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -599,7 +591,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'parent' => {},
'type' => 'menu_entry_description'
@@ -802,10 +802,10 @@
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[1]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[0];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[5]
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[5]{'extra'}{'command'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[5]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
Modified: trunk/tp/t/results/menu/formats_in_menu.pl
===================================================================
--- trunk/tp/t/results/menu/formats_in_menu.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/menu/formats_in_menu.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -358,15 +358,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -375,8 +367,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [],
'parent' => {},
'type' => 'preformatted'
@@ -894,10 +894,10 @@
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[0];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[2]
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[2]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[3]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
Modified:
trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
===================================================================
--- trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -63,16 +63,7 @@
],
'extra' => {
'arg_line' => ' quotes
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -81,11 +72,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -208,16 +207,7 @@
],
'extra' => {
'arg_line' => ' allquotes
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -226,11 +216,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -4287,10 +4285,9 @@
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[1]
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
+$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
@@ -4311,10 +4308,9 @@
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[15]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[16]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[17]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[4]
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
+$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6];
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
=
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6];
Modified: trunk/tp/t/results/misc_commands/kbdinputstyle.pl
===================================================================
--- trunk/tp/t/results/misc_commands/kbdinputstyle.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/misc_commands/kbdinputstyle.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -85,16 +85,7 @@
],
'extra' => {
'arg_line' => ' codekbdmacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -103,11 +94,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -1358,10 +1357,9 @@
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[8]{'parent'} =
$result_trees{'kbdinputstyle'}{'contents'}[0];
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[9]{'parent'} =
$result_trees{'kbdinputstyle'}{'contents'}[0];
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'parent'} =
$result_trees{'kbdinputstyle'}{'contents'}[0];
-$result_trees{'kbdinputstyle'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'kbdinputstyle'}{'contents'}[0];
-$result_trees{'kbdinputstyle'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'kbdinputstyle'};
$result_trees{'kbdinputstyle'}{'contents'}[0]{'parent'} =
$result_trees{'kbdinputstyle'};
-$result_trees{'kbdinputstyle'}{'contents'}[1] =
$result_trees{'kbdinputstyle'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'kbdinputstyle'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'kbdinputstyle'}{'contents'}[0];
+$result_trees{'kbdinputstyle'}{'contents'}[1]{'parent'} =
$result_trees{'kbdinputstyle'};
$result_trees{'kbdinputstyle'}{'contents'}[2]{'parent'} =
$result_trees{'kbdinputstyle'};
$result_trees{'kbdinputstyle'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'kbdinputstyle'}{'contents'}[3];
$result_trees{'kbdinputstyle'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'kbdinputstyle'}{'contents'}[3];
Modified: trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
===================================================================
--- trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -106,16 +106,7 @@
],
'extra' => {
'arg_line' => ' testallowcodebreakspara {nr}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -124,11 +115,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -173,16 +172,7 @@
],
'extra' => {
'arg_line' => ' testallowcodebreaksexample{}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -191,11 +181,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -2211,10 +2209,9 @@
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[2] =
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
@@ -2222,10 +2219,9 @@
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[3]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5] =
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5]{'extra'}{'command'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[6]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
= $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
Modified: trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -97,16 +97,7 @@
],
'extra' => {
'arg_line' => ' mymacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -115,11 +106,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -1140,10 +1139,9 @@
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[10]{'parent'}
= $result_trees{'star_at_command_formatting'}{'contents'}[0];
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[11]{'parent'}
= $result_trees{'star_at_command_formatting'}{'contents'}[0];
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[12]{'parent'}
= $result_trees{'star_at_command_formatting'}{'contents'}[0];
-$result_trees{'star_at_command_formatting'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'star_at_command_formatting'}{'contents'}[0];
-$result_trees{'star_at_command_formatting'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'star_at_command_formatting'};
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'parent'} =
$result_trees{'star_at_command_formatting'};
-$result_trees{'star_at_command_formatting'}{'contents'}[1] =
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'star_at_command_formatting'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'star_at_command_formatting'}{'contents'}[0];
+$result_trees{'star_at_command_formatting'}{'contents'}[1]{'parent'} =
$result_trees{'star_at_command_formatting'};
$result_trees{'star_at_command_formatting'}{'contents'}[2]{'parent'} =
$result_trees{'star_at_command_formatting'};
$result_trees{'star_at_command_formatting'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'star_at_command_formatting'}{'contents'}[3];
$result_trees{'star_at_command_formatting'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'star_at_command_formatting'}{'contents'}[3];
Modified: trunk/tp/t/results/raw/misc_raw.pl
===================================================================
--- trunk/tp/t/results/raw/misc_raw.pl 2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/raw/misc_raw.pl 2016-06-14 17:58:30 UTC (rev 7224)
@@ -213,15 +213,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -230,7 +222,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
@@ -273,10 +273,10 @@
$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[5];
$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[5];
$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[5];
-$result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'misc_raw'}{'contents'}[5];
-$result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'misc_raw'};
+$result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'} =
$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[0];
$result_trees{'misc_raw'}{'contents'}[5]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[6] =
$result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'};
+$result_trees{'misc_raw'}{'contents'}[6]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[5];
+$result_trees{'misc_raw'}{'contents'}[6]{'parent'} = $result_trees{'misc_raw'};
$result_texis{'misc_raw'} = '
@html
Modified: trunk/tp/t/results/raw/misc_raw_comments.pl
===================================================================
--- trunk/tp/t/results/raw/misc_raw_comments.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/raw/misc_raw_comments.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -267,15 +267,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -284,7 +276,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
@@ -333,10 +333,10 @@
$result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[5];
$result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[5];
$result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[5];
-$result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[5];
-$result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'misc_raw_comments'};
+$result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'}
= $result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[0];
$result_trees{'misc_raw_comments'}{'contents'}[5]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[6] =
$result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'};
+$result_trees{'misc_raw_comments'}{'contents'}[6]{'extra'}{'command'} =
$result_trees{'misc_raw_comments'}{'contents'}[5];
+$result_trees{'misc_raw_comments'}{'contents'}[6]{'parent'} =
$result_trees{'misc_raw_comments'};
$result_texis{'misc_raw_comments'} = '
@html @c comment space
Modified: trunk/tp/t/results/raw/nested_macros.pl
===================================================================
--- trunk/tp/t/results/raw/nested_macros.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/raw/nested_macros.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -50,44 +50,29 @@
],
'extra' => {
'arg_line' => ' othermacro
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'cmdname' => 'macro',
'contents' => [],
'extra' => {
'arg_line' => '
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'parent' => {}
},
- {}
- ],
- 'extra' => {
- 'arg_line' => ' truc { arg, ex}
-',
- 'spaces_after_command' => {
+ {
'extra' => {
'command' => {}
},
@@ -96,6 +81,10 @@
',
'type' => 'empty_line_after_command'
}
+ ],
+ 'extra' => {
+ 'arg_line' => ' truc { arg, ex}
+'
},
'line_nr' => {
'file_name' => '',
@@ -104,7 +93,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
@@ -114,18 +111,15 @@
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'nested_macros'}{'contents'}[0];
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_macros'}{'contents'}[0];
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'nested_macros'}{'contents'}[0];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[2] =
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'};
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_macros'}{'contents'}[0];
+$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
+$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'nested_macros'}{'contents'}[0];
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'nested_macros'}{'contents'}[0];
-$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[4] =
$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'};
-$result_trees{'nested_macros'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'nested_macros'}{'contents'}[0];
-$result_trees{'nested_macros'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'nested_macros'};
+$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
= $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3];
+$result_trees{'nested_macros'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'nested_macros'}{'contents'}[0];
$result_trees{'nested_macros'}{'contents'}[0]{'parent'} =
$result_trees{'nested_macros'};
-$result_trees{'nested_macros'}{'contents'}[1] =
$result_trees{'nested_macros'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'nested_macros'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'nested_macros'}{'contents'}[0];
+$result_trees{'nested_macros'}{'contents'}[1]{'parent'} =
$result_trees{'nested_macros'};
$result_texis{'nested_macros'} = '@macro truc { arg, ex}
in macro \\arg\\
Modified: trunk/tp/t/results/raw/raw_commands_and_end_of_lines.pl
===================================================================
--- trunk/tp/t/results/raw/raw_commands_and_end_of_lines.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/raw/raw_commands_and_end_of_lines.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -1154,15 +1154,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1171,11 +1163,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -1209,15 +1209,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1226,8 +1218,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -1274,15 +1274,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1291,8 +1283,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -1339,14 +1339,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1355,8 +1348,15 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -1403,15 +1403,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1420,8 +1412,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -1468,14 +1468,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1721,20 +1714,20 @@
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26] =
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30] =
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[32]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
@@ -1743,10 +1736,10 @@
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35] =
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[37]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
@@ -1755,10 +1748,10 @@
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40] =
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[42]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
@@ -1767,10 +1760,10 @@
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45] =
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[47]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
@@ -1779,8 +1772,7 @@
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'extra'}{'spaces_after_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[0];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
Modified: trunk/tp/t/results/raw/raw_in_para.pl
===================================================================
--- trunk/tp/t/results/raw/raw_in_para.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/raw/raw_in_para.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -38,15 +38,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -55,11 +47,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -283,10 +283,10 @@
$result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[1];
-$result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[1];
-$result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'raw_in_para'};
+$result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'} =
$result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[0];
$result_trees{'raw_in_para'}{'contents'}[1]{'parent'} =
$result_trees{'raw_in_para'};
-$result_trees{'raw_in_para'}{'contents'}[2] =
$result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'raw_in_para'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'raw_in_para'}{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[2]{'parent'} =
$result_trees{'raw_in_para'};
$result_trees{'raw_in_para'}{'contents'}[3]{'parent'} =
$result_trees{'raw_in_para'};
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[4];
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1];
Modified: trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl
===================================================================
--- trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -27,15 +27,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -44,11 +36,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -82,15 +82,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -99,8 +91,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -166,15 +166,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -183,8 +175,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'args' => [
{
'contents' => [
@@ -274,15 +274,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -291,8 +283,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -597,15 +597,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -614,8 +606,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -741,15 +741,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -758,11 +750,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -873,15 +873,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -890,8 +882,16 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
'contents' => [
{
'parent' => {},
@@ -961,20 +961,20 @@
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[1] =
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[1]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[1]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[2]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[5] =
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[5]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[5]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[7]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
@@ -986,10 +986,10 @@
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[3] =
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[3]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0];
@@ -1007,10 +1007,10 @@
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[12] =
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[12]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[12]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[14]{'parent'} =
$result_trees{'verbatim_and_verbatiminclude'};
@@ -1066,10 +1066,10 @@
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[3] =
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[3]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[5];
@@ -1093,10 +1093,10 @@
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[4] =
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[4]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[4]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[5]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6]{'args'}[0];
@@ -1118,10 +1118,10 @@
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[0];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[4] =
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[4]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[4]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5]{'parent'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[6];
Modified: trunk/tp/t/results/raw/verbatim_in_brace_command.pl
===================================================================
--- trunk/tp/t/results/raw/verbatim_in_brace_command.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/raw/verbatim_in_brace_command.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -57,15 +57,7 @@
],
'extra' => {
'invalid_nesting' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -74,10 +66,18 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
'
}
],
@@ -90,10 +90,10 @@
$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
-$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
-$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'verbatim_in_brace_command'};
+$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'}
= $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[0];
$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'parent'} =
$result_trees{'verbatim_in_brace_command'};
-$result_trees{'verbatim_in_brace_command'}{'contents'}[2] =
$result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'};
+$result_trees{'verbatim_in_brace_command'}{'contents'}[2]{'extra'}{'command'}
= $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
+$result_trees{'verbatim_in_brace_command'}{'contents'}[2]{'parent'} =
$result_trees{'verbatim_in_brace_command'};
$result_trees{'verbatim_in_brace_command'}{'contents'}[3]{'parent'} =
$result_trees{'verbatim_in_brace_command'};
$result_texis{'verbatim_in_brace_command'} = '@samp{
Modified: trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -71,16 +71,7 @@
],
'extra' => {
'arg_line' => ' macro1 { arg1 , arg2 }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -89,11 +80,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -162,10 +161,9 @@
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'args'}[2]{'parent'}
= $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
-$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
-$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'comma_value_in_macro_arg'};
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'parent'} =
$result_trees{'comma_value_in_macro_arg'};
-$result_trees{'comma_value_in_macro_arg'}{'contents'}[3] =
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'comma_value_in_macro_arg'}{'contents'}[3]{'extra'}{'command'} =
$result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
+$result_trees{'comma_value_in_macro_arg'}{'contents'}[3]{'parent'} =
$result_trees{'comma_value_in_macro_arg'};
$result_trees{'comma_value_in_macro_arg'}{'contents'}[4]{'parent'} =
$result_trees{'comma_value_in_macro_arg'};
$result_trees{'comma_value_in_macro_arg'}{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'comma_value_in_macro_arg'}{'contents'}[5];
$result_trees{'comma_value_in_macro_arg'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comma_value_in_macro_arg'}{'contents'}[5]{'contents'}[1]{'args'}[0];
Modified: trunk/tp/t/results/value_and_macro/macro_in_value.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/macro_in_value.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/value_and_macro/macro_in_value.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -43,16 +43,7 @@
],
'extra' => {
'arg_line' => ' ab
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -61,11 +52,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -134,10 +133,9 @@
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_value'}{'contents'}[0];
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'macro_in_value'}{'contents'}[0];
$result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'macro_in_value'}{'contents'}[0];
-$result_trees{'macro_in_value'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_in_value'}{'contents'}[0];
-$result_trees{'macro_in_value'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_in_value'};
$result_trees{'macro_in_value'}{'contents'}[0]{'parent'} =
$result_trees{'macro_in_value'};
-$result_trees{'macro_in_value'}{'contents'}[1] =
$result_trees{'macro_in_value'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_in_value'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_in_value'}{'contents'}[0];
+$result_trees{'macro_in_value'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_value'};
$result_trees{'macro_in_value'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_value'};
$result_trees{'macro_in_value'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'macro_in_value'}{'contents'}[3];
$result_trees{'macro_in_value'}{'contents'}[3]{'args'}[1]{'parent'} =
$result_trees{'macro_in_value'}{'contents'}[3];
Modified: trunk/tp/t/results/value_and_macro/value_in_macro_body.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/value_in_macro_body.pl 2016-06-13
17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/value_and_macro/value_in_macro_body.pl 2016-06-14
17:58:30 UTC (rev 7224)
@@ -66,16 +66,7 @@
],
'extra' => {
'arg_line' => ' testvaluebody { arg }
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -84,11 +75,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -139,10 +138,9 @@
$result_trees{'value_in_macro_body'}{'contents'}[2]{'args'}[1]{'parent'} =
$result_trees{'value_in_macro_body'}{'contents'}[2];
$result_trees{'value_in_macro_body'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'value_in_macro_body'}{'contents'}[2];
$result_trees{'value_in_macro_body'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'value_in_macro_body'}{'contents'}[2];
-$result_trees{'value_in_macro_body'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'value_in_macro_body'}{'contents'}[2];
-$result_trees{'value_in_macro_body'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'value_in_macro_body'};
$result_trees{'value_in_macro_body'}{'contents'}[2]{'parent'} =
$result_trees{'value_in_macro_body'};
-$result_trees{'value_in_macro_body'}{'contents'}[3] =
$result_trees{'value_in_macro_body'}{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'value_in_macro_body'}{'contents'}[3]{'extra'}{'command'} =
$result_trees{'value_in_macro_body'}{'contents'}[2];
+$result_trees{'value_in_macro_body'}{'contents'}[3]{'parent'} =
$result_trees{'value_in_macro_body'};
$result_trees{'value_in_macro_body'}{'contents'}[4]{'parent'} =
$result_trees{'value_in_macro_body'};
$result_trees{'value_in_macro_body'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'value_in_macro_body'}{'contents'}[5];
$result_trees{'value_in_macro_body'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'value_in_macro_body'}{'contents'}[5]{'contents'}[1]{'args'}[0];
Modified: trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
2016-06-13 17:49:44 UTC (rev 7223)
+++ trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
2016-06-14 17:58:30 UTC (rev 7224)
@@ -72,16 +72,7 @@
'extra' => {
'arg_line' => ' testvalue { arg , address@hidden }
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -90,11 +81,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -120,10 +119,9 @@
$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'args'}[2]{'parent'}
= $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
-$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
-$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'value_in_macro_formal_arg'};
$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'parent'} =
$result_trees{'value_in_macro_formal_arg'};
-$result_trees{'value_in_macro_formal_arg'}{'contents'}[3] =
$result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'value_in_macro_formal_arg'}{'contents'}[3]{'extra'}{'command'}
= $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
+$result_trees{'value_in_macro_formal_arg'}{'contents'}[3]{'parent'} =
$result_trees{'value_in_macro_formal_arg'};
$result_trees{'value_in_macro_formal_arg'}{'contents'}[4]{'parent'} =
$result_trees{'value_in_macro_formal_arg'};
$result_trees{'value_in_macro_formal_arg'}{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'value_in_macro_formal_arg'}{'contents'}[5];
$result_trees{'value_in_macro_formal_arg'}{'contents'}[5]{'parent'} =
$result_trees{'value_in_macro_formal_arg'};
Modified: trunk/tp/t/results/xml_tests/commands_and_spaces.pl
===================================================================
--- trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -1325,15 +1325,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1342,9 +1334,17 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -2478,10 +2478,10 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[30] =
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[30]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[30]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[31]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32];
Modified: trunk/tp/t/results/xml_tests/macro_and_args.pl
===================================================================
--- trunk/tp/t/results/xml_tests/macro_and_args.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/xml_tests/macro_and_args.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -29,16 +29,7 @@
'contents' => [],
'extra' => {
'arg_line' => ' good { aaa, 2b-bb}
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -47,11 +38,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -82,16 +81,7 @@
'extra' => {
'arg_line' => ' bad { ggg"@@^_ ff, nnn_b, ccc v}
',
- 'invalid_syntax' => 1,
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'invalid_syntax' => 1
},
'line_nr' => {
'file_name' => '',
@@ -100,26 +90,32 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
$result_trees{'macro_and_args'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_and_args'}{'contents'}[0];
$result_trees{'macro_and_args'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'macro_and_args'}{'contents'}[0];
$result_trees{'macro_and_args'}{'contents'}[0]{'args'}[2]{'parent'} =
$result_trees{'macro_and_args'}{'contents'}[0];
-$result_trees{'macro_and_args'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_and_args'}{'contents'}[0];
-$result_trees{'macro_and_args'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_and_args'};
$result_trees{'macro_and_args'}{'contents'}[0]{'parent'} =
$result_trees{'macro_and_args'};
-$result_trees{'macro_and_args'}{'contents'}[1] =
$result_trees{'macro_and_args'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_and_args'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_and_args'}{'contents'}[0];
+$result_trees{'macro_and_args'}{'contents'}[1]{'parent'} =
$result_trees{'macro_and_args'};
$result_trees{'macro_and_args'}{'contents'}[2]{'parent'} =
$result_trees{'macro_and_args'};
$result_trees{'macro_and_args'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'macro_and_args'}{'contents'}[3];
$result_trees{'macro_and_args'}{'contents'}[3]{'args'}[1]{'parent'} =
$result_trees{'macro_and_args'}{'contents'}[3];
$result_trees{'macro_and_args'}{'contents'}[3]{'args'}[2]{'parent'} =
$result_trees{'macro_and_args'}{'contents'}[3];
$result_trees{'macro_and_args'}{'contents'}[3]{'args'}[3]{'parent'} =
$result_trees{'macro_and_args'}{'contents'}[3];
-$result_trees{'macro_and_args'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'macro_and_args'}{'contents'}[3];
-$result_trees{'macro_and_args'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_and_args'};
$result_trees{'macro_and_args'}{'contents'}[3]{'parent'} =
$result_trees{'macro_and_args'};
-$result_trees{'macro_and_args'}{'contents'}[4] =
$result_trees{'macro_and_args'}{'contents'}[3]{'extra'}{'spaces_after_command'};
+$result_trees{'macro_and_args'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'macro_and_args'}{'contents'}[3];
+$result_trees{'macro_and_args'}{'contents'}[4]{'parent'} =
$result_trees{'macro_and_args'};
$result_texis{'macro_and_args'} = '@macro good { aaa, 2b-bb}
@end macro
Modified: trunk/tp/t/results/xml_tests/spaces_info_lost.pl
===================================================================
--- trunk/tp/t/results/xml_tests/spaces_info_lost.pl 2016-06-13 17:49:44 UTC
(rev 7223)
+++ trunk/tp/t/results/xml_tests/spaces_info_lost.pl 2016-06-14 17:58:30 UTC
(rev 7224)
@@ -131,15 +131,7 @@
}
],
'extra' => {
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -148,7 +140,15 @@
},
'parent' => {}
},
- {}
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
],
'type' => 'text_root'
};
@@ -175,10 +175,10 @@
$result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'spaces_info_lost'}{'contents'}[2];
$result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'spaces_info_lost'}{'contents'}[2];
$result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'spaces_info_lost'}{'contents'}[2];
-$result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'spaces_info_lost'}{'contents'}[2];
-$result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'spaces_info_lost'};
+$result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'}
= $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[0];
$result_trees{'spaces_info_lost'}{'contents'}[2]{'parent'} =
$result_trees{'spaces_info_lost'};
-$result_trees{'spaces_info_lost'}{'contents'}[3] =
$result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'spaces_info_lost'}{'contents'}[3]{'extra'}{'command'} =
$result_trees{'spaces_info_lost'}{'contents'}[2];
+$result_trees{'spaces_info_lost'}{'contents'}[3]{'parent'} =
$result_trees{'spaces_info_lost'};
$result_texis{'spaces_info_lost'} = '@example text on example line
in bad example
Modified: trunk/tp/t/results/xtable/table_nested.pl
===================================================================
--- trunk/tp/t/results/xtable/table_nested.pl 2016-06-13 17:49:44 UTC (rev
7223)
+++ trunk/tp/t/results/xtable/table_nested.pl 2016-06-14 17:58:30 UTC (rev
7224)
@@ -151,16 +151,7 @@
],
'extra' => {
'arg_line' => ' myvtable
-',
- 'spaces_after_command' => {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
+'
},
'line_nr' => {
'file_name' => '',
@@ -169,11 +160,19 @@
},
'parent' => {}
},
- {},
{
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
'text' => '
',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
'type' => 'empty_line'
},
{
@@ -2463,10 +2462,9 @@
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[19]{'parent'} =
$result_trees{'table_nested'}{'contents'}[0];
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[20]{'parent'} =
$result_trees{'table_nested'}{'contents'}[0];
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[21]{'parent'} =
$result_trees{'table_nested'}{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
= $result_trees{'table_nested'}{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'table_nested'};
$result_trees{'table_nested'}{'contents'}[0]{'parent'} =
$result_trees{'table_nested'};
-$result_trees{'table_nested'}{'contents'}[1] =
$result_trees{'table_nested'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'table_nested'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'table_nested'}{'contents'}[0];
+$result_trees{'table_nested'}{'contents'}[1]{'parent'} =
$result_trees{'table_nested'};
$result_trees{'table_nested'}{'contents'}[2]{'parent'} =
$result_trees{'table_nested'};
$result_trees{'table_nested'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'table_nested'}{'contents'}[3];
$result_trees{'table_nested'}{'contents'}[3]{'parent'} =
$result_trees{'table_nested'};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7224] closed raw block do not call _start_empty_line_after_command,
gavinsmith0123 <=