[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_expand_macro_argume
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_expand_macro_arguments) (_expand_linemacro_arguments, _handle_macro), tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments) (expand_linemacro_arguments, expand_macro_body, handle_macro): use contents instead of args for macro call elements. |
|
Date: |
Tue, 24 Dec 2024 09:28:24 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new b6e51c6b1e * tp/Texinfo/ParserNonXS.pm (_expand_macro_arguments)
(_expand_linemacro_arguments, _handle_macro), tp/Texinfo/XS/parsetexi/macro.c
(expand_macro_arguments) (expand_linemacro_arguments, expand_macro_body,
handle_macro): use contents instead of args for macro call elements.
b6e51c6b1e is described below
commit b6e51c6b1e1d3a893552305f2e71537e42860047
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Nov 10 12:59:55 2024 +0100
* tp/Texinfo/ParserNonXS.pm (_expand_macro_arguments)
(_expand_linemacro_arguments, _handle_macro),
tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments)
(expand_linemacro_arguments, expand_macro_body, handle_macro): use
contents instead of args for macro call elements.
---
ChangeLog | 8 +
tp/Texinfo/ParserNonXS.pm | 28 +--
tp/Texinfo/XS/parsetexi/macro.c | 28 +--
tp/t/results/alias/alias_macro_target_removed.pl | 2 +-
tp/t/results/alias/alias_of_macro.pl | 2 +-
tp/t/results/alias/alias_of_macro_before_macro.pl | 2 +-
tp/t/results/alias/texinfo_command_alias.pl | 2 +-
.../alias/texinfo_command_alias_indirect.pl | 2 +-
tp/t/results/conditionals/macro_in_ifset.pl | 2 +-
tp/t/results/conditionals/macro_in_ifset_set.pl | 2 +-
tp/t/results/conditionals/nested_ifset_ifclear.pl | 8 +-
.../results/converters_tests/at_commands_in_raw.pl | 2 +-
tp/t/results/coverage_braces/test_image.pl | 10 +-
tp/t/results/include/cpp_lines.pl | 4 +-
.../macro_and_commands_in_early_commands.pl | 6 +-
.../results/include/macro_definition_in_include.pl | 2 +-
tp/t/results/include/macro_in_early_commands.pl | 10 +-
tp/t/results/info_tests/def_in_copying.pl | 4 +-
tp/t/results/linemacro/api_doc_with_linemacro.pl | 10 +-
.../linemacro/arobase_brace_in_linemacro_call.pl | 4 +-
.../linemacro/begin_conditional_in_linemacro.pl | 4 +-
.../linemacro/block_begin_end_in_linemacro_call.pl | 14 +-
tp/t/results/linemacro/blockitem_no_item.pl | 2 +-
tp/t/results/linemacro/brace_command_not_closed.pl | 2 +-
tp/t/results/linemacro/braces_after_text.pl | 2 +-
.../linemacro/call_macro_in_linemacro_body.pl | 4 +-
.../linemacro/call_macro_in_linemacro_call.pl | 4 +-
.../linemacro/comment_at_end_of_linemacro_call.pl | 2 +-
.../results/linemacro/comment_in_linemacro_call.pl | 2 +-
.../comment_in_one_argument_linemacro_call.pl | 2 +-
.../comment_on_linemacro_call_macro_expansion.pl | 4 +-
.../comment_on_linemacro_call_out_of_braces.pl | 6 +-
tp/t/results/linemacro/empty_last_argument.pl | 6 +-
.../linemacro/end_conditional_in_linemacro.pl | 2 +-
.../results/linemacro/last_argument_with_braces.pl | 6 +-
tp/t/results/linemacro/nested_linemacro_calls.pl | 6 +-
.../linemacro/newline_and_continuation_in_brace.pl | 2 +-
tp/t/results/linemacro/no_arguments.pl | 6 +-
tp/t/results/linemacro/paragraph_no_paragraph.pl | 4 +-
tp/t/results/linemacro/protected_spaces_on_line.pl | 6 +-
.../protection_of_end_of_line_by_command.pl | 2 +-
.../linemacro/recursive_linemacro_in_body.pl | 2 +-
.../linemacro/recursive_linemacro_in_call.pl | 2 +-
.../linemacro/simple_nested_linemacro_calls.pl | 4 +-
.../linemacro/spaces_after_command_in_call.pl | 2 +-
...paces_after_macro_linemacro_commands_in_call.pl | 8 +-
.../spaces_after_unknown_command_in_call.pl | 2 +-
tp/t/results/linemacro/spaces_in_args.pl | 2 +-
tp/t/results/linemacro/spaces_in_call.pl | 2 +-
tp/t/results/linemacro/text_arguments.pl | 2 +-
tp/t/results/linemacro/verb_in_linemacro_call.pl | 2 +-
tp/t/results/linemacro/verb_not_closed.pl | 2 +-
.../verb_with_arobase_in_linemacro_call.pl | 2 +-
.../linemacro/verb_with_brace_in_linemacro_call.pl | 2 +-
tp/t/results/macro/arg_body_expansion_order.pl | 4 +-
tp/t/results/macro/arg_not_closed.pl | 2 +-
tp/t/results/macro/arobase_brace_in_macro_call.pl | 4 +-
tp/t/results/macro/backslash_in_arg.pl | 8 +-
tp/t/results/macro/bib_example.pl | 16 +-
...losing_brace_in_macro_call_in_ignored_inline.pl | 2 +-
tp/t/results/macro/complete_macro_for_end.pl | 2 +-
tp/t/results/macro/complex_argument.pl | 10 +-
tp/t/results/macro/cpp_directives_after_macros.pl | 4 +-
tp/t/results/macro/cpp_directives_in_macro.pl | 2 +-
.../macro/cpp_directives_line_value_macro.pl | 6 +-
.../macro/definfoenclose_replaced_by_macro.pl | 2 +-
tp/t/results/macro/double_recursive_macro_call.pl | 4 +-
tp/t/results/macro/empty_macro_argument.pl | 16 +-
tp/t/results/macro/empty_macro_no_arg.pl | 2 +-
tp/t/results/macro/expand_two_same.pl | 4 +-
tp/t/results/macro/expansion_order.pl | 4 +-
tp/t/results/macro/form_feeds.pl | 4 +-
tp/t/results/macro/glossary.pl | 10 +-
tp/t/results/macro/ifclear_in_macro.pl | 2 +-
tp/t/results/macro/ifset_in_macro.pl | 2 +-
tp/t/results/macro/ifset_in_macro_set.pl | 2 +-
tp/t/results/macro/ignored_macro_definition.pl | 2 +-
tp/t/results/macro/implicit_quoting_one_arg.pl | 2 +-
tp/t/results/macro/implicit_quoting_recursion.pl | 12 +-
tp/t/results/macro/include_after_empty_line_arg.pl | 2 +-
tp/t/results/macro/leading_spaces_no_ignore.pl | 2 +-
.../macro/line_end_accent_command_macro_call.pl | 4 +-
tp/t/results/macro/macro_after_paragraph.pl | 2 +-
.../macro/macro_alias_definfoenclose_defindex.pl | 8 +-
.../macro_before_specific_line_command_args.pl | 2 +-
tp/t/results/macro/macro_call_empty_middle_arg.pl | 6 +-
tp/t/results/macro/macro_call_empty_two_arg.pl | 22 +--
.../macro/macro_call_in_inlinefmtifelse_format.pl | 2 +-
tp/t/results/macro/macro_call_in_node_manual.pl | 20 +--
.../macro/macro_end_call_in_ignored_inlinefmt.pl | 2 +-
.../macro_end_call_in_ignored_inlinefmtifelse.pl | 2 +-
...cro_end_call_in_ignored_inlinefmtifelse_else.pl | 2 +-
.../macro/macro_end_call_in_ignored_inlineraw.pl | 2 +-
.../results/macro/macro_end_call_in_ignored_raw.pl | 2 +-
tp/t/results/macro/macro_expands_to_empty.pl | 4 +-
tp/t/results/macro/macro_expansion.pl | 10 +-
.../macro_expansion_end_in_conditional_end.pl | 2 +-
.../macro_expansion_end_in_conditional_line.pl | 2 +-
...macro_expansion_end_in_ignored_ifset_content.pl | 2 +-
..._expansion_end_in_ignored_nested_conditional.pl | 2 +-
..._end_in_ignored_nested_different_conditional.pl | 2 +-
.../macro_expansion_in_multitable_prototype.pl | 10 +-
.../macro/macro_for_dot_in_menu_not_separator.pl | 4 +-
tp/t/results/macro/macro_for_end.pl | 2 +-
.../macro/macro_for_ignored_line_command.pl | 2 +-
tp/t/results/macro/macro_for_verb.pl | 2 +-
tp/t/results/macro/macro_in_accent.pl | 12 +-
tp/t/results/macro/macro_in_brace_command.pl | 4 +-
tp/t/results/macro/macro_in_def_delimiters.pl | 8 +-
tp/t/results/macro/macro_in_empty_menu_comment.pl | 2 +-
.../macro_in_empty_multitable_empty_before_item.pl | 2 +-
.../macro_in_empty_table_empty_before_item.pl | 2 +-
tp/t/results/macro/macro_in_empty_text.pl | 2 +-
tp/t/results/macro/macro_in_end_argument.pl | 2 +-
tp/t/results/macro/macro_in_index_commands.pl | 22 +--
.../macro/macro_in_invalid_documentencoding.pl | 2 +-
tp/t/results/macro/macro_in_macro_arg.pl | 6 +-
tp/t/results/macro/macro_in_macro_arg_simpler.pl | 4 +-
tp/t/results/macro/macro_in_menu.pl | 20 +--
.../macro_in_menu_comment_closed_by_detailmenu.pl | 2 +-
.../macro/macro_in_menu_comment_like_entry.pl | 8 +-
tp/t/results/macro/macro_in_menu_description.pl | 2 +-
tp/t/results/macro/macro_in_misc_commands.pl | 102 +++++------
.../macro/macro_in_multitable_empty_before_item.pl | 2 +-
.../macro/macro_in_table_empty_before_item.pl | 2 +-
.../macro_inlineifcond_end_in_empty_ignored.pl | 4 +-
.../macro/macro_inlineifcond_end_in_empty_set.pl | 4 +-
tp/t/results/macro/macro_name_with_digit.pl | 4 +-
tp/t/results/macro/macro_name_with_hyphen.pl | 2 +-
tp/t/results/macro/macro_no_arg_expansion.pl | 2 +-
tp/t/results/macro/macro_one_arg_end_of_file.pl | 2 +-
.../macro_with_error_at_end_line_after_macro.pl | 2 +-
tp/t/results/macro/macro_zero.pl | 2 +-
tp/t/results/macro/nested_macro_call.pl | 4 +-
tp/t/results/macro/no_macrobody.pl | 4 +-
tp/t/results/macro/paragraph_and_macro.pl | 12 +-
tp/t/results/macro/protect_comma_macro_line.pl | 2 +-
tp/t/results/macro/protect_in_body.pl | 2 +-
tp/t/results/macro/protect_in_body_one_arg.pl | 2 +-
tp/t/results/macro/recursive_call_in_argument.pl | 2 +-
tp/t/results/macro/recursive_call_in_macro.pl | 2 +-
tp/t/results/macro/recursive_call_in_rmacro.pl | 200 ++++++++++-----------
tp/t/results/macro/redefine_texinfo_macro.pl | 2 +-
tp/t/results/macro/simple_imbricated_macro.pl | 4 +-
.../macro/simple_imbricated_macro_rmacro.pl | 4 +-
tp/t/results/macro/space_macro_after_end.pl | 2 +-
.../macro/space_macro_after_end_verbatim.pl | 2 +-
tp/t/results/macro/too_much_args.pl | 2 +-
tp/t/results/macro/two_macros_on_a_line.pl | 12 +-
.../macro/unpaired_backslash_in_macro_body.pl | 2 +-
.../macro/verb_with_arobase_in_macro_call.pl | 2 +-
.../results/macro/verb_with_brace_in_macro_call.pl | 2 +-
.../codequoteundirected_codequotebacktick.pl | 24 +--
tp/t/results/misc_commands/kbdinputstyle.pl | 6 +-
.../misc_commands/kbdinputstyle_in_table.pl | 6 +-
tp/t/results/misc_commands/test_allowcodebreaks.pl | 14 +-
.../plaintext_tests/star_at_command_formatting.pl | 6 +-
.../transformations/protect_colon_source_mark.pl | 2 +-
.../transformations/protect_comma_source_mark.pl | 2 +-
...st_parenthesis_after_parenthesis_source_mark.pl | 2 +-
.../protect_first_parenthesis_source_mark.pl | 2 +-
...otect_hashchar_at_line_beginning_source_mark.pl | 6 +-
...ct_node_after_label_source_mark_in_protected.pl | 2 +-
.../value_and_macro/comma_value_in_macro_arg.pl | 2 +-
.../results/value_and_macro/value_in_macro_body.pl | 2 +-
tp/t/results/xtable/table_nested.pl | 6 +-
166 files changed, 547 insertions(+), 539 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ae6bce4d85..3821995d75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-11-10 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_expand_macro_arguments)
+ (_expand_linemacro_arguments, _handle_macro),
+ tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments)
+ (expand_linemacro_arguments, expand_macro_body, handle_macro): use
+ contents instead of args for macro call elements.
+
2024-11-09 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_place_source_mark)
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 16215530e9..7f5c62c96a 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2694,7 +2694,7 @@ sub _expand_macro_arguments($$$$$)
my $argument = {'type' => 'brace_arg',
'contents' => [],
'parent' => $current};
- push @{$current->{'args'}}, $argument;
+ push @{$current->{'contents'}}, $argument;
my $argument_content = {'text' => '',
'parent' => $argument};
push @{$argument->{'contents'}}, $argument_content;
@@ -2733,13 +2733,13 @@ sub _expand_macro_arguments($$$$$)
if ($braces_level > 1) {
$argument_content->{'text'} .= $separator;
} else {
- if (scalar(@{$current->{'args'}}) < $args_total) {
+ if (scalar(@{$current->{'contents'}}) < $args_total) {
_remove_empty_content($self, $argument);
$argument = {'type' => 'brace_arg',
'contents' => [],
'parent' => $current};
- push @{$current->{'args'}}, $argument;
+ push @{$current->{'contents'}}, $argument;
$argument_content = {'text' => '',
'parent' => $argument};
push @{$argument->{'contents'}}, $argument_content;
@@ -2784,8 +2784,8 @@ sub _expand_macro_arguments($$$$$)
}
}
if ($args_total == 0
- and (scalar(@{$current->{'args'}} > 1)
- or $current->{'args'}->[0]->{'contents'})) {
+ and (scalar(@{$current->{'contents'}} > 1)
+ or $current->{'contents'}->[0]->{'contents'})) {
$self->_line_error(sprintf(__(
"macro `%s' declared without argument called with an argument"),
$name), $source_info);
@@ -2802,7 +2802,7 @@ sub _expand_linemacro_arguments($$$$$)
my $argument = {'type' => 'line_arg',
'contents' => [],
'parent' => $current};
- push @{$current->{'args'}}, $argument;
+ push @{$current->{'contents'}}, $argument;
my $argument_content = {'text' => '',
'parent' => $argument};
push @{$argument->{'contents'}}, $argument_content;
@@ -2855,13 +2855,13 @@ sub _expand_linemacro_arguments($$$$$)
# spaces
} else {
if ($braces_level > 0
- or scalar(@{$current->{'args'}}) >= $args_total) {
+ or scalar(@{$current->{'contents'}}) >= $args_total) {
$argument_content->{'text'} .= $separator;
} else {
$argument = {'type' => 'line_arg',
'contents' => [],
'parent' => $current};
- push @{$current->{'args'}}, $argument;
+ push @{$current->{'contents'}}, $argument;
$argument_content = {'text' => '',
'parent' => $argument};
push @{$argument->{'contents'}}, $argument_content;
@@ -2904,7 +2904,7 @@ sub _expand_linemacro_arguments($$$$$)
}
}
my $arg_idx = 0;
- foreach my $argument (@{$current->{'args'}}) {
+ foreach my $argument (@{$current->{'contents'}}) {
my $argument_content = $argument->{'contents'}->[0];
if ($argument_content->{'extra'}
and defined($argument_content->{'extra'}->{'toplevel_braces_nr'})) {
@@ -5221,7 +5221,7 @@ sub _handle_macro($$$$$)
my $macro_call_element = {'type' => $expanded_macro->{'cmdname'}.'_call',
'info' => {'command_name' => $command},
- 'args' => []};
+ 'contents' => []};
if ($expanded_macro->{'cmdname'} eq 'linemacro') {
@@ -5251,7 +5251,7 @@ sub _handle_macro($$$$$)
$macro_call_element->{'type'} =
$expanded_macro->{'cmdname'}.'_call_line';
my $arg_elt = {'type' => 'line_arg',
'parent' => $macro_call_element};
- push @{$macro_call_element->{'args'}}, $arg_elt;
+ push @{$macro_call_element->{'contents'}}, $arg_elt;
while (1) {
if ($line eq '') {
($line, $source_info) = _new_line($self, $arg_elt);
@@ -5296,10 +5296,10 @@ sub _handle_macro($$$$$)
my $expanded = _expand_macro_body($self,
$self->{'macros'}->{$command},
- $macro_call_element->{'args'}, $source_info);
+ $macro_call_element->{'contents'}, $source_info);
- delete $macro_call_element->{'args'}
- if (scalar(@{$macro_call_element->{'args'}}) == 0);
+ delete $macro_call_element->{'contents'}
+ if (scalar(@{$macro_call_element->{'contents'}}) == 0);
my $expanded_macro_text;
if (defined($expanded)) {
diff --git a/tp/Texinfo/XS/parsetexi/macro.c b/tp/Texinfo/XS/parsetexi/macro.c
index 409f117c52..69d5815bd1 100644
--- a/tp/Texinfo/XS/parsetexi/macro.c
+++ b/tp/Texinfo/XS/parsetexi/macro.c
@@ -314,7 +314,7 @@ expand_macro_arguments (const ELEMENT *macro, const char
**line_inout,
ELEMENT *argument = new_element (ET_brace_arg);
ELEMENT *argument_content = new_text_element (ET_other_text);
- add_to_element_args (current, argument);
+ add_to_element_contents (current, argument);
add_to_element_contents (argument, argument_content);
arg = argument_content->e.text;
@@ -393,7 +393,7 @@ expand_macro_arguments (const ELEMENT *macro, const char
**line_inout,
text_append_n (arg, sep, 1);
else
{
- if (current->e.c->args.number < args_total)
+ if (current->e.c->contents.number < args_total)
{
const char *p = pline;
@@ -402,7 +402,7 @@ expand_macro_arguments (const ELEMENT *macro, const char
**line_inout,
/* new argument */
argument = new_element (ET_brace_arg);
argument_content = new_text_element (ET_other_text);
- add_to_element_args (current, argument);
+ add_to_element_contents (current, argument);
add_to_element_contents (argument, argument_content);
arg = argument_content->e.text;
pline += strspn (pline, whitespace_chars);
@@ -431,8 +431,8 @@ expand_macro_arguments (const ELEMENT *macro, const char
**line_inout,
line = pline;
if (args_total == 0
- && (current->e.c->args.number > 1
- || current->e.c->args.list[0]->e.c->contents.number > 0))
+ && (current->e.c->contents.number > 1
+ || current->e.c->contents.list[0]->e.c->contents.number > 0))
{
line_error
("macro `%s' declared without argument called with an argument",
@@ -458,7 +458,7 @@ expand_linemacro_arguments (const ELEMENT *macro, const
char **line_inout,
ELEMENT *argument = new_element (ET_line_arg);
ELEMENT *argument_content = new_text_element (ET_other_text);
- add_to_element_args (current, argument);
+ add_to_element_contents (current, argument);
add_to_element_contents (argument, argument_content);
arg = argument_content->e.text;
@@ -581,7 +581,7 @@ expand_linemacro_arguments (const ELEMENT *macro, const
char **line_inout,
whitespaces_len = strspn (pline, whitespace_chars_except_newline);
if (braces_level > 0
- || current->e.c->args.number >= args_total)
+ || current->e.c->contents.number >= args_total)
{
text_append_n (arg, pline, whitespaces_len);
}
@@ -593,7 +593,7 @@ expand_linemacro_arguments (const ELEMENT *macro, const
char **line_inout,
argument_content = new_text_element (ET_other_text);
counter_push (&argument_brace_groups, argument_content, 0);
- add_to_element_args (current, argument);
+ add_to_element_contents (current, argument);
add_to_element_contents (argument, argument_content);
arg = argument_content->e.text;
@@ -608,10 +608,10 @@ expand_linemacro_arguments (const ELEMENT *macro, const
char **line_inout,
}
funexit:
- for (i = 0; i < current->e.c->args.number; i++)
+ for (i = 0; i < current->e.c->contents.number; i++)
{
ELEMENT *argument_content
- = current->e.c->args.list[i]->e.c->contents.list[0];
+ = current->e.c->contents.list[i]->e.c->contents.list[0];
int brace_groups_nr = counter_element_value (&argument_brace_groups,
argument_content);
if (brace_groups_nr == 1)
@@ -698,14 +698,14 @@ expand_macro_body (const MACRO *macro_record, const
ELEMENT *arguments,
else
{
size_t index = pos -1;
- if (arguments && index < arguments->e.c->args.number)
+ if (arguments && index < arguments->e.c->contents.number)
{
const ELEMENT *argument
- = args_child_by_index (arguments, index);
+ = contents_child_by_index (arguments, index);
if (argument->e.c->contents.number > 0)
text_append (expanded,
last_contents_child (
- args_child_by_index (arguments, index))->e.text->text);
+ contents_child_by_index (arguments, index))->e.text->text);
}
}
free (name);
@@ -862,7 +862,7 @@ handle_macro (ELEMENT *current, const char **line_inout,
enum command_id cmd)
macro_call_element = new_element (ET_macro_call_line);
else /* macro->e.c->cmd == CM_rmacro */
macro_call_element = new_element (ET_rmacro_call_line);
- add_to_element_args (macro_call_element, arg_elt);
+ add_to_element_contents (macro_call_element, arg_elt);
while (1)
{
diff --git a/tp/t/results/alias/alias_macro_target_removed.pl
b/tp/t/results/alias/alias_macro_target_removed.pl
index d2a66fcad5..522ba166de 100644
--- a/tp/t/results/alias/alias_macro_target_removed.pl
+++ b/tp/t/results/alias/alias_macro_target_removed.pl
@@ -116,7 +116,7 @@ $result_trees{'alias_macro_target_removed'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/alias/alias_of_macro.pl
b/tp/t/results/alias/alias_of_macro.pl
index 2c8102af18..884266b203 100644
--- a/tp/t/results/alias/alias_of_macro.pl
+++ b/tp/t/results/alias/alias_of_macro.pl
@@ -116,7 +116,7 @@ $result_trees{'alias_of_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/alias/alias_of_macro_before_macro.pl
b/tp/t/results/alias/alias_of_macro_before_macro.pl
index 06fbc27223..42d1237775 100644
--- a/tp/t/results/alias/alias_of_macro_before_macro.pl
+++ b/tp/t/results/alias/alias_of_macro_before_macro.pl
@@ -116,7 +116,7 @@ $result_trees{'alias_of_macro_before_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/alias/texinfo_command_alias.pl
b/tp/t/results/alias/texinfo_command_alias.pl
index 7a850662f6..be846e274a 100644
--- a/tp/t/results/alias/texinfo_command_alias.pl
+++ b/tp/t/results/alias/texinfo_command_alias.pl
@@ -116,7 +116,7 @@ $result_trees{'texinfo_command_alias'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect.pl
b/tp/t/results/alias/texinfo_command_alias_indirect.pl
index 356f421181..9ea25eef34 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect.pl
@@ -154,7 +154,7 @@ $result_trees{'texinfo_command_alias_indirect'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl
b/tp/t/results/conditionals/macro_in_ifset.pl
index 45efb8e635..44d7ee3860 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -170,7 +170,7 @@ $result_trees{'macro_in_ifset'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index 1ea7614d2a..fa9a5d3308 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -244,7 +244,7 @@ $result_trees{'macro_in_ifset_set'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index 0a911b5294..d10262cc4d 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -144,7 +144,7 @@ $result_trees{'nested_ifset_ifclear'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -427,7 +427,7 @@ $result_trees{'nested_ifset_ifclear'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -709,7 +709,7 @@ $result_trees{'nested_ifset_ifclear'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -861,7 +861,7 @@ $result_trees{'nested_ifset_ifclear'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index dccc7d4ec2..300169a3a6 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -990,7 +990,7 @@ $result_trees{'at_commands_in_raw'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index 9c395c95f0..1e4c8ead5b 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -98,7 +98,7 @@ $result_trees{'test_image'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -640,7 +640,7 @@ $result_trees{'test_image'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1136,7 +1136,7 @@ $result_trees{'test_image'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1648,7 +1648,7 @@ $result_trees{'test_image'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2101,7 +2101,7 @@ $result_trees{'test_image'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/include/cpp_lines.pl
b/tp/t/results/include/cpp_lines.pl
index 34b90b27c0..4d0f6f49d1 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -342,7 +342,7 @@ $result_trees{'cpp_lines'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -507,7 +507,7 @@ $result_trees{'cpp_lines'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index b40eb88d4c..1b754fe6b0 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -107,7 +107,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -230,7 +230,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -606,7 +606,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/include/macro_definition_in_include.pl
b/tp/t/results/include/macro_definition_in_include.pl
index 66ad7b9c64..b0d5c11f5a 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -127,7 +127,7 @@ $result_trees{'macro_definition_in_include'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/include/macro_in_early_commands.pl
b/tp/t/results/include/macro_in_early_commands.pl
index e02e746b94..f716b4c402 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -139,7 +139,7 @@ $result_trees{'macro_in_early_commands'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -187,7 +187,7 @@ $result_trees{'macro_in_early_commands'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -385,7 +385,7 @@ $result_trees{'macro_in_early_commands'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -756,7 +756,7 @@ $result_trees{'macro_in_early_commands'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -810,7 +810,7 @@ $result_trees{'macro_in_early_commands'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/info_tests/def_in_copying.pl
b/tp/t/results/info_tests/def_in_copying.pl
index 465f46fe9d..d5d0ca472b 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -162,7 +162,7 @@ $result_trees{'def_in_copying'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -480,7 +480,7 @@ $result_trees{'def_in_copying'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index 87134bb70f..1605a64b91 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -517,7 +517,7 @@ $result_trees{'api_doc_with_linemacro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -708,7 +708,7 @@ $result_trees{'api_doc_with_linemacro'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -925,7 +925,7 @@ $result_trees{'api_doc_with_linemacro'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -1119,7 +1119,7 @@ $result_trees{'api_doc_with_linemacro'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -1317,7 +1317,7 @@ $result_trees{'api_doc_with_linemacro'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
index 8c234c3358..14ad53bc4c 100644
--- a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
@@ -87,7 +87,7 @@ $result_trees{'arobase_brace_in_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -163,7 +163,7 @@ $result_trees{'arobase_brace_in_linemacro_call'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
index 3787e3a64a..d3df43e29d 100644
--- a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
@@ -78,7 +78,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -198,7 +198,7 @@ $result_trees{'begin_conditional_in_linemacro'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'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 a886e88ebd..b7bfe6530b 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
@@ -78,7 +78,7 @@ $result_trees{'block_begin_end_in_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -222,7 +222,7 @@ in quotation
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -333,7 +333,7 @@ in quotation
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -466,7 +466,7 @@ in quotation
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -581,7 +581,7 @@ ignored ',
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -726,7 +726,7 @@ args \\e\\|\\f\\|
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -885,7 +885,7 @@ args \\e\\|\\f\\|
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/blockitem_no_item.pl
b/tp/t/results/linemacro/blockitem_no_item.pl
index d051ee59a7..dfb9fbeb58 100644
--- a/tp/t/results/linemacro/blockitem_no_item.pl
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -114,7 +114,7 @@ $result_trees{'blockitem_no_item'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/brace_command_not_closed.pl
b/tp/t/results/linemacro/brace_command_not_closed.pl
index 92c8cc699b..4890d2d639 100644
--- a/tp/t/results/linemacro/brace_command_not_closed.pl
+++ b/tp/t/results/linemacro/brace_command_not_closed.pl
@@ -79,7 +79,7 @@ $result_trees{'brace_command_not_closed'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/braces_after_text.pl
b/tp/t/results/linemacro/braces_after_text.pl
index 1732cefbca..6ff7c4f8ec 100644
--- a/tp/t/results/linemacro/braces_after_text.pl
+++ b/tp/t/results/linemacro/braces_after_text.pl
@@ -100,7 +100,7 @@ $result_trees{'braces_after_text'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
index f3ba492fb0..d0b1c28bc0 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -161,7 +161,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -202,7 +202,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
index 52e979ce16..dcba797d06 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -156,7 +156,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -223,7 +223,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
index 141b3d6ba3..4b5fa3c903 100644
--- a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
@@ -91,7 +91,7 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/comment_in_linemacro_call.pl
b/tp/t/results/linemacro/comment_in_linemacro_call.pl
index c330ac749a..21fb96bb8c 100644
--- a/tp/t/results/linemacro/comment_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_linemacro_call.pl
@@ -87,7 +87,7 @@ $result_trees{'comment_in_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
index 23323021e8..d661a3b92b 100644
--- a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
@@ -78,7 +78,7 @@ $result_trees{'comment_in_one_argument_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git
a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
index 13e1e0c064..3c05683434 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
@@ -154,7 +154,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'}
= {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -184,7 +184,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'}
= {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
index 52120fae0b..829ea687bb 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
@@ -96,7 +96,7 @@ $result_trees{'comment_on_linemacro_call_out_of_braces'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -175,7 +175,7 @@ $result_trees{'comment_on_linemacro_call_out_of_braces'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -237,7 +237,7 @@ $result_trees{'comment_on_linemacro_call_out_of_braces'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/empty_last_argument.pl
b/tp/t/results/linemacro/empty_last_argument.pl
index b5f76d44ab..e66df6971e 100644
--- a/tp/t/results/linemacro/empty_last_argument.pl
+++ b/tp/t/results/linemacro/empty_last_argument.pl
@@ -133,7 +133,7 @@ $result_trees{'empty_last_argument'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -297,7 +297,7 @@ $result_trees{'empty_last_argument'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -450,7 +450,7 @@ $result_trees{'empty_last_argument'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/end_conditional_in_linemacro.pl
b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
index def39ec135..12e9abfd2d 100644
--- a/tp/t/results/linemacro/end_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
@@ -113,7 +113,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl
b/tp/t/results/linemacro/last_argument_with_braces.pl
index f47545519b..09a7ae8652 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -101,7 +101,7 @@ $result_trees{'last_argument_with_braces'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -435,7 +435,7 @@ $result_trees{'last_argument_with_braces'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -720,7 +720,7 @@ $result_trees{'last_argument_with_braces'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/nested_linemacro_calls.pl
b/tp/t/results/linemacro/nested_linemacro_calls.pl
index 2d753806d8..243f572eef 100644
--- a/tp/t/results/linemacro/nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/nested_linemacro_calls.pl
@@ -171,7 +171,7 @@ $result_trees{'nested_linemacro_calls'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -256,7 +256,7 @@ $result_trees{'nested_linemacro_calls'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -462,7 +462,7 @@ $result_trees{'nested_linemacro_calls'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
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 2fe581cd27..47d56854ff 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -105,7 +105,7 @@ $result_trees{'newline_and_continuation_in_brace'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/no_arguments.pl
b/tp/t/results/linemacro/no_arguments.pl
index 835b50f383..bb6782e220 100644
--- a/tp/t/results/linemacro/no_arguments.pl
+++ b/tp/t/results/linemacro/no_arguments.pl
@@ -74,7 +74,7 @@ $result_trees{'no_arguments'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -117,7 +117,7 @@ $result_trees{'no_arguments'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -163,7 +163,7 @@ $result_trees{'no_arguments'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/paragraph_no_paragraph.pl
b/tp/t/results/linemacro/paragraph_no_paragraph.pl
index 1a39d1f936..49f1b6cfa3 100644
--- a/tp/t/results/linemacro/paragraph_no_paragraph.pl
+++ b/tp/t/results/linemacro/paragraph_no_paragraph.pl
@@ -87,7 +87,7 @@ $result_trees{'paragraph_no_paragraph'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -207,7 +207,7 @@ $result_trees{'paragraph_no_paragraph'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index e16eae3082..df2d29a5bc 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -85,7 +85,7 @@ $result_trees{'protected_spaces_on_line'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -356,7 +356,7 @@ $result_trees{'protected_spaces_on_line'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -657,7 +657,7 @@ $result_trees{'protected_spaces_on_line'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
index a2f0da6b70..96019c3d5a 100644
--- a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
+++ b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
@@ -71,7 +71,7 @@ $result_trees{'protection_of_end_of_line_by_command'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_body.pl
b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
index 11aec42b86..7938b73f9d 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_body.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
@@ -80,7 +80,7 @@ $result_trees{'recursive_linemacro_in_body'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_call.pl
b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
index dc5ff7b5b2..d47588512e 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_call.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
@@ -80,7 +80,7 @@ $result_trees{'recursive_linemacro_in_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index 5652163692..f54fec6c41 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -200,7 +200,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -298,7 +298,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
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 c80ba6d30f..980e92ceba 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -89,7 +89,7 @@ $result_trees{'spaces_after_command_in_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
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 0903621261..2479c0fc3f 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
@@ -217,7 +217,7 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -315,7 +315,7 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -477,7 +477,7 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -575,7 +575,7 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
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 e8e2067466..d1de2739fd 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
@@ -89,7 +89,7 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/spaces_in_args.pl
b/tp/t/results/linemacro/spaces_in_args.pl
index 4213b6a509..87ab126529 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -89,7 +89,7 @@ $result_trees{'spaces_in_args'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/spaces_in_call.pl
b/tp/t/results/linemacro/spaces_in_call.pl
index 7ff4c9c97e..cb02c7b20c 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -89,7 +89,7 @@ $result_trees{'spaces_in_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/text_arguments.pl
b/tp/t/results/linemacro/text_arguments.pl
index 1a227aa60f..50fe22596d 100644
--- a/tp/t/results/linemacro/text_arguments.pl
+++ b/tp/t/results/linemacro/text_arguments.pl
@@ -86,7 +86,7 @@ $result_trees{'text_arguments'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/verb_in_linemacro_call.pl
b/tp/t/results/linemacro/verb_in_linemacro_call.pl
index d3366da0ab..7d440f38e5 100644
--- a/tp/t/results/linemacro/verb_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_in_linemacro_call.pl
@@ -121,7 +121,7 @@ $result_trees{'verb_in_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/verb_not_closed.pl
b/tp/t/results/linemacro/verb_not_closed.pl
index e3233daf65..2f6f6c8bd4 100644
--- a/tp/t/results/linemacro/verb_not_closed.pl
+++ b/tp/t/results/linemacro/verb_not_closed.pl
@@ -79,7 +79,7 @@ $result_trees{'verb_not_closed'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
index 33b92a4c2f..474957dfc9 100644
--- a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
@@ -79,7 +79,7 @@ $result_trees{'verb_with_arobase_in_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
index b62e3cc7a0..38d44cd1cf 100644
--- a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
@@ -79,7 +79,7 @@ $result_trees{'verb_with_brace_in_linemacro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl
b/tp/t/results/macro/arg_body_expansion_order.pl
index c6c92049c0..37768f757b 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -154,7 +154,7 @@ $result_trees{'arg_body_expansion_order'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -253,7 +253,7 @@ $result_trees{'arg_body_expansion_order'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/arg_not_closed.pl
b/tp/t/results/macro/arg_not_closed.pl
index 9af2bc78fc..f790cfac81 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -78,7 +78,7 @@ $result_trees{'arg_not_closed'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/arobase_brace_in_macro_call.pl
b/tp/t/results/macro/arobase_brace_in_macro_call.pl
index 8145224a59..1681f3f790 100644
--- a/tp/t/results/macro/arobase_brace_in_macro_call.pl
+++ b/tp/t/results/macro/arobase_brace_in_macro_call.pl
@@ -87,7 +87,7 @@ $result_trees{'arobase_brace_in_macro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -153,7 +153,7 @@ $result_trees{'arobase_brace_in_macro_call'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/backslash_in_arg.pl
b/tp/t/results/macro/backslash_in_arg.pl
index df297e8089..333c7f6e8c 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -127,7 +127,7 @@ $result_trees{'backslash_in_arg'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -201,7 +201,7 @@ $result_trees{'backslash_in_arg'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -269,7 +269,7 @@ $result_trees{'backslash_in_arg'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -340,7 +340,7 @@ $result_trees{'backslash_in_arg'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/bib_example.pl
b/tp/t/results/macro/bib_example.pl
index 00e01f1a15..1a76617af3 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -2454,7 +2454,7 @@ $result_trees{'bib_example'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -2566,7 +2566,7 @@ $result_trees{'bib_example'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -2769,7 +2769,7 @@ $result_trees{'bib_example'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2988,7 +2988,7 @@ $result_trees{'bib_example'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -3134,7 +3134,7 @@ $result_trees{'bib_example'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -3177,7 +3177,7 @@ $result_trees{'bib_example'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3384,7 +3384,7 @@ $result_trees{'bib_example'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3486,7 +3486,7 @@ $result_trees{'bib_example'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git
a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
index 1ca8105ee2..4b308d6a53 100644
--- a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
+++ b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
@@ -86,7 +86,7 @@
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/complete_macro_for_end.pl
b/tp/t/results/macro/complete_macro_for_end.pl
index 5817fb3134..04602d4a61 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -86,7 +86,7 @@ $result_trees{'complete_macro_for_end'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/complex_argument.pl
b/tp/t/results/macro/complex_argument.pl
index 4d3cd6960b..53cd76ec34 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -215,7 +215,7 @@ $result_trees{'complex_argument'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -306,7 +306,7 @@ macroseven defined
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -373,7 +373,7 @@ macroseven defined
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -741,7 +741,7 @@ macroseven defined
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -815,7 +815,7 @@ macroseven defined
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/cpp_directives_after_macros.pl
b/tp/t/results/macro/cpp_directives_after_macros.pl
index aef00de8a7..361aba99ea 100644
--- a/tp/t/results/macro/cpp_directives_after_macros.pl
+++ b/tp/t/results/macro/cpp_directives_after_macros.pl
@@ -151,7 +151,7 @@ $result_trees{'cpp_directives_after_macros'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -208,7 +208,7 @@ $result_trees{'cpp_directives_after_macros'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/cpp_directives_in_macro.pl
b/tp/t/results/macro/cpp_directives_in_macro.pl
index 281d9f4505..16a13c330f 100644
--- a/tp/t/results/macro/cpp_directives_in_macro.pl
+++ b/tp/t/results/macro/cpp_directives_in_macro.pl
@@ -95,7 +95,7 @@ $result_trees{'cpp_directives_in_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/cpp_directives_line_value_macro.pl
b/tp/t/results/macro/cpp_directives_line_value_macro.pl
index b70fa248f1..b953213323 100644
--- a/tp/t/results/macro/cpp_directives_line_value_macro.pl
+++ b/tp/t/results/macro/cpp_directives_line_value_macro.pl
@@ -91,7 +91,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -189,7 +189,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -291,7 +291,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
index f2c8fb5b96..14612e51d5 100644
--- a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
+++ b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
@@ -117,7 +117,7 @@ $result_trees{'definfoenclose_replaced_by_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl
b/tp/t/results/macro/double_recursive_macro_call.pl
index 508bec900a..b74be3262c 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -143,7 +143,7 @@ $result_trees{'double_recursive_macro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -159,7 +159,7 @@ $result_trees{'double_recursive_macro_call'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/empty_macro_argument.pl
b/tp/t/results/macro/empty_macro_argument.pl
index 3a35ab2c44..9a08e32d80 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -74,7 +74,7 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -96,7 +96,7 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -124,7 +124,7 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -152,7 +152,7 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -263,7 +263,7 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -285,7 +285,7 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -313,7 +313,7 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -341,7 +341,7 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl
b/tp/t/results/macro/empty_macro_no_arg.pl
index 5944164b86..920a11435d 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -95,7 +95,7 @@ $result_trees{'empty_macro_no_arg'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/expand_two_same.pl
b/tp/t/results/macro/expand_two_same.pl
index 1d137a1a1a..76cb8d8189 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -82,7 +82,7 @@ $result_trees{'expand_two_same'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -198,7 +198,7 @@ arg}
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/expansion_order.pl
b/tp/t/results/macro/expansion_order.pl
index 1ebd8d6c8b..f5e4185017 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -141,7 +141,7 @@ $result_trees{'expansion_order'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -162,7 +162,7 @@ $result_trees{'expansion_order'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index d3551fd016..001daf89ca 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -144,7 +144,7 @@ $result_trees{'form_feeds'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -226,7 +226,7 @@ $result_trees{'form_feeds'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index 4d0fda0500..b0738c5778 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -521,7 +521,7 @@ $result_trees{'glossary'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -837,7 +837,7 @@ $result_trees{'glossary'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -960,7 +960,7 @@ $result_trees{'glossary'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -1277,7 +1277,7 @@ $result_trees{'glossary'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -1475,7 +1475,7 @@ $result_trees{'glossary'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/ifclear_in_macro.pl
b/tp/t/results/macro/ifclear_in_macro.pl
index b0e04125c2..a0e5a2c9bc 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -81,7 +81,7 @@ $result_trees{'ifclear_in_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/ifset_in_macro.pl
b/tp/t/results/macro/ifset_in_macro.pl
index 4b6bc0e0c6..a40038c2d4 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -81,7 +81,7 @@ $result_trees{'ifset_in_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl
b/tp/t/results/macro/ifset_in_macro_set.pl
index 059df92a5c..de3a8d60b0 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -81,7 +81,7 @@ $result_trees{'ifset_in_macro_set'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/ignored_macro_definition.pl
b/tp/t/results/macro/ignored_macro_definition.pl
index 580297c359..311ea7065e 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -126,7 +126,7 @@ in inlinefmt tex
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index b1ab036bf3..96cb8a88bf 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -76,7 +76,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl
b/tp/t/results/macro/implicit_quoting_recursion.pl
index 38b4400060..ba247df3f4 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -82,7 +82,7 @@ $result_trees{'implicit_quoting_recursion'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -111,7 +111,7 @@ $result_trees{'implicit_quoting_recursion'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -145,7 +145,7 @@ $result_trees{'implicit_quoting_recursion'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -179,7 +179,7 @@ $result_trees{'implicit_quoting_recursion'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -213,7 +213,7 @@ $result_trees{'implicit_quoting_recursion'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -247,7 +247,7 @@ $result_trees{'implicit_quoting_recursion'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/include_after_empty_line_arg.pl
b/tp/t/results/macro/include_after_empty_line_arg.pl
index 35b58a7f16..6b1fd895c4 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -71,7 +71,7 @@ $result_trees{'include_after_empty_line_arg'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index 9389ed9433..a47aef5b66 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -77,7 +77,7 @@ $result_trees{'leading_spaces_no_ignore'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/line_end_accent_command_macro_call.pl
b/tp/t/results/macro/line_end_accent_command_macro_call.pl
index 05654393bd..10c3bddc60 100644
--- a/tp/t/results/macro/line_end_accent_command_macro_call.pl
+++ b/tp/t/results/macro/line_end_accent_command_macro_call.pl
@@ -67,7 +67,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -210,7 +210,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_after_paragraph.pl
b/tp/t/results/macro/macro_after_paragraph.pl
index 85c1aa26d8..c6d4488449 100644
--- a/tp/t/results/macro/macro_after_paragraph.pl
+++ b/tp/t/results/macro/macro_after_paragraph.pl
@@ -86,7 +86,7 @@ $result_trees{'macro_after_paragraph'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index 32fa1df14c..6a2500e77a 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -196,7 +196,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -579,7 +579,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -755,7 +755,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -1135,7 +1135,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_before_specific_line_command_args.pl
b/tp/t/results/macro/macro_before_specific_line_command_args.pl
index 972c4bd566..1dbdf962a7 100644
--- a/tp/t/results/macro/macro_before_specific_line_command_args.pl
+++ b/tp/t/results/macro/macro_before_specific_line_command_args.pl
@@ -105,7 +105,7 @@ $result_trees{'macro_before_specific_line_command_args'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_call_empty_middle_arg.pl
b/tp/t/results/macro/macro_call_empty_middle_arg.pl
index 0b77ca4a9b..626db85c9a 100644
--- a/tp/t/results/macro/macro_call_empty_middle_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_middle_arg.pl
@@ -96,7 +96,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -175,7 +175,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -249,7 +249,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_call_empty_two_arg.pl
b/tp/t/results/macro/macro_call_empty_two_arg.pl
index b3ca2f402f..689eaf3cd8 100644
--- a/tp/t/results/macro/macro_call_empty_two_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_two_arg.pl
@@ -87,7 +87,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -131,7 +131,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -180,7 +180,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -232,7 +232,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -284,7 +284,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -341,7 +341,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -398,7 +398,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -450,7 +450,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -507,7 +507,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 9,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -569,7 +569,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 10,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -621,7 +621,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 11,
'element' => {
- 'args' => [
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
diff --git a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
index 2dcfa6200b..f883f29620 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -81,7 +81,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_call_in_node_manual.pl
b/tp/t/results/macro/macro_call_in_node_manual.pl
index 6b6847d202..086142a215 100644
--- a/tp/t/results/macro/macro_call_in_node_manual.pl
+++ b/tp/t/results/macro/macro_call_in_node_manual.pl
@@ -384,7 +384,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -459,7 +459,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -536,7 +536,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -622,7 +622,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -649,7 +649,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -725,7 +725,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -812,7 +812,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -858,7 +858,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -939,7 +939,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 9,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1029,7 +1029,7 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'counter' => 10,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
index 438f51ad8d..f39be61a4e 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
@@ -74,7 +74,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
index 2ecdbd53eb..6f8b60648f 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
@@ -74,7 +74,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git
a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
index 4c0fcaa786..518c471514 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
@@ -89,7 +89,7 @@
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
index 36b5584a25..e7b43eb897 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
@@ -74,7 +74,7 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
index 26a26df309..83c251abcb 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
@@ -72,7 +72,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl
b/tp/t/results/macro/macro_expands_to_empty.pl
index df10a61873..c239bf594c 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -76,7 +76,7 @@ $result_trees{'macro_expands_to_empty'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -106,7 +106,7 @@ $result_trees{'macro_expands_to_empty'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_expansion.pl
b/tp/t/results/macro/macro_expansion.pl
index 71084513c5..3c0a5722b7 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -102,7 +102,7 @@ $result_trees{'macro_expansion'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -220,7 +220,7 @@ $result_trees{'macro_expansion'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -434,7 +434,7 @@ $result_trees{'macro_expansion'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -549,7 +549,7 @@ $result_trees{'macro_expansion'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -664,7 +664,7 @@ $result_trees{'macro_expansion'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
index cde3a0756c..6ad4168f09 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
@@ -99,7 +99,7 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
index ad095e25c8..35502fb1f5 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
@@ -89,7 +89,7 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
index d11ea0838a..dd8bc0e3a0 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
@@ -72,7 +72,7 @@ $result_trees{'macro_expansion_end_in_ignored_ifset_content'}
= {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
index a6e42ff53e..8d3644813f 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
@@ -77,7 +77,7 @@
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
index 1bf4229608..d54df082d3 100644
---
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
+++
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
@@ -77,7 +77,7 @@
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
index 74d7d68bf7..7bc98f88a4 100644
--- a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
+++ b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
@@ -140,7 +140,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -179,7 +179,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -237,7 +237,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -276,7 +276,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -341,7 +341,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
index 8298500c15..938febd8d5 100644
--- a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
+++ b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
@@ -106,7 +106,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -129,7 +129,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_for_end.pl
b/tp/t/results/macro/macro_for_end.pl
index 86c018881c..b9f165c22d 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -86,7 +86,7 @@ $result_trees{'macro_for_end'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_for_ignored_line_command.pl
b/tp/t/results/macro/macro_for_ignored_line_command.pl
index 92d3740221..e6a100ca24 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -67,7 +67,7 @@ $result_trees{'macro_for_ignored_line_command'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_for_verb.pl
b/tp/t/results/macro/macro_for_verb.pl
index aaad3b679b..aa1c3b790a 100644
--- a/tp/t/results/macro/macro_for_verb.pl
+++ b/tp/t/results/macro/macro_for_verb.pl
@@ -67,7 +67,7 @@ $result_trees{'macro_for_verb'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_accent.pl
b/tp/t/results/macro/macro_in_accent.pl
index 9d8de6ae26..a6776ed003 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -145,7 +145,7 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -196,7 +196,7 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -246,7 +246,7 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -287,7 +287,7 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -350,7 +350,7 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -372,7 +372,7 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_brace_command.pl
b/tp/t/results/macro/macro_in_brace_command.pl
index 97f129d8b0..8283f4152c 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -165,7 +165,7 @@ $result_trees{'macro_in_brace_command'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -193,7 +193,7 @@ $result_trees{'macro_in_brace_command'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 55614befae..0cad3403a3 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -134,7 +134,7 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -229,7 +229,7 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -319,7 +319,7 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -393,7 +393,7 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_empty_menu_comment.pl
b/tp/t/results/macro/macro_in_empty_menu_comment.pl
index 3789982ffa..116435e13e 100644
--- a/tp/t/results/macro/macro_in_empty_menu_comment.pl
+++ b/tp/t/results/macro/macro_in_empty_menu_comment.pl
@@ -88,7 +88,7 @@ $result_trees{'macro_in_empty_menu_comment'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
index adf4934552..4d9b2b1471 100644
--- a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
@@ -111,7 +111,7 @@
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
index 7d594382e4..c95c98853e 100644
--- a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
@@ -89,7 +89,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_empty_text.pl
b/tp/t/results/macro/macro_in_empty_text.pl
index eeb534a890..53fa383d11 100644
--- a/tp/t/results/macro/macro_in_empty_text.pl
+++ b/tp/t/results/macro/macro_in_empty_text.pl
@@ -86,7 +86,7 @@ $result_trees{'macro_in_empty_text'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_end_argument.pl
b/tp/t/results/macro/macro_in_end_argument.pl
index dd006e8611..08122e439b 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -116,7 +116,7 @@ $result_trees{'macro_in_end_argument'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_index_commands.pl
b/tp/t/results/macro/macro_in_index_commands.pl
index 5a2614c465..704debeb0b 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -188,7 +188,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -234,7 +234,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -259,7 +259,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -421,7 +421,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -608,7 +608,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -751,7 +751,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -929,7 +929,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -997,7 +997,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1029,7 +1029,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 9,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1132,7 +1132,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 10,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1205,7 +1205,7 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 11,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index 90dd13026d..2f785c306d 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -97,7 +97,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl
b/tp/t/results/macro/macro_in_macro_arg.pl
index 8c4cdaf2a7..3dcda5e408 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -212,7 +212,7 @@ $result_trees{'macro_in_macro_arg'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -233,7 +233,7 @@ $result_trees{'macro_in_macro_arg'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -249,7 +249,7 @@ $result_trees{'macro_in_macro_arg'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
index d7bba5cd8f..09f699409c 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -145,7 +145,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -166,7 +166,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_menu.pl
b/tp/t/results/macro/macro_in_menu.pl
index c20c970af9..267588ba31 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -383,7 +383,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -412,7 +412,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -481,7 +481,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -522,7 +522,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -592,7 +592,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -614,7 +614,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -692,7 +692,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -731,7 +731,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -754,7 +754,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 9,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -837,7 +837,7 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 10,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
index 0874777f9d..3321b9e986 100644
--- a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
@@ -86,7 +86,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} =
{
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
index 5a9a5f16d7..a7afeb798a 100644
--- a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
@@ -95,7 +95,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -118,7 +118,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -150,7 +150,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -185,7 +185,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_menu_description.pl
b/tp/t/results/macro/macro_in_menu_description.pl
index f03e501c6a..cbe73b1310 100644
--- a/tp/t/results/macro/macro_in_menu_description.pl
+++ b/tp/t/results/macro/macro_in_menu_description.pl
@@ -136,7 +136,7 @@ $result_trees{'macro_in_menu_description'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl
b/tp/t/results/macro/macro_in_misc_commands.pl
index 12408c65f2..5360f04fb3 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -164,7 +164,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -195,7 +195,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -239,7 +239,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -472,7 +472,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -509,7 +509,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -725,7 +725,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -750,7 +750,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -793,7 +793,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -846,7 +846,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 9,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -898,7 +898,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 10,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1041,7 +1041,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 11,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1124,7 +1124,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 12,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1210,7 +1210,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 13,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1425,7 +1425,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 14,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1601,7 +1601,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 15,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1678,7 +1678,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 17,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1725,7 +1725,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 16,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1752,7 +1752,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 18,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1940,7 +1940,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 19,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2389,7 +2389,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 20,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2448,7 +2448,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 21,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2507,7 +2507,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 22,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2566,7 +2566,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 23,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2625,7 +2625,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 24,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2684,7 +2684,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 25,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2854,7 +2854,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 26,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2913,7 +2913,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 27,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3083,7 +3083,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 28,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3142,7 +3142,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 29,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3269,7 +3269,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 30,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3444,7 +3444,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 31,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3508,7 +3508,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 32,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3709,7 +3709,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 33,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3756,7 +3756,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 34,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3799,7 +3799,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 35,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3838,7 +3838,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 36,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3882,7 +3882,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 37,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3928,7 +3928,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 38,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3968,7 +3968,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 39,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4012,7 +4012,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 40,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4066,7 +4066,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 41,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4116,7 +4116,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 42,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4159,7 +4159,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 43,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4254,7 +4254,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 44,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4365,7 +4365,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 45,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4510,7 +4510,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 46,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4644,7 +4644,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 47,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4762,7 +4762,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 48,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4833,7 +4833,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 49,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -4934,7 +4934,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 50,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -5032,7 +5032,7 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 51,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
index 4a7a0f6788..1580a88338 100644
--- a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
@@ -113,7 +113,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_in_table_empty_before_item.pl
b/tp/t/results/macro/macro_in_table_empty_before_item.pl
index 74559f12d0..f1901564d1 100644
--- a/tp/t/results/macro/macro_in_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_table_empty_before_item.pl
@@ -91,7 +91,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
index c80b3f303c..138d4fe75e 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
@@ -76,7 +76,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -147,7 +147,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
index 5a51d660a0..8e65e84006 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
@@ -76,7 +76,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -147,7 +147,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_name_with_digit.pl
b/tp/t/results/macro/macro_name_with_digit.pl
index 9ffec8cd26..6f81cae684 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -136,7 +136,7 @@ $result_trees{'macro_name_with_digit'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -160,7 +160,7 @@ $result_trees{'macro_name_with_digit'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl
b/tp/t/results/macro/macro_name_with_hyphen.pl
index ad06dba711..fdfabf3d12 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -82,7 +82,7 @@ $result_trees{'macro_name_with_hyphen'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 9ce65e4098..e3362bb228 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -74,7 +74,7 @@ $result_trees{'macro_no_arg_expansion'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/macro_one_arg_end_of_file.pl
b/tp/t/results/macro/macro_one_arg_end_of_file.pl
index 85c3f41fcc..90288aa072 100644
--- a/tp/t/results/macro/macro_one_arg_end_of_file.pl
+++ b/tp/t/results/macro/macro_one_arg_end_of_file.pl
@@ -78,7 +78,7 @@ $result_trees{'macro_one_arg_end_of_file'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'line_arg'
}
diff --git a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
index 94438dfca4..aacba5f0f9 100644
--- a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
+++ b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
@@ -71,7 +71,7 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 8ed3d254e2..058be0098f 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -78,7 +78,7 @@ $result_trees{'macro_zero'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/nested_macro_call.pl
b/tp/t/results/macro/nested_macro_call.pl
index 44d935fe72..6fd22310a0 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -137,7 +137,7 @@ $result_trees{'nested_macro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -154,7 +154,7 @@ $result_trees{'nested_macro_call'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/no_macrobody.pl
b/tp/t/results/macro/no_macrobody.pl
index 90afe94efe..78df8a0b98 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -71,7 +71,7 @@ $result_trees{'no_macrobody'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -114,7 +114,7 @@ $result_trees{'no_macrobody'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/paragraph_and_macro.pl
b/tp/t/results/macro/paragraph_and_macro.pl
index 2e15948dd1..a772348470 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -183,7 +183,7 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -216,7 +216,7 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -251,7 +251,7 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -292,7 +292,7 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -326,7 +326,7 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -361,7 +361,7 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl
b/tp/t/results/macro/protect_comma_macro_line.pl
index 0e73fb95df..50794304c0 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -93,7 +93,7 @@ $result_trees{'protect_comma_macro_line'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/protect_in_body.pl
b/tp/t/results/macro/protect_in_body.pl
index 2ae01b4ba2..8da6b5d580 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -82,7 +82,7 @@ $result_trees{'protect_in_body'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/protect_in_body_one_arg.pl
b/tp/t/results/macro/protect_in_body_one_arg.pl
index 7b7b126de8..7cbc75365a 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -82,7 +82,7 @@ $result_trees{'protect_in_body_one_arg'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl
b/tp/t/results/macro/recursive_call_in_argument.pl
index 2b5098b3d7..78f1adc2de 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -78,7 +78,7 @@ $result_trees{'recursive_call_in_argument'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl
b/tp/t/results/macro/recursive_call_in_macro.pl
index 545a2cf282..1ca04d53d7 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -76,7 +76,7 @@ $result_trees{'recursive_call_in_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/recursive_call_in_rmacro.pl
b/tp/t/results/macro/recursive_call_in_rmacro.pl
index 0a88fc8fb3..baa7b9af77 100644
--- a/tp/t/results/macro/recursive_call_in_rmacro.pl
+++ b/tp/t/results/macro/recursive_call_in_rmacro.pl
@@ -77,7 +77,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -93,7 +93,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -109,7 +109,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -125,7 +125,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -141,7 +141,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -157,7 +157,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -173,7 +173,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -189,7 +189,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -205,7 +205,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 9,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -221,7 +221,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 10,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -237,7 +237,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 11,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -253,7 +253,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 12,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -269,7 +269,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 13,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -285,7 +285,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 14,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -301,7 +301,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 15,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -317,7 +317,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 16,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -333,7 +333,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 17,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -349,7 +349,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 18,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -365,7 +365,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 19,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -381,7 +381,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 20,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -397,7 +397,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 21,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -413,7 +413,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 22,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -429,7 +429,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 23,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -445,7 +445,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 24,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -461,7 +461,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 25,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -477,7 +477,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 26,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -493,7 +493,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 27,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -509,7 +509,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 28,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -525,7 +525,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 29,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -541,7 +541,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 30,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -557,7 +557,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 31,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -573,7 +573,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 32,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -589,7 +589,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 33,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -605,7 +605,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 34,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -621,7 +621,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 35,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -637,7 +637,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 36,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -653,7 +653,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 37,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -669,7 +669,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 38,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -685,7 +685,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 39,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -701,7 +701,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 40,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -717,7 +717,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 41,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -733,7 +733,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 42,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -749,7 +749,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 43,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -765,7 +765,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 44,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -781,7 +781,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 45,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -797,7 +797,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 46,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -813,7 +813,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 47,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -829,7 +829,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 48,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -845,7 +845,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 49,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -861,7 +861,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 50,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -877,7 +877,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 51,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -893,7 +893,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 52,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -909,7 +909,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 53,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -925,7 +925,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 54,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -941,7 +941,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 55,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -957,7 +957,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 56,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -973,7 +973,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 57,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -989,7 +989,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 58,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1005,7 +1005,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 59,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1021,7 +1021,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 60,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1037,7 +1037,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 61,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1053,7 +1053,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 62,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1069,7 +1069,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 63,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1085,7 +1085,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 64,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1101,7 +1101,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 65,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1117,7 +1117,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 66,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1133,7 +1133,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 67,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1149,7 +1149,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 68,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1165,7 +1165,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 69,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1181,7 +1181,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 70,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1197,7 +1197,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 71,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1213,7 +1213,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 72,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1229,7 +1229,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 73,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1245,7 +1245,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 74,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1261,7 +1261,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 75,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1277,7 +1277,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 76,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1293,7 +1293,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 77,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1309,7 +1309,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 78,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1325,7 +1325,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 79,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1341,7 +1341,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 80,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1357,7 +1357,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 81,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1373,7 +1373,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 82,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1389,7 +1389,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 83,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1405,7 +1405,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 84,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1421,7 +1421,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 85,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1437,7 +1437,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 86,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1453,7 +1453,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 87,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1469,7 +1469,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 88,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1485,7 +1485,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 89,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1501,7 +1501,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 90,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1517,7 +1517,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 91,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1533,7 +1533,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 92,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1549,7 +1549,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 93,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1565,7 +1565,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 94,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1581,7 +1581,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 95,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1597,7 +1597,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 96,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1613,7 +1613,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 97,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1629,7 +1629,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 98,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1645,7 +1645,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 99,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1661,7 +1661,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 100,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 6034de595c..d02d74f4bc 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -71,7 +71,7 @@ $result_trees{'redefine_texinfo_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl
b/tp/t/results/macro/simple_imbricated_macro.pl
index 56cc14b2b0..8985e9623d 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -89,7 +89,7 @@ $result_trees{'simple_imbricated_macro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -184,7 +184,7 @@ $result_trees{'simple_imbricated_macro'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
index d12da05a13..cd057fd3f8 100644
--- a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
@@ -89,7 +89,7 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -184,7 +184,7 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/space_macro_after_end.pl
b/tp/t/results/macro/space_macro_after_end.pl
index 455ced2edc..7473b310fa 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -104,7 +104,7 @@ $result_trees{'space_macro_after_end'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/space_macro_after_end_verbatim.pl
b/tp/t/results/macro/space_macro_after_end_verbatim.pl
index 01e3a80146..043a9ce7f2 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -100,7 +100,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/too_much_args.pl
b/tp/t/results/macro/too_much_args.pl
index 60cc553cae..1351843e05 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -87,7 +87,7 @@ $result_trees{'too_much_args'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/two_macros_on_a_line.pl
b/tp/t/results/macro/two_macros_on_a_line.pl
index a4ae427a12..13f3d0b8fd 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -182,7 +182,7 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -204,7 +204,7 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -282,7 +282,7 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -343,7 +343,7 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -403,7 +403,7 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -464,7 +464,7 @@ in macro'
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
index 40de8a9d68..31f8729f9a 100644
--- a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
+++ b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
@@ -83,7 +83,7 @@ $result_trees{'unpaired_backslash_in_macro_body'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
index 685e2c0a50..3da6a9dc5a 100644
--- a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
@@ -87,7 +87,7 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
index ef5f98b9c0..ec4540cd9e 100644
--- a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
@@ -84,7 +84,7 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 9eb8a54e59..4b8f837817 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -253,7 +253,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -269,7 +269,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -647,7 +647,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1053,7 +1053,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1567,7 +1567,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1583,7 +1583,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1961,7 +1961,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2367,7 +2367,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 8,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2656,7 +2656,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 9,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -2672,7 +2672,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 10,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3050,7 +3050,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 11,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -3456,7 +3456,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 12,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 623c2bf3d7..5c739d4b88 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -176,7 +176,7 @@ $result_trees{'kbdinputstyle'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -662,7 +662,7 @@ $result_trees{'kbdinputstyle'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1139,7 +1139,7 @@ $result_trees{'kbdinputstyle'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index cdb820873c..babe8bd2f4 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -201,7 +201,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -807,7 +807,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1405,7 +1405,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index fcb8527203..62dabd47da 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -241,7 +241,7 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -562,7 +562,7 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -713,7 +713,7 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -1034,7 +1034,7 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 4,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1157,7 +1157,7 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 5,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -1626,7 +1626,7 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 6,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
@@ -1947,7 +1947,7 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 7,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
index 60c8e4d61c..3e636cfe9f 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -129,7 +129,7 @@ $result_trees{'star_at_command_formatting'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -394,7 +394,7 @@ $result_trees{'star_at_command_formatting'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -689,7 +689,7 @@ $result_trees{'star_at_command_formatting'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/transformations/protect_colon_source_mark.pl
b/tp/t/results/transformations/protect_colon_source_mark.pl
index 79dee4ffd3..a64d78c699 100644
--- a/tp/t/results/transformations/protect_colon_source_mark.pl
+++ b/tp/t/results/transformations/protect_colon_source_mark.pl
@@ -78,7 +78,7 @@ $result_trees{'protect_colon_source_mark'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/transformations/protect_comma_source_mark.pl
b/tp/t/results/transformations/protect_comma_source_mark.pl
index d7d3d6b909..4ed201c70b 100644
--- a/tp/t/results/transformations/protect_comma_source_mark.pl
+++ b/tp/t/results/transformations/protect_comma_source_mark.pl
@@ -96,7 +96,7 @@ $result_trees{'protect_comma_source_mark'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
index 702cdc6cf1..a9810d3da2 100644
---
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
+++
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
@@ -80,7 +80,7 @@
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git
a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
index 1ca7977494..1182382833 100644
--- a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
+++ b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
@@ -80,7 +80,7 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
index e22c0d435f..a79eba6cdb 100644
---
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
+++
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
@@ -91,7 +91,7 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -202,7 +202,7 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -324,7 +324,7 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
index 045fc92563..3a139b7b35 100644
---
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
+++
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
@@ -96,7 +96,7 @@
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
diff --git a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
index 54916047a5..a9f6afd6e0 100644
--- a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
+++ b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
@@ -104,7 +104,7 @@ $result_trees{'comma_value_in_macro_arg'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/value_and_macro/value_in_macro_body.pl
b/tp/t/results/value_and_macro/value_in_macro_body.pl
index 2ead2c5708..a3b7edbf55 100644
--- a/tp/t/results/value_and_macro/value_in_macro_body.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_body.pl
@@ -100,7 +100,7 @@ $result_trees{'value_in_macro_body'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'contents' => [
{
diff --git a/tp/t/results/xtable/table_nested.pl
b/tp/t/results/xtable/table_nested.pl
index a91e4939f2..2dc0ca5861 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -195,7 +195,7 @@ $result_trees{'table_nested'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -764,7 +764,7 @@ $result_trees{'table_nested'} = {
{
'counter' => 2,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
@@ -1347,7 +1347,7 @@ $result_trees{'table_nested'} = {
{
'counter' => 3,
'element' => {
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_arg'
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_expand_macro_arguments) (_expand_linemacro_arguments, _handle_macro), tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments) (expand_linemacro_arguments, expand_macro_body, handle_macro): use contents instead of args for macro call elements.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_place_source_mark) (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/close.c, tp/Texinfo/XS/parsetexi/end_line.c, tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c, tp/Texinfo/XS/parsetexi/source_marks.c (place_source_mark): put text element for spaces appearing after a brace @-command name before the opening brace directly in info spaces_after_cmd_before_arg instead of using the brace command contents. Ther [...]
- Next by Date:
branch master updated: Use contents instead of args for brace commands in Texinfo tree
- Previous by thread:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_place_source_mark) (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/close.c, tp/Texinfo/XS/parsetexi/end_line.c, tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c, tp/Texinfo/XS/parsetexi/source_marks.c (place_source_mark): put text element for spaces appearing after a brace @-command name before the opening brace directly in info spaces_after_cmd_before_arg instead of using the brace command contents. Ther [...]
- Next by thread:
branch master updated: Use contents instead of args for brace commands in Texinfo tree
- Index(es):