|
| From: | Patrice Dumas |
| Date: | Thu, 9 May 2024 15:52:49 -0400 (EDT) |
branch: master
commit 09b74ccfd2034611902abba7b01ed74e52d60434
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu May 9 15:02:49 2024 +0200
* tp/Texinfo/ParserNonXS.pm (_split_delimiters),
tp/Texinfo/XS/parsetexi/def.c (split_delimiters): put text appearing
along with delimiters in def_aggregate containers.
---
ChangeLog | 6 +
tp/Texinfo/ParserNonXS.pm | 8 +-
tp/Texinfo/XS/parsetexi/def.c | 9 +-
tp/t/results/converters_tests/complex_nestings.pl | 63 +-
.../conversion_with_undef_customization.pl | 14 +-
.../converters_tests/definition_commands.pl | 1274 +++++++++++++++++---
.../converters_tests/frenchspacing_and_code.pl | 84 +-
.../converters_tests/test_deftypefnnewline.pl | 42 +-
tp/t/results/coverage/def.pl | 140 ++-
tp/t/results/def/adjacent_defline.pl | 21 +-
tp/t/results/def/all_commands.pl | 105 +-
tp/t/results/def/all_commands_delimiters.pl | 756 ++++++++++--
.../def/all_commands_delimiters_printindex.pl | 756 ++++++++++--
tp/t/results/def/all_commands_printindex.pl | 105 +-
tp/t/results/def/bracketed_arg_no_space.pl | 7 +-
tp/t/results/def/code_in_def.pl | 7 +-
tp/t/results/def/comment_index_before_defline.pl | 14 +-
tp/t/results/def/def_defx_mismatch.pl | 35 +-
tp/t/results/def/def_groupings_args.pl | 7 +-
tp/t/results/def/deftypeline.pl | 14 +-
tp/t/results/def/defx_after_comment.pl | 21 +-
tp/t/results/def/defx_after_comment_in_example.pl | 21 +-
tp/t/results/def/defx_after_empty_line.pl | 21 +-
.../def/defx_after_empty_line_in_example.pl | 21 +-
tp/t/results/def/defx_after_paragraph_end.pl | 21 +-
.../def/defx_after_preformatted_with_text.pl | 21 +-
tp/t/results/def/defx_after_text.pl | 21 +-
tp/t/results/def/defx_in_example.pl | 21 +-
tp/t/results/def/double_command.pl | 70 +-
tp/t/results/def/empty_def_arguments.pl | 14 +-
tp/t/results/def/empty_def_command.pl | 14 +-
tp/t/results/def/empty_deftype.pl | 84 +-
tp/t/results/def/end_of_line_end_file.pl | 7 +-
tp/t/results/def/end_of_line_protect_at_end.pl | 7 +-
tp/t/results/def/end_of_lines_protected.pl | 28 +-
.../def/end_of_lines_protected_in_footnote.pl | 35 +-
.../def/end_of_lines_protected_non_ascii.pl | 28 +-
tp/t/results/def/inter_item_commands_in_def.pl | 21 +-
.../def/inter_item_commands_in_def_in_example.pl | 21 +-
tp/t/results/def/leading_space_in_def_arg.pl | 7 +-
tp/t/results/def/multiple_defline.pl | 21 +-
tp/t/results/def/no_category_or_no_name.pl | 14 +-
tp/t/results/def/not_closed.pl | 28 +-
tp/t/results/def/omit_def_space.pl | 21 +-
tp/t/results/def/space_in_def_for_index.pl | 14 +-
tp/t/results/def/text_block_before_defline.pl | 14 +-
tp/t/results/def/wrong_braces_simple.pl | 203 +++-
tp/t/results/def/wrong_braces_with_end_of_lines.pl | 28 +-
.../deftypefnnewline_for_copying_after.pl | 14 +-
.../deftypefnnewline_for_copying_before.pl | 14 +-
.../indices/printindex_index_entry_in_copying.pl | 14 +-
...ndex_index_entry_in_copying_no_insertcopying.pl | 14 +-
tp/t/results/info_tests/colon_in_index_entry.pl | 35 +-
tp/t/results/info_tests/def_in_copying.pl | 28 +-
tp/t/results/info_tests/test_index.pl | 28 +-
.../translation_in_parser_in_translation.pl | 7 +-
.../results/invalid_nestings/block_not_matching.pl | 7 +-
.../invalid_nestings/def_in_style_command.pl | 7 +-
.../def_not_closed_in_menu_description.pl | 7 +-
.../invalid_nestings/section_on_defx_line.pl | 14 +-
tp/t/results/languages/documentlanguage.pl | 7 +-
tp/t/results/languages/documentlanguage_option.pl | 7 +-
tp/t/results/languages/documentlanguage_unknown.pl | 7 +-
.../results/languages/multiple_documentlanguage.pl | 21 +-
tp/t/results/languages/multiple_in_preamble.pl | 21 +-
.../languages/multiple_in_preamble_before_node.pl | 14 +-
tp/t/results/languages/multiple_lang_chapters.pl | 21 +-
.../languages/multiple_lang_chapters_latex.pl | 21 +-
.../languages/multiple_lang_chapters_texi2html.pl | 21 +-
tp/t/results/languages/simple_documentlanguage.pl | 7 +-
tp/t/results/languages/unknown_region.pl | 7 +-
tp/t/results/latex_tests/brace_in_index.pl | 7 +-
tp/t/results/linemacro/api_doc_with_linemacro.pl | 28 +-
.../linemacro/block_begin_end_in_linemacro_call.pl | 23 +-
.../results/linemacro/last_argument_with_braces.pl | 98 +-
tp/t/results/linemacro/nested_linemacro_calls.pl | 21 +-
.../linemacro/newline_and_continuation_in_brace.pl | 44 +-
tp/t/results/linemacro/protected_spaces_on_line.pl | 77 +-
.../linemacro/simple_nested_linemacro_calls.pl | 28 +-
.../linemacro/spaces_after_command_in_call.pl | 21 +-
...paces_after_macro_linemacro_commands_in_call.pl | 51 +-
.../spaces_after_unknown_command_in_call.pl | 21 +-
tp/t/results/linemacro/spaces_in_args.pl | 28 +-
tp/t/results/linemacro/spaces_in_call.pl | 14 +-
tp/t/results/macro/macro_in_def_delimiters.pl | 181 ++-
tp/t/results/menu/menu_in_deffn.pl | 7 +-
tp/t/results/preformatted/def_in_example.pl | 7 +-
87 files changed, 4507 insertions(+), 806 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 963af1d9db..9e6f960b55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-05-09 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_split_delimiters),
+ tp/Texinfo/XS/parsetexi/def.c (split_delimiters): put text appearing
+ along with delimiters in def_aggregate containers.
+
2024-05-09 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_split_delimiters)
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 5a117c3102..b038555bdf 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3146,10 +3146,12 @@ sub _split_delimiters
}
while (1) {
if ($text =~ s/^([^$chars]+)//) {
- push @elements, {'text' => $1, 'parent' => $root->{'parent'}};
+ my $new = {'type' => 'def_aggregate', 'parent' => $root->{'parent'}};
+ $new->{'contents'} = [{'text' => $1, 'parent' => $new}];
+ push @elements, $new;
$current_position = Texinfo::Common::relocate_source_marks(
- $remaining_source_marks, $elements[-1],
- $current_position, length($1));
+ $remaining_source_marks, $new->{'contents'}->[0],
+ $current_position, length($1));
} elsif ($text =~ s/^([$chars])//) {
push @elements, {'text' => $1, 'type' => 'delimiter',
'extra' => {'def_role' => 'delimiter'},
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index 687c2cc22b..e8a37bb8c0 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -252,9 +252,9 @@ split_delimiters (ELEMENT *current, int starting_idx)
continue;
}
+ ELEMENT *new_text = new_element (ET_NONE);
len = strcspn (p, chars);
- new = new_element (ET_NONE);
- text_append_n (&new->text, p, len);
+ text_append_n (&new_text->text, p, len);
if (u8_text)
{
@@ -262,10 +262,13 @@ split_delimiters (ELEMENT *current, int starting_idx)
u8_p += u8_len;
current_position
- = relocate_source_marks (&(e->source_mark_list), new,
+ = relocate_source_marks (&(e->source_mark_list), new_text,
current_position, u8_len);
}
+ new = new_element (ET_def_aggregate);
+ add_to_element_contents (new, new_text);
+
insert_into_contents (current, new, i++);
if (!*(p += len))
break;
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index 89fd976703..21859663dc 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -206,10 +206,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -342,10 +347,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'no'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'no'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -355,10 +365,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -443,10 +458,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -456,10 +476,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'now'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'now'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -469,10 +494,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'the'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'the'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -482,10 +512,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -566,10 +601,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'variable-name'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'variable-name'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -660,10 +700,15 @@ $result_trees{'complex_nestings'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'other-variable'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'other-variable'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git
a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
index 8aa48925ce..5698128dc0 100644
--- a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
+++ b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
@@ -465,10 +465,15 @@ $result_trees{'conversion_with_undef_customization'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -492,10 +497,15 @@ $result_trees{'conversion_with_undef_customization'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'aa'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index 2c98128b14..ade0dca9ad 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -180,10 +180,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a---rg1'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a---rg1'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -193,10 +198,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rg2'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rg2'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -842,10 +852,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -862,10 +877,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -875,10 +895,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -895,10 +920,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -929,10 +959,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'default'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'default'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1012,10 +1047,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1049,10 +1089,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1062,10 +1107,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1099,10 +1149,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -1143,10 +1198,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1232,10 +1292,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1269,10 +1334,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1282,10 +1352,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1319,10 +1394,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -1363,10 +1443,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1452,10 +1537,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1489,10 +1579,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1502,10 +1597,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1539,10 +1639,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -1583,10 +1688,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'slanted'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1672,10 +1782,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1709,10 +1824,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1722,10 +1842,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1759,10 +1884,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -1803,10 +1933,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'code'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1892,10 +2027,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1929,10 +2069,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1942,10 +2087,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1979,10 +2129,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -2023,10 +2178,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 't'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2112,10 +2272,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2162,10 +2327,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2175,10 +2345,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2225,10 +2400,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -2282,10 +2462,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 't:b'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2371,10 +2556,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2421,10 +2611,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2434,10 +2629,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2484,10 +2684,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -2541,10 +2746,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2630,10 +2840,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2680,10 +2895,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2693,10 +2913,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2743,10 +2968,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -2800,10 +3030,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2889,10 +3124,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2939,10 +3179,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2952,10 +3197,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3002,10 +3252,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3059,10 +3314,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:code'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r:code'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3148,10 +3408,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3198,10 +3463,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3211,10 +3481,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3261,10 +3536,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3318,10 +3598,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:t'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r:t'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3407,10 +3692,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3457,10 +3747,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3470,10 +3765,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3520,10 +3820,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3577,10 +3882,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code:var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'code:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3666,10 +3976,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3716,10 +4031,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3729,10 +4049,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3779,10 +4104,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3836,10 +4166,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 't:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3925,10 +4260,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3975,10 +4315,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3988,10 +4333,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4038,10 +4388,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -4095,10 +4450,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'code:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4184,10 +4544,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4234,10 +4599,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'from'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'from'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4247,10 +4617,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'to'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'to'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4297,10 +4672,15 @@ $result_trees{'definition_commands'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inc'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -4354,10 +4734,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 't:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4498,10 +4883,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'va---riable'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'va---riable'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4511,10 +4901,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'default'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'default'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4618,10 +5013,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4731,10 +5131,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4844,10 +5249,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'slanted'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4957,10 +5367,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'code'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5070,10 +5485,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 't'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5196,10 +5616,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 't:b'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5322,10 +5747,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5448,10 +5878,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5574,10 +6009,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:code'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r:code'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5700,10 +6140,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:t'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r:t'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5826,10 +6271,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code:var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'code:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5952,10 +6402,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 't:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6078,10 +6533,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'code:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6204,10 +6664,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 't:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -8705,10 +9170,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -8756,10 +9226,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -9004,10 +9479,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -9068,10 +9548,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -9757,10 +10242,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -9808,10 +10298,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -10068,10 +10563,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'function'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'function'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -10081,10 +10581,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '&rest'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '&rest'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -10094,10 +10599,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -10286,10 +10796,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'function'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'function'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -10343,10 +10858,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'argument'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'argument'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -10514,10 +11034,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'argument'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'argument'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -10627,10 +11152,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'word'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'word'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -10999,10 +11529,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -11057,10 +11592,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -11115,10 +11655,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'default'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'default'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -11214,10 +11759,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -11289,10 +11839,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -11364,10 +11919,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -11469,10 +12029,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -11544,10 +12109,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -11619,10 +12189,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -11724,10 +12299,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -11799,10 +12379,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -11874,10 +12459,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'slanted'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -11979,10 +12569,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -12054,10 +12649,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -12129,10 +12729,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'code'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -12234,10 +12839,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -12309,10 +12919,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -12384,10 +12999,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 't'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -12489,10 +13109,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -12577,10 +13202,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -12665,10 +13295,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:b'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 't:b'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -12770,10 +13405,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -12858,10 +13498,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -12946,10 +13591,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:var'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -13051,10 +13701,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -13139,10 +13794,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -13227,10 +13887,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -13332,10 +13997,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -13420,10 +14090,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -13508,10 +14183,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:code'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r:code'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -13613,10 +14293,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -13701,10 +14386,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -13789,10 +14479,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:t'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r:t'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -13894,10 +14589,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -13982,10 +14682,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -14070,10 +14775,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code:var'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'code:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -14175,10 +14885,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -14263,10 +14978,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -14351,10 +15071,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:var'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 't:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -14456,10 +15181,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -14544,10 +15274,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -14632,10 +15367,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'code:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -14737,10 +15477,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -14825,10 +15570,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -14913,10 +15663,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 't:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -15080,10 +15835,15 @@ $result_trees{'definition_commands'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'i--nt'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'i--nt'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -15138,10 +15898,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -15196,10 +15961,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'default'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'default'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -15371,10 +16141,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -15429,10 +16204,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -15610,10 +16390,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -15668,10 +16453,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -15849,10 +16639,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -15907,10 +16702,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'slanted'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -16088,10 +16888,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -16146,10 +16951,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'code'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -16327,10 +17137,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -16385,10 +17200,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 't'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -16579,10 +17399,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -16637,10 +17462,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:b'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 't:b'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -16831,10 +17661,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -16889,10 +17724,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:var'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -17083,10 +17923,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -17141,10 +17986,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -17335,10 +18185,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -17393,10 +18248,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:code'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r:code'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -17587,10 +18447,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -17645,10 +18510,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r:t'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'r:t'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -17839,10 +18709,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -17897,10 +18772,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code:var'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'code:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -18091,10 +18971,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -18149,10 +19034,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:var'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 't:var'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -18343,10 +19233,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -18401,10 +19296,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'code:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'code:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -18595,10 +19495,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -18653,10 +19558,15 @@ $result_trees{'definition_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 't:slanted'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 't:slanted'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 68bd84bd2b..574414dd02 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -374,10 +374,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg?'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arg?'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -387,10 +392,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'e:'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'e:'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -400,10 +410,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'f.'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'f.'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -679,10 +694,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'varg?'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'varg?'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -692,10 +712,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 've:'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 've:'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -705,10 +730,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'f.'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'f.'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1212,10 +1242,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'narg?'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'narg?'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1225,10 +1260,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'e:'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'e:'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1238,10 +1278,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'f.'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'f.'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1517,10 +1562,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'varg?'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'varg?'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1530,10 +1580,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 've:'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 've:'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1543,10 +1598,15 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'f.'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'f.'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 13523f86b6..71499f0602 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -272,10 +272,15 @@ $result_trees{'test_deftypefnnewline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -579,10 +584,15 @@ $result_trees{'test_deftypefnnewline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1231,10 +1241,15 @@ $result_trees{'test_deftypefnnewline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1601,10 +1616,15 @@ $result_trees{'test_deftypefnnewline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments2...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arguments2...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1908,10 +1928,15 @@ $result_trees{'test_deftypefnnewline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments2...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments2...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2560,10 +2585,15 @@ $result_trees{'test_deftypefnnewline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments2...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments2...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index d9d0008c1c..e4a1c71970 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -61,10 +61,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -193,10 +198,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'ar--guments'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'ar--guments'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -213,10 +223,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'more'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'more'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -226,10 +241,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -257,10 +277,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'even'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'even'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -270,10 +295,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'more'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'more'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -283,10 +313,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'so'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'so'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -428,10 +463,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -441,10 +481,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -862,10 +907,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'truc'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -970,10 +1020,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'truc'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1225,10 +1280,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'by'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'by'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1238,10 +1298,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1251,10 +1316,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'comment'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'comment'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1345,10 +1415,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1358,10 +1433,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'deff'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'deff'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1371,10 +1451,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'item'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'item'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1465,10 +1550,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'before'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'before'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1478,10 +1568,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'end'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'end'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1491,10 +1586,15 @@ $result_trees{'def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'deffn'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'deffn'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/adjacent_defline.pl
b/tp/t/results/def/adjacent_defline.pl
index 189050bbd3..06554b119f 100644
--- a/tp/t/results/def/adjacent_defline.pl
+++ b/tp/t/results/def/adjacent_defline.pl
@@ -74,10 +74,15 @@ $result_trees{'adjacent_defline'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bar'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bar'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -160,10 +165,15 @@ $result_trees{'adjacent_defline'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bar2'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bar2'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -180,10 +190,15 @@ $result_trees{'adjacent_defline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'baz2'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'baz2'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index ad7c1f53e9..51d24b3654 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -172,10 +172,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -441,10 +446,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -746,10 +756,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1439,10 +1454,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1819,10 +1839,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2026,10 +2051,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2409,10 +2439,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--ttributes...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--ttributes...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2546,10 +2581,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2683,10 +2723,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2820,10 +2865,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3081,10 +3131,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg--var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg--var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3094,10 +3149,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg--var1'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg--var1'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3373,10 +3433,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4086,10 +4151,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4316,10 +4386,15 @@ $result_trees{'all_commands'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/all_commands_delimiters.pl
b/tp/t/results/def/all_commands_delimiters.pl
index 4a2ee11841..f2e271aa05 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -153,10 +153,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -166,10 +171,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -179,10 +189,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -206,10 +221,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -309,10 +329,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -346,10 +371,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -373,10 +403,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -547,10 +582,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -560,10 +600,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -573,10 +618,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -600,10 +650,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -703,10 +758,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -740,10 +800,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -767,10 +832,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -913,10 +983,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -964,10 +1039,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1148,10 +1228,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1199,10 +1284,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1264,10 +1354,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1277,10 +1372,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1290,10 +1390,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1421,10 +1526,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -1458,10 +1568,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1485,10 +1600,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'ct'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'ct'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -1520,10 +1640,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1834,10 +1959,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => ':in'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => ':in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1847,10 +1977,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'out'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'out'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1860,10 +1995,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'stack;'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'stack;'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1904,10 +2044,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => ':in'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => ':in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1917,10 +2062,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'integer'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'integer'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1937,10 +2087,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => ';'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => ';'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1950,10 +2105,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => ';barg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => ';barg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1963,10 +2123,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'aarg;'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'aarg;'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1976,10 +2141,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => ';'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => ';'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1989,10 +2159,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'end'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'end'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2142,10 +2317,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2155,10 +2335,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2168,10 +2353,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2195,10 +2385,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2298,10 +2493,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -2335,10 +2535,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2362,10 +2567,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2483,10 +2693,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'car'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'car'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2496,10 +2711,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'cdr'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'cdr'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2523,10 +2743,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2536,10 +2761,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2549,10 +2779,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2576,10 +2811,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2679,10 +2919,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -2716,10 +2961,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2743,10 +2993,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2896,10 +3151,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2909,10 +3169,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2922,10 +3187,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2949,10 +3219,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3052,10 +3327,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3089,10 +3369,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3116,10 +3401,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3300,10 +3590,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3313,10 +3608,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3326,10 +3626,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3353,10 +3658,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3456,10 +3766,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3493,10 +3808,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3520,10 +3840,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3727,10 +4052,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3740,10 +4070,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3753,10 +4088,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3780,10 +4120,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3883,10 +4228,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3920,10 +4270,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3947,10 +4302,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4185,10 +4545,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4198,10 +4563,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4211,10 +4581,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4238,10 +4613,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4341,10 +4721,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -4378,10 +4763,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4405,10 +4795,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4629,10 +5024,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4642,10 +5042,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4872,10 +5277,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4885,10 +5295,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5115,10 +5530,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -5128,10 +5548,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5352,10 +5777,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -5365,10 +5795,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5589,10 +6024,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -5602,10 +6042,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5832,10 +6277,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -5845,10 +6295,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6075,10 +6530,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -6088,10 +6548,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6312,10 +6777,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -6325,10 +6795,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6549,10 +7024,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -6562,10 +7042,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6792,10 +7277,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -6805,10 +7295,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -7035,10 +7530,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -7048,10 +7548,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -7272,10 +7777,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -7285,10 +7795,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -7509,10 +8024,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -7522,10 +8042,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -7977,10 +8502,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'function'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'function'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -7990,10 +8520,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '&rest'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '&rest'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -8003,10 +8538,15 @@ $result_trees{'all_commands_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index c13ae9ba74..e89abbde5e 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -209,10 +209,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -222,10 +227,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -235,10 +245,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -262,10 +277,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -365,10 +385,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -402,10 +427,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -429,10 +459,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -604,10 +639,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -617,10 +657,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -630,10 +675,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -657,10 +707,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -760,10 +815,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -797,10 +857,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -824,10 +889,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -971,10 +1041,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1022,10 +1097,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1207,10 +1287,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1258,10 +1343,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'float'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1323,10 +1413,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1336,10 +1431,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1349,10 +1449,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1480,10 +1585,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -1517,10 +1627,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1544,10 +1659,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'ct'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'ct'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -1579,10 +1699,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1895,10 +2020,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => ':in'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => ':in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1908,10 +2038,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'out'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'out'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1921,10 +2056,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'stack;'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'stack;'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1965,10 +2105,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => ':in'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => ':in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1978,10 +2123,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'integer'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'integer'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1998,10 +2148,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => ';'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => ';'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2011,10 +2166,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => ';barg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => ';barg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2024,10 +2184,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'aarg;'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'aarg;'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2037,10 +2202,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => ';'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => ';'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2050,10 +2220,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'end'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'end'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2204,10 +2379,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2217,10 +2397,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2230,10 +2415,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2257,10 +2447,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2360,10 +2555,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -2397,10 +2597,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2424,10 +2629,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2546,10 +2756,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'car'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'car'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2559,10 +2774,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'cdr'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'cdr'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2586,10 +2806,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2599,10 +2824,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2612,10 +2842,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2639,10 +2874,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2742,10 +2982,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -2779,10 +3024,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2806,10 +3056,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2960,10 +3215,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2973,10 +3233,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -2986,10 +3251,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3013,10 +3283,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3116,10 +3391,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3153,10 +3433,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3180,10 +3465,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3365,10 +3655,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3378,10 +3673,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3391,10 +3691,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3418,10 +3723,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3521,10 +3831,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3558,10 +3873,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3585,10 +3905,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3793,10 +4118,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3806,10 +4136,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3819,10 +4154,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3846,10 +4186,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3949,10 +4294,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -3986,10 +4336,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4013,10 +4368,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4252,10 +4612,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4265,10 +4630,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'in'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'in'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4278,10 +4648,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'brace'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'brace'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4305,10 +4680,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'something'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4408,10 +4788,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -4445,10 +4830,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'p'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4472,10 +4862,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4697,10 +5092,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4710,10 +5110,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4941,10 +5346,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -4954,10 +5364,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5185,10 +5600,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -5198,10 +5618,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5423,10 +5848,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -5436,10 +5866,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5661,10 +6096,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -5674,10 +6114,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -5905,10 +6350,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -5918,10 +6368,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6149,10 +6604,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -6162,10 +6622,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6387,10 +6852,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -6400,10 +6870,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6625,10 +7100,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -6638,10 +7118,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -6869,10 +7354,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -6882,10 +7372,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -7113,10 +7608,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -7126,10 +7626,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -7351,10 +7856,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -7364,10 +7874,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -7589,10 +8104,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -7602,10 +8122,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -8059,10 +8584,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'function'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'function'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -8072,10 +8602,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '&rest'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '&rest'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -8085,10 +8620,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index 2bdd48c09e..71844b7623 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -229,10 +229,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -500,10 +505,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -807,10 +817,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1504,10 +1519,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1886,10 +1906,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2094,10 +2119,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2479,10 +2509,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--ttributes...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--ttributes...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2617,10 +2652,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2755,10 +2795,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -2893,10 +2938,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3156,10 +3206,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg--var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg--var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -3169,10 +3224,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg--var1'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg--var1'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -3450,10 +3510,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4167,10 +4232,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -4398,10 +4468,15 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a--rguments...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'a--rguments...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/bracketed_arg_no_space.pl
b/tp/t/results/def/bracketed_arg_no_space.pl
index 6e1d3b8c54..4e697e11a5 100644
--- a/tp/t/results/def/bracketed_arg_no_space.pl
+++ b/tp/t/results/def/bracketed_arg_no_space.pl
@@ -83,10 +83,15 @@ $result_trees{'bracketed_arg_no_space'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'm'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'm'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index 5a97dcc6fe..ac994009f1 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -112,10 +112,15 @@ $result_trees{'code_in_def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bar'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bar'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/comment_index_before_defline.pl
b/tp/t/results/def/comment_index_before_defline.pl
index 772a98b9be..f19e4cc5e6 100644
--- a/tp/t/results/def/comment_index_before_defline.pl
+++ b/tp/t/results/def/comment_index_before_defline.pl
@@ -132,10 +132,15 @@ $result_trees{'comment_index_before_defline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -145,10 +150,15 @@ $result_trees{'comment_index_before_defline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'd'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'd'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/def_defx_mismatch.pl
b/tp/t/results/def/def_defx_mismatch.pl
index c8ecaa9f0a..33187885f2 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -61,10 +61,15 @@ $result_trees{'def_defx_mismatch'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -194,10 +199,15 @@ $result_trees{'def_defx_mismatch'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -207,10 +217,15 @@ $result_trees{'def_defx_mismatch'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'now'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'now'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -220,10 +235,15 @@ $result_trees{'def_defx_mismatch'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'the'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'the'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -233,10 +253,15 @@ $result_trees{'def_defx_mismatch'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/def_groupings_args.pl
b/tp/t/results/def/def_groupings_args.pl
index 4f5d283f73..6fe1d85a1e 100644
--- a/tp/t/results/def/def_groupings_args.pl
+++ b/tp/t/results/def/def_groupings_args.pl
@@ -310,10 +310,15 @@ $result_trees{'def_groupings_args'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'c'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
diff --git a/tp/t/results/def/deftypeline.pl b/tp/t/results/def/deftypeline.pl
index ee4ccbc244..50a6980957 100644
--- a/tp/t/results/def/deftypeline.pl
+++ b/tp/t/results/def/deftypeline.pl
@@ -95,10 +95,15 @@ $result_trees{'deftypeline'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -146,10 +151,15 @@ $result_trees{'deftypeline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'int'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'int'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/defx_after_comment.pl
b/tp/t/results/def/defx_after_comment.pl
index c9280b39d0..7771e3e5b5 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -66,10 +66,15 @@ $result_trees{'defx_after_comment'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -79,10 +84,15 @@ $result_trees{'defx_after_comment'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -167,10 +177,15 @@ $result_trees{'defx_after_comment'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/defx_after_comment_in_example.pl
b/tp/t/results/def/defx_after_comment_in_example.pl
index ef1485cf23..f64aed455e 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -80,10 +80,15 @@ $result_trees{'defx_after_comment_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -93,10 +98,15 @@ $result_trees{'defx_after_comment_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -186,10 +196,15 @@ $result_trees{'defx_after_comment_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/defx_after_empty_line.pl
b/tp/t/results/def/defx_after_empty_line.pl
index 911d1a69f4..48ff1ff467 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -66,10 +66,15 @@ $result_trees{'defx_after_empty_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -79,10 +84,15 @@ $result_trees{'defx_after_empty_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -162,10 +172,15 @@ $result_trees{'defx_after_empty_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/defx_after_empty_line_in_example.pl
b/tp/t/results/def/defx_after_empty_line_in_example.pl
index d4ec825652..2349a2cdbc 100644
--- a/tp/t/results/def/defx_after_empty_line_in_example.pl
+++ b/tp/t/results/def/defx_after_empty_line_in_example.pl
@@ -80,10 +80,15 @@ $result_trees{'defx_after_empty_line_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -93,10 +98,15 @@ $result_trees{'defx_after_empty_line_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -206,10 +216,15 @@ $result_trees{'defx_after_empty_line_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl
b/tp/t/results/def/defx_after_paragraph_end.pl
index e7c3cd413b..1f75d8a997 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -66,10 +66,15 @@ $result_trees{'defx_after_paragraph_end'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -79,10 +84,15 @@ $result_trees{'defx_after_paragraph_end'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -171,10 +181,15 @@ $result_trees{'defx_after_paragraph_end'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/defx_after_preformatted_with_text.pl
b/tp/t/results/def/defx_after_preformatted_with_text.pl
index aa06df9256..116364e4fd 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -80,10 +80,15 @@ $result_trees{'defx_after_preformatted_with_text'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -93,10 +98,15 @@ $result_trees{'defx_after_preformatted_with_text'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -185,10 +195,15 @@ $result_trees{'defx_after_preformatted_with_text'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/defx_after_text.pl
b/tp/t/results/def/defx_after_text.pl
index a24b25e946..bf7a772926 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -66,10 +66,15 @@ $result_trees{'defx_after_text'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -79,10 +84,15 @@ $result_trees{'defx_after_text'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -166,10 +176,15 @@ $result_trees{'defx_after_text'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/defx_in_example.pl
b/tp/t/results/def/defx_in_example.pl
index 00f4f64e2b..37137f1e59 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -80,10 +80,15 @@ $result_trees{'defx_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -93,10 +98,15 @@ $result_trees{'defx_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -166,10 +176,15 @@ $result_trees{'defx_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/double_command.pl
b/tp/t/results/def/double_command.pl
index eb430632b4..77fc2b51e8 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -60,10 +60,15 @@ $result_trees{'double_command'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -80,10 +85,15 @@ $result_trees{'double_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -100,10 +110,15 @@ $result_trees{'double_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -120,10 +135,15 @@ $result_trees{'double_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '...'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -189,10 +209,15 @@ $result_trees{'double_command'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -209,10 +234,15 @@ $result_trees{'double_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -229,10 +259,15 @@ $result_trees{'double_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -249,10 +284,15 @@ $result_trees{'double_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '...'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -269,10 +309,15 @@ $result_trees{'double_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'd'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'd'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -439,10 +484,15 @@ $result_trees{'double_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/empty_def_arguments.pl
b/tp/t/results/def/empty_def_arguments.pl
index 0995bed8b3..1861eb0ac3 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -66,10 +66,15 @@ $result_trees{'empty_def_arguments'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -79,10 +84,15 @@ $result_trees{'empty_def_arguments'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/empty_def_command.pl
b/tp/t/results/def/empty_def_command.pl
index dbb8a94fb8..ed39745583 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -158,10 +158,15 @@ $result_trees{'empty_def_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'with'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'with'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -171,10 +176,15 @@ $result_trees{'empty_def_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'deffnx'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'deffnx'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/empty_deftype.pl
b/tp/t/results/def/empty_deftype.pl
index 5307eecfc5..aad1854c58 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -81,10 +81,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'const'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'const'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -94,10 +99,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type&'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'type&'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -107,10 +117,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'x'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -258,10 +273,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'const'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'const'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -271,10 +291,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type&'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'type&'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -284,10 +309,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'x'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -469,10 +499,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'const'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'const'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -482,10 +517,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type&'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'type&'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -495,10 +535,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'x'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -721,10 +766,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'const'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'const'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -734,10 +784,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type&'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'type&'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -747,10 +802,15 @@ $result_trees{'empty_deftype'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'x'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/end_of_line_end_file.pl
b/tp/t/results/def/end_of_line_end_file.pl
index 0aee99d110..4877f03b77 100644
--- a/tp/t/results/def/end_of_line_end_file.pl
+++ b/tp/t/results/def/end_of_line_end_file.pl
@@ -53,10 +53,15 @@ $result_trees{'end_of_line_end_file'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/end_of_line_protect_at_end.pl
b/tp/t/results/def/end_of_line_protect_at_end.pl
index 7e542ce662..eadc70804e 100644
--- a/tp/t/results/def/end_of_line_protect_at_end.pl
+++ b/tp/t/results/def/end_of_line_protect_at_end.pl
@@ -58,10 +58,15 @@ $result_trees{'end_of_line_protect_at_end'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments2'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arguments2'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/end_of_lines_protected.pl
b/tp/t/results/def/end_of_lines_protected.pl
index 8312852cea..2c9907ee88 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -53,10 +53,15 @@ $result_trees{'end_of_lines_protected'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -73,10 +78,15 @@ $result_trees{'end_of_lines_protected'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'more'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'more'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -114,10 +124,15 @@ $result_trees{'end_of_lines_protected'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'with'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'with'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -127,10 +142,15 @@ $result_trees{'end_of_lines_protected'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '3'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '3'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
index 3c7521eb8c..494b8f2b5e 100644
--- a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
+++ b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
@@ -59,10 +59,15 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -72,10 +77,15 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg2'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg2'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -92,10 +102,15 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'more'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'more'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -133,10 +148,15 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'with'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'with'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -146,10 +166,15 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '3'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '3'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/end_of_lines_protected_non_ascii.pl
b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
index 40d7f32cad..2337a481e6 100644
--- a/tp/t/results/def/end_of_lines_protected_non_ascii.pl
+++ b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
@@ -66,10 +66,15 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => "\x{e0}rguments"
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => "\x{e0}rguments"
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -86,10 +91,15 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'more'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'more'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -128,10 +138,15 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'with'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'with'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -141,10 +156,15 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '3'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '3'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/inter_item_commands_in_def.pl
b/tp/t/results/def/inter_item_commands_in_def.pl
index 997ba3dbf4..2a631e9e75 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -66,10 +66,15 @@ $result_trees{'inter_item_commands_in_def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -79,10 +84,15 @@ $result_trees{'inter_item_commands_in_def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -328,10 +338,15 @@ $result_trees{'inter_item_commands_in_def'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'truc'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/inter_item_commands_in_def_in_example.pl
b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
index 3be381c5a0..9ed2d792f7 100644
--- a/tp/t/results/def/inter_item_commands_in_def_in_example.pl
+++ b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
@@ -80,10 +80,15 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -93,10 +98,15 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -352,10 +362,15 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'truc'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/leading_space_in_def_arg.pl
b/tp/t/results/def/leading_space_in_def_arg.pl
index ce4cdaff7d..461c1511d5 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -61,10 +61,15 @@ $result_trees{'leading_space_in_def_arg'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/multiple_defline.pl
b/tp/t/results/def/multiple_defline.pl
index 0d6d5442a9..fb470c55b0 100644
--- a/tp/t/results/def/multiple_defline.pl
+++ b/tp/t/results/def/multiple_defline.pl
@@ -74,10 +74,15 @@ $result_trees{'multiple_defline'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bar'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bar'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -178,10 +183,15 @@ $result_trees{'multiple_defline'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bar2'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bar2'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -198,10 +208,15 @@ $result_trees{'multiple_defline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'baz2'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'baz2'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/no_category_or_no_name.pl
b/tp/t/results/def/no_category_or_no_name.pl
index 6d995358bd..b65244fbfc 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -230,10 +230,15 @@ $result_trees{'no_category_or_no_name'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -243,10 +248,15 @@ $result_trees{'no_category_or_no_name'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'd'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'd'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 7f0688b268..f5cec1b9fe 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -53,10 +53,15 @@ $result_trees{'not_closed'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'machin'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'machin'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -123,10 +128,15 @@ $result_trees{'not_closed'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -209,10 +219,15 @@ $result_trees{'not_closed'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'var'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -222,10 +237,15 @@ $result_trees{'not_closed'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index 4ff3e221aa..5435a02381 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -150,10 +150,15 @@ $result_trees{'omit_def_space'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg1'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg1'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -170,10 +175,15 @@ $result_trees{'omit_def_space'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg2'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg2'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -261,10 +271,15 @@ $result_trees{'omit_def_space'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'aarg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'aarg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/space_in_def_for_index.pl
b/tp/t/results/def/space_in_def_for_index.pl
index 80b62826f1..a7a895ae4d 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -160,10 +160,15 @@ $result_trees{'space_in_def_for_index'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'argument2...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'argument2...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -237,10 +242,15 @@ $result_trees{'space_in_def_for_index'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg3'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg3'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/text_block_before_defline.pl
b/tp/t/results/def/text_block_before_defline.pl
index 7a1f2520a5..025c14c48f 100644
--- a/tp/t/results/def/text_block_before_defline.pl
+++ b/tp/t/results/def/text_block_before_defline.pl
@@ -403,10 +403,15 @@ $result_trees{'text_block_before_defline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -416,10 +421,15 @@ $result_trees{'text_block_before_defline'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'd'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'd'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/def/wrong_braces_simple.pl
b/tp/t/results/def/wrong_braces_simple.pl
index 4d8cc69342..91417aba83 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -53,10 +53,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -66,10 +71,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -79,10 +89,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -197,10 +212,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -210,10 +230,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -223,10 +248,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -236,10 +266,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'after'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'after'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -354,10 +389,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -367,10 +407,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -380,10 +425,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -514,10 +564,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -527,10 +582,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -540,10 +600,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -682,10 +747,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -695,10 +765,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'd'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'd'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -708,10 +783,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'e'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -778,10 +858,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -791,10 +876,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -804,10 +894,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -880,10 +975,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -893,10 +993,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -906,10 +1011,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -919,10 +1029,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'after'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'after'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -995,10 +1110,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1008,10 +1128,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1021,10 +1146,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1113,10 +1243,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1126,10 +1261,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -1139,10 +1279,15 @@ $result_trees{'wrong_braces_simple'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/def/wrong_braces_with_end_of_lines.pl
b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
index d021d20494..837a5cd168 100644
--- a/tp/t/results/def/wrong_braces_with_end_of_lines.pl
+++ b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
@@ -53,10 +53,15 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -222,10 +227,15 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -242,10 +252,15 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'more'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'more'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -255,10 +270,15 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 8e01d727e5..2cfecd22c2 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -90,10 +90,15 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'ARGUMENTS...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'ARGUMENTS...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -480,10 +485,15 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'input'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'input'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index 3123e3bf92..3c0288a79b 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -132,10 +132,15 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'ARGUMENTS...'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'ARGUMENTS...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -447,10 +452,15 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'input'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'input'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 11c0f24448..7eeabfa66d 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -120,10 +120,15 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -196,10 +201,15 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index 78816138fe..1c89e4f913 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -120,10 +120,15 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -196,10 +201,15 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl
b/tp/t/results/info_tests/colon_in_index_entry.pl
index f4c2669d40..c7ed5b8294 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -278,10 +278,15 @@ $result_trees{'colon_in_index_entry'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'e'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -291,10 +296,15 @@ $result_trees{'colon_in_index_entry'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'f'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'f'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -368,10 +378,15 @@ $result_trees{'colon_in_index_entry'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'n'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'n'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -381,10 +396,15 @@ $result_trees{'colon_in_index_entry'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'm'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'm'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -394,10 +414,15 @@ $result_trees{'colon_in_index_entry'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'o'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'o'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/info_tests/def_in_copying.pl
b/tp/t/results/info_tests/def_in_copying.pl
index b797b0f922..c6c13fd9da 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -227,10 +227,15 @@ $result_trees{'def_in_copying'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'cc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'cc'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -299,10 +304,15 @@ $result_trees{'def_in_copying'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'ccx'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'ccx'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -512,10 +522,15 @@ $result_trees{'def_in_copying'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'cc'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'cc'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -584,10 +599,15 @@ $result_trees{'def_in_copying'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'ccx'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'ccx'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/info_tests/test_index.pl
b/tp/t/results/info_tests/test_index.pl
index f584071949..fba183a28f 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -326,10 +326,15 @@ $result_trees{'test_index'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -339,10 +344,15 @@ $result_trees{'test_index'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'g'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -410,10 +420,15 @@ $result_trees{'test_index'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bidule'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -423,10 +438,15 @@ $result_trees{'test_index'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git
a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
index e4aeae9a31..092f7233a6 100644
--- a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
+++ b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
@@ -253,10 +253,15 @@ $result_trees{'translation_in_parser_in_translation'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'de'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'de'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl
b/tp/t/results/invalid_nestings/block_not_matching.pl
index b0445da98b..5b618cff38 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -89,10 +89,15 @@ $result_trees{'block_not_matching'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '$filehandle'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '$filehandle'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index eba9b3d6d6..de760933a9 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -80,10 +80,15 @@ $result_trees{'def_in_style_command'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'args...'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'args...'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git
a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
index 2b792390f3..20862f5127 100644
--- a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
@@ -108,10 +108,15 @@ $result_trees{'def_not_closed_in_menu_description'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'chose'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'chose'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index 8d98d26b98..ff23ad9189 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -53,10 +53,15 @@ $result_trees{'section_on_defx_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'k'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'k'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -66,10 +71,15 @@ $result_trees{'section_on_defx_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'l'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'l'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/documentlanguage.pl
b/tp/t/results/languages/documentlanguage.pl
index 1df2516437..cb47df612e 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -507,10 +507,15 @@ $result_trees{'documentlanguage'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/documentlanguage_option.pl
b/tp/t/results/languages/documentlanguage_option.pl
index 3cad4fca08..ec8f368ae5 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -507,10 +507,15 @@ $result_trees{'documentlanguage_option'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl
b/tp/t/results/languages/documentlanguage_unknown.pl
index 126aadc978..e3d9893188 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -507,10 +507,15 @@ $result_trees{'documentlanguage_unknown'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arguments'
+ }
+ ],
'extra' => {
'def_role' => 'typearg'
},
- 'text' => 'arguments'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl
b/tp/t/results/languages/multiple_documentlanguage.pl
index 5ef6c1edb2..c65bcf5fec 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -132,10 +132,15 @@ $result_trees{'multiple_documentlanguage'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -525,10 +530,15 @@ $result_trees{'multiple_documentlanguage'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -844,10 +854,15 @@ $result_trees{'multiple_documentlanguage'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/multiple_in_preamble.pl
b/tp/t/results/languages/multiple_in_preamble.pl
index 44ece31ff8..eb27556720 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -132,10 +132,15 @@ $result_trees{'multiple_in_preamble'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -559,10 +564,15 @@ $result_trees{'multiple_in_preamble'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -824,10 +834,15 @@ $result_trees{'multiple_in_preamble'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'GGG'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'GGG'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index 6fe56d50e4..8180fae9e9 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -132,10 +132,15 @@ $result_trees{'multiple_in_preamble_before_node'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -608,10 +613,15 @@ $result_trees{'multiple_in_preamble_before_node'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl
b/tp/t/results/languages/multiple_lang_chapters.pl
index e8a80324f8..b4a9ee4255 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -770,10 +770,15 @@ $result_trees{'multiple_lang_chapters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1109,10 +1114,15 @@ $result_trees{'multiple_lang_chapters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1412,10 +1422,15 @@ $result_trees{'multiple_lang_chapters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index e6e3ac44fb..9a5eec4ae5 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -770,10 +770,15 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1109,10 +1114,15 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1412,10 +1422,15 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 80f2c434b4..0e914947bd 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -739,10 +739,15 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1078,10 +1083,15 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -1381,10 +1391,15 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/simple_documentlanguage.pl
b/tp/t/results/languages/simple_documentlanguage.pl
index 5ab74bea9a..86299daff2 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -179,10 +179,15 @@ $result_trees{'simple_documentlanguage'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/languages/unknown_region.pl
b/tp/t/results/languages/unknown_region.pl
index 926e6c27e8..2579c9a669 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -179,10 +179,15 @@ $result_trees{'unknown_region'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'CCC'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'CCC'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/latex_tests/brace_in_index.pl
b/tp/t/results/latex_tests/brace_in_index.pl
index 3d53dd579f..e73a9ed1d5 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -328,10 +328,15 @@ $result_trees{'brace_in_index'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'BBB'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'BBB'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index ebd8c84e8c..1556c76756 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -290,10 +290,15 @@ $result_trees{'api_doc_with_linemacro'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -310,10 +315,15 @@ $result_trees{'api_doc_with_linemacro'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'n='
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'n='
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -354,10 +364,15 @@ $result_trees{'api_doc_with_linemacro'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'axis='
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'axis='
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -398,10 +413,15 @@ $result_trees{'api_doc_with_linemacro'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'norm='
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'norm='
+ 'type' => 'def_aggregate'
},
{
'contents' => [
diff --git a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
index 1d1f5abe07..cb0f9a1d76 100644
--- a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
@@ -849,18 +849,23 @@ args \\e\\|\\f\\|
'type' => 'spaces'
},
{
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'source_marks' => [
+ 'contents' => [
{
- 'counter' => 6,
- 'position' => 1,
- 'sourcemark_type' => 'linemacro_expansion',
- 'status' => 'end'
+ 'source_marks' => [
+ {
+ 'counter' => 6,
+ 'position' => 1,
+ 'sourcemark_type' => 'linemacro_expansion',
+ 'status' => 'end'
+ }
+ ],
+ 'text' => 'a'
}
],
- 'text' => 'a'
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl
b/tp/t/results/linemacro/last_argument_with_braces.pl
index 7ab11b4765..3fef27bfcc 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -183,10 +183,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'f'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'f'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -196,10 +201,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -269,10 +279,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -282,10 +297,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -295,10 +315,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'last'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'last'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -325,10 +350,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -471,10 +501,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'f'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'f'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -484,10 +519,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -557,10 +597,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -722,10 +767,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'f'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'f'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -735,10 +785,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'r'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -808,10 +863,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -843,10 +903,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'remaining'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'remaining'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -856,10 +921,15 @@ $result_trees{'last_argument_with_braces'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'on'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'on'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/linemacro/nested_linemacro_calls.pl
b/tp/t/results/linemacro/nested_linemacro_calls.pl
index 27344ecae3..390307f351 100644
--- a/tp/t/results/linemacro/nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/nested_linemacro_calls.pl
@@ -327,10 +327,15 @@ $result_trees{'nested_linemacro_calls'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'remaining'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'remaining'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -347,10 +352,15 @@ $result_trees{'nested_linemacro_calls'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -360,10 +370,15 @@ $result_trees{'nested_linemacro_calls'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'typed'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'typed'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
index 5fc2ac8b93..c83cbd23fa 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -221,10 +221,15 @@ $result_trees{'newline_and_continuation_in_brace'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'some'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'some'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -234,10 +239,15 @@ $result_trees{'newline_and_continuation_in_brace'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -254,10 +264,15 @@ $result_trees{'newline_and_continuation_in_brace'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -296,18 +311,23 @@ $result_trees{'newline_and_continuation_in_brace'} = {
'type' => 'spaces'
},
{
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'source_marks' => [
+ 'contents' => [
{
- 'counter' => 1,
- 'position' => 4,
- 'sourcemark_type' => 'linemacro_expansion',
- 'status' => 'end'
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'position' => 4,
+ 'sourcemark_type' => 'linemacro_expansion',
+ 'status' => 'end'
+ }
+ ],
+ 'text' => 'line'
}
],
- 'text' => 'line'
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index 829bba3090..1447eb8b49 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -177,10 +177,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bar'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bar'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -197,10 +202,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'baz'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'baz'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -224,10 +234,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'continuation'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'continuation'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -237,10 +252,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'line'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'line'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -433,10 +453,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bar'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bar'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -453,10 +478,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'baz'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'baz'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -473,10 +503,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'rest'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'rest'
+ 'type' => 'def_aggregate'
},
{
'contents' => [
@@ -490,10 +525,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'def_aggregate'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -503,10 +543,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'more'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'more'
+ 'type' => 'def_aggregate'
}
],
'info' => {
@@ -693,10 +738,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'bar'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'bar'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -713,10 +763,15 @@ $result_trees{'protected_spaces_on_line'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'baz'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'baz'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index 1055de2a66..e310dfdfce 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -353,10 +353,15 @@ $result_trees{'simple_nested_linemacro_calls'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'inside'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'inside'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -402,10 +407,15 @@ $result_trees{'simple_nested_linemacro_calls'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'remaining'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'remaining'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -422,10 +432,15 @@ $result_trees{'simple_nested_linemacro_calls'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'type'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'type'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -435,10 +450,15 @@ $result_trees{'simple_nested_linemacro_calls'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'typed'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'typed'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
diff --git a/tp/t/results/linemacro/spaces_after_command_in_call.pl
b/tp/t/results/linemacro/spaces_after_command_in_call.pl
index 0cd95441bd..55854e24e0 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -215,10 +215,15 @@ $result_trees{'spaces_after_command_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'A'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'A'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -265,10 +270,15 @@ $result_trees{'spaces_after_command_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'B'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'B'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -278,10 +288,15 @@ $result_trees{'spaces_after_command_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'rest'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'rest'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git
a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
index 1c4799a433..aad788b6ec 100644
--- a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
@@ -591,10 +591,15 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'A'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'A'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -604,10 +609,15 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'Fun'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'Fun'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -617,10 +627,15 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'B'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'B'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -652,10 +667,15 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'and'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'and'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -665,18 +685,23 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
'type' => 'spaces'
},
{
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'source_marks' => [
+ 'contents' => [
{
- 'counter' => 3,
- 'position' => 9,
- 'sourcemark_type' => 'linemacro_expansion',
- 'status' => 'end'
+ 'source_marks' => [
+ {
+ 'counter' => 3,
+ 'position' => 9,
+ 'sourcemark_type' => 'linemacro_expansion',
+ 'status' => 'end'
+ }
+ ],
+ 'text' => 'remaining'
}
],
- 'text' => 'remaining'
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
index 54ac8a34ef..26d0ff9192 100644
--- a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
@@ -197,10 +197,15 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'd'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'd'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -210,10 +215,15 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'B'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'B'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -260,10 +270,15 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'rest'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'rest'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/linemacro/spaces_in_args.pl
b/tp/t/results/linemacro/spaces_in_args.pl
index c5427a3b09..8c3f4b0108 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -199,10 +199,15 @@ $result_trees{'spaces_in_args'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'A'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'A'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -212,10 +217,15 @@ $result_trees{'spaces_in_args'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'd'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'd'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -225,10 +235,15 @@ $result_trees{'spaces_in_args'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'B'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'B'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -238,10 +253,15 @@ $result_trees{'spaces_in_args'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'rest'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'rest'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/linemacro/spaces_in_call.pl
b/tp/t/results/linemacro/spaces_in_call.pl
index 665f0b5987..ca66ce3be4 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -200,10 +200,15 @@ $result_trees{'spaces_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'A'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'A'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -213,10 +218,15 @@ $result_trees{'spaces_in_call'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'B'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'B'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl
b/tp/t/results/macro/macro_in_def_delimiters.pl
index ee07a73673..d43cda0f9e 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -111,10 +111,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'count'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'count'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -124,29 +129,34 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'spaces'
},
{
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'source_marks' => [
+ 'contents' => [
{
- 'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'type' => 'brace_command_arg'
- }
- ],
- 'info' => {
- 'command_name' => 'string'
- },
- 'type' => 'macro_call'
- },
- 'position' => 3,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'start'
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'info' => {
+ 'command_name' => 'string'
+ },
+ 'type' => 'macro_call'
+ },
+ 'position' => 3,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'start'
+ }
+ ],
+ 'text' => 'argaa'
}
],
- 'text' => 'argaa'
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -156,10 +166,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -169,10 +184,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '*c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '*c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -197,10 +217,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -236,10 +261,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'aa'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -249,10 +279,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -262,10 +297,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '*c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '*c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -290,29 +330,34 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'delimiter'
},
{
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'source_marks' => [
+ 'contents' => [
{
- 'counter' => 3,
- 'element' => {
- 'args' => [
- {
- 'type' => 'brace_command_arg'
- }
- ],
- 'info' => {
- 'command_name' => 'string'
- },
- 'type' => 'macro_call'
- },
- 'position' => 2,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'start'
+ 'source_marks' => [
+ {
+ 'counter' => 3,
+ 'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'info' => {
+ 'command_name' => 'string'
+ },
+ 'type' => 'macro_call'
+ },
+ 'position' => 2,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'start'
+ }
+ ],
+ 'text' => 'bbaa'
}
],
- 'text' => 'bbaa'
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -322,10 +367,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -335,10 +385,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '*c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '*c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -382,10 +437,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'aa'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -395,10 +455,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'delimiter'
},
{
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'b'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -408,10 +473,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => '*c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => '*c'
+ 'type' => 'def_aggregate'
},
{
'extra' => {
@@ -436,10 +506,15 @@ $result_trees{'macro_in_def_delimiters'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'a'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/menu/menu_in_deffn.pl
b/tp/t/results/menu/menu_in_deffn.pl
index 0ac944e430..5a99f3c9f3 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -78,10 +78,15 @@ $result_trees{'menu_in_deffn'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'c'
+ 'type' => 'def_aggregate'
}
],
'info' => {
diff --git a/tp/t/results/preformatted/def_in_example.pl
b/tp/t/results/preformatted/def_in_example.pl
index 8a160e6d87..fa6f3e9354 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -72,10 +72,15 @@ $result_trees{'def_in_example'} = {
'type' => 'spaces'
},
{
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
'extra' => {
'def_role' => 'arg'
},
- 'text' => 'arg'
+ 'type' => 'def_aggregate'
}
],
'info' => {
| [Prev in Thread] | Current Thread | [Next in Thread] |