[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_close_container, _r
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_close_container, _remove_empty_content) (_expand_macro_arguments), tp/Texinfo/XS/parsetexi/close.c (remove_empty_content, close_container), tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments): separate the code to remove empty content, put in remove_empty_content from the remaining of close_container. Do not remove completly macro arguments that are empty, only remove the contents, keep a brace_command_arg to mark that there was an empty string argument [...] |
|
Date: |
Thu, 16 Feb 2023 15:57:22 -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 ccca15f7ba * tp/Texinfo/ParserNonXS.pm (_close_container,
_remove_empty_content) (_expand_macro_arguments),
tp/Texinfo/XS/parsetexi/close.c (remove_empty_content, close_container),
tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments): separate the code to
remove empty content, put in remove_empty_content from the remaining of
close_container. Do not remove completly macro arguments that are empty, only
remove the contents, keep a brace_command_arg to mark that there was an e [...]
ccca15f7ba is described below
commit ccca15f7ba6f7f8c37f371fa034ff4d4086e9d2b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 16 21:56:52 2023 +0100
* tp/Texinfo/ParserNonXS.pm (_close_container, _remove_empty_content)
(_expand_macro_arguments), tp/Texinfo/XS/parsetexi/close.c
(remove_empty_content, close_container),
tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments): separate the
code to remove empty content, put in remove_empty_content from the
remaining of close_container. Do not remove completly macro arguments
that are empty, only remove the contents, keep a brace_command_arg to
mark that there was an empty string argument in the Texinfo code.
---
ChangeLog | 11 +
tp/Texinfo/ParserNonXS.pm | 29 +-
tp/Texinfo/XS/parsetexi/close.c | 21 +-
tp/Texinfo/XS/parsetexi/macro.c | 21 +-
tp/Texinfo/XS/parsetexi/parser.h | 1 +
tp/t/results/conditionals/macro_in_ifset.pl | 5 +
tp/t/results/conditionals/macro_in_ifset_set.pl | 5 +
tp/t/results/conditionals/nested_ifset_ifclear.pl | 20 +
.../results/converters_tests/at_commands_in_raw.pl | 5 +
tp/t/results/coverage_braces/test_image.pl | 25 ++
tp/t/results/include/cpp_lines.pl | 10 +
.../macro_and_commands_in_early_commands.pl | 15 +
.../results/include/macro_definition_in_include.pl | 5 +
tp/t/results/include/macro_in_early_commands.pl | 15 +
tp/t/results/info_tests/def_in_copying.pl | 10 +
tp/t/results/macro/arg_body_expansion_order.pl | 5 +
tp/t/results/macro/bib_example.pl | 15 +
tp/t/results/macro/complete_macro_for_end.pl | 5 +
tp/t/results/macro/complex_argument.pl | 15 +
tp/t/results/macro/cpp_directives_after_macros.pl | 10 +
tp/t/results/macro/double_recursive_macro_call.pl | 10 +
tp/t/results/macro/empty_macro_argument.pl | 30 ++
tp/t/results/macro/empty_macro_no_arg.pl | 5 +
tp/t/results/macro/expansion_order.pl | 5 +
tp/t/results/macro/glossary.pl | 5 +
tp/t/results/macro/ignored_macro_definition.pl | 5 +
tp/t/results/macro/include_after_empty_line_arg.pl | 10 +
tp/t/results/macro/leading_spaces_no_ignore.pl | 5 +
tp/t/results/macro/macro_after_paragraph.pl | 5 +
.../macro_before_specific_line_command_args.pl | 5 +
tp/t/results/macro/macro_call_empty_middle_arg.pl | 10 -
tp/t/results/macro/macro_call_empty_two_arg.pl | 51 +--
.../macro/macro_call_in_inlinefmtifelse_format.pl | 5 +
.../macro/macro_end_call_in_ignored_inlinefmt.pl | 5 +
.../macro_end_call_in_ignored_inlinefmtifelse.pl | 5 +
...cro_end_call_in_ignored_inlinefmtifelse_else.pl | 5 +
.../macro/macro_end_call_in_ignored_inlineraw.pl | 5 +
.../results/macro/macro_end_call_in_ignored_raw.pl | 5 +
tp/t/results/macro/macro_expands_to_empty.pl | 5 +
.../macro_expansion_end_in_conditional_end.pl | 5 +
.../macro_expansion_end_in_conditional_line.pl | 5 +
...macro_expansion_end_in_ignored_ifset_content.pl | 5 +
..._expansion_end_in_ignored_nested_conditional.pl | 5 +
..._end_in_ignored_nested_different_conditional.pl | 5 +
.../macro/macro_for_dot_in_menu_not_separator.pl | 10 +
tp/t/results/macro/macro_for_end.pl | 5 +
.../macro/macro_for_ignored_line_command.pl | 5 +
tp/t/results/macro/macro_in_accent.pl | 30 ++
tp/t/results/macro/macro_in_brace_command.pl | 10 +
tp/t/results/macro/macro_in_def_delimiters.pl | 20 +
tp/t/results/macro/macro_in_empty_menu_comment.pl | 5 +
.../macro_in_empty_multitable_empty_before_item.pl | 5 +
.../macro_in_empty_table_empty_before_item.pl | 5 +
tp/t/results/macro/macro_in_empty_text.pl | 5 +
tp/t/results/macro/macro_in_end_argument.pl | 5 +
tp/t/results/macro/macro_in_index_commands.pl | 55 +++
.../macro/macro_in_invalid_documentencoding.pl | 5 +
tp/t/results/macro/macro_in_macro_arg.pl | 5 +
tp/t/results/macro/macro_in_macro_arg_simpler.pl | 5 +
tp/t/results/macro/macro_in_menu.pl | 50 +++
.../macro_in_menu_comment_closed_by_detailmenu.pl | 5 +
.../macro/macro_in_menu_comment_like_entry.pl | 20 +
tp/t/results/macro/macro_in_menu_description.pl | 5 +
tp/t/results/macro/macro_in_misc_commands.pl | 255 +++++++++++
.../macro/macro_in_multitable_empty_before_item.pl | 5 +
.../macro/macro_in_table_empty_before_item.pl | 5 +
.../macro_inlineifcond_end_in_empty_ignored.pl | 10 +
.../macro/macro_inlineifcond_end_in_empty_set.pl | 10 +
tp/t/results/macro/macro_name_with_digit.pl | 5 +
tp/t/results/macro/macro_no_arg_expansion.pl | 5 +
tp/t/results/macro/macro_one_arg_end_of_file.pl | 5 +
tp/t/results/macro/macro_zero.pl | 5 +
tp/t/results/macro/nested_macro_call.pl | 10 +
tp/t/results/macro/paragraph_and_macro.pl | 30 ++
tp/t/results/macro/recursive_call_in_macro.pl | 5 +
tp/t/results/macro/recursive_call_in_rmacro.pl | 500 +++++++++++++++++++++
tp/t/results/macro/simple_imbricated_macro.pl | 10 +
.../macro/simple_imbricated_macro_rmacro.pl | 10 +
tp/t/results/macro/space_macro_after_end.pl | 5 +
.../macro/space_macro_after_end_verbatim.pl | 5 +
tp/t/results/macro/two_macros_on_a_line.pl | 25 ++
.../macro/unpaired_backslash_in_macro_body.pl | 5 +
.../codequoteundirected_codequotebacktick.pl | 60 +++
tp/t/results/misc_commands/kbdinputstyle.pl | 15 +
.../misc_commands/kbdinputstyle_in_table.pl | 15 +
tp/t/results/misc_commands/test_allowcodebreaks.pl | 15 +
.../plaintext_tests/star_at_command_formatting.pl | 15 +
tp/t/results/xtable/table_nested.pl | 15 +
88 files changed, 1676 insertions(+), 78 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f0fc1b82e4..c490390668 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,17 @@
* doc/texinfo.tex (@defline, @deftypeline):
Define as synonymns for @deflinex, @deftypelinex.
+2023-02-16 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_close_container, _remove_empty_content)
+ (_expand_macro_arguments), tp/Texinfo/XS/parsetexi/close.c
+ (remove_empty_content, close_container),
+ tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments): separate the
+ code to remove empty content, put in remove_empty_content from the
+ remaining of close_container. Do not remove completly macro arguments
+ that are empty, only remove the contents, keep a brace_command_arg to
+ mark that there was an empty string argument in the Texinfo code.
+
2023-02-16 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): keep information
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index f5a9484a09..9d4ee7b7c7 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1650,7 +1650,7 @@ sub _is_container_empty($)
return 0;
}
-sub _close_container($$)
+sub _remove_empty_content($$)
{
my $self = shift;
my $current = shift;
@@ -1668,6 +1668,14 @@ sub _close_container($$)
_pop_element_from_contents($self, $current);
}
}
+}
+
+sub _close_container($$)
+{
+ my $self = shift;
+ my $current = shift;
+
+ _remove_empty_content($self, $current);
# remove element without contents nor associated information
my $element_to_remove;
@@ -2541,6 +2549,7 @@ sub _new_line($;$)
# not done by _close_container as argument is in args and not in
# contents.
+# Currently unused
sub _remove_empty_arg($$)
{
my $self = shift;
@@ -2595,6 +2604,8 @@ sub _expand_macro_arguments($$$$$)
} elsif ($separator eq ',') {
if ($braces_level == 1) {
if (scalar(@{$current->{'args'}}) < $args_total) {
+ _remove_empty_content($self, $argument);
+
$argument = {'type' => 'brace_command_arg',
'contents' => [],
'parent' => $current};
@@ -2623,12 +2634,7 @@ sub _expand_macro_arguments($$$$$)
} elsif ($separator eq '}') {
$braces_level--;
if ($braces_level == 0) {
- # It is possible to remove the last argument if empty
- # since not being expanded is the same as being expanded
- # as an empty string.
- if ($argument_content->{'text'} eq '') {
- _remove_empty_arg($self, $argument);
- }
+ _remove_empty_content($self, $argument);
last;
}
$argument_content->{'text'} .= $separator;
@@ -2644,14 +2650,14 @@ sub _expand_macro_arguments($$$$$)
if (!defined($line)) {
$self->_line_error(sprintf(__("\@%s missing closing brace"),
$name), $source_info_orig);
- if ($argument_content->{'text'} eq '') {
- _remove_empty_arg($self, $argument);
- }
+ _remove_empty_content($self, $argument);
return ("\n", $source_info);
}
}
}
- if ($args_total == 0 and scalar(@{$current->{'args'}} > 0)) {
+ if ($args_total == 0
+ and (scalar(@{$current->{'args'}} > 1)
+ or $current->{'args'}->[0]->{'contents'})) {
$self->_line_error(sprintf(__(
"macro `%s' declared without argument called with an argument"),
$name), $source_info);
@@ -4834,7 +4840,6 @@ sub _handle_macro($$$$$)
}
}
}
- _remove_empty_arg($self, $arguments_container->{'args'}->[-1]);
}
my $expanded = _expand_macro_body($self,
$self->{'macros'}->{$command},
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index 2ef7eb72f5..ef860f88cd 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -111,14 +111,10 @@ is_container_empty (ELEMENT *current)
return 0;
}
-/* this should only be called for non @-command elements otherwise
- empty command elements will be removed */
-ELEMENT *
-close_container (ELEMENT *current)
+/* remove an empty content that only holds source marks */
+void
+remove_empty_content (ELEMENT *current)
{
- ELEMENT *element_to_remove = 0;
-
- /* remove an empty content that only holds source marks */
if (current->contents.number == 1)
{
ELEMENT *child_element = last_contents_child (current);
@@ -131,6 +127,17 @@ close_container (ELEMENT *current)
destroy_element (pop_element_from_contents (current));
}
}
+}
+
+/* this should only be called for non @-command elements otherwise
+ empty command elements will be removed */
+ELEMENT *
+close_container (ELEMENT *current)
+{
+ ELEMENT *element_to_remove = 0;
+
+ remove_empty_content (current);
+
/* remove element without contents nor associated information */
if (is_container_empty (current))
{
diff --git a/tp/Texinfo/XS/parsetexi/macro.c b/tp/Texinfo/XS/parsetexi/macro.c
index de559bfc81..bcba88e039 100644
--- a/tp/Texinfo/XS/parsetexi/macro.c
+++ b/tp/Texinfo/XS/parsetexi/macro.c
@@ -239,6 +239,7 @@ lookup_macro_parameter (char *name, ELEMENT *macro)
/* not done by _close_container as argument is in args and not in
contents. */
+/* Currently unused */
ELEMENT *
remove_empty_arg (ELEMENT *argument)
{
@@ -289,9 +290,8 @@ expand_macro_arguments (ELEMENT *macro, char **line_inout,
enum command_id cmd,
line = new_line (argument);
if (!line)
{
- line_error ("@%s missing closing brace", command_name(cmd));
- if (arg->end == 0)
- remove_empty_arg (argument);
+ line_error ("@%s missing closing brace", command_name (cmd));
+ remove_empty_content (argument);
line = "\n";
goto funexit;
}
@@ -343,6 +343,7 @@ expand_macro_arguments (ELEMENT *macro, char **line_inout,
enum command_id cmd,
debug ("MACRO NEW ARG");
pline = sep + 1;
+ remove_empty_content (argument);
if (*sep == ',')
{
char *p = pline;
@@ -361,13 +362,6 @@ expand_macro_arguments (ELEMENT *macro, char **line_inout,
enum command_id cmd,
spaces_element);
}
}
- else if (arg->end == 0)
- /* It is possible to remove the last argument if empty
- since not being expanded is the same as being expanded
- as an empty string.
- Note that if there are source marks or info, the argument
- may not have content anymore but still be there. */
- remove_empty_arg (argument);
}
else
{
@@ -384,7 +378,9 @@ expand_macro_arguments (ELEMENT *macro, char **line_inout,
enum command_id cmd,
debug ("END MACRO ARGS EXPANSION");
line = pline;
- if (args_total == 0 && current->args.number > 0)
+ if (args_total == 0
+ && (current->args.number > 1
+ || current->args.list[0]->contents.number > 0))
{
line_error
("macro `%s' declared without argument called with an argument",
@@ -576,7 +572,6 @@ handle_macro (ELEMENT *current, char **line_inout, enum
command_id cmd)
}
else
{
- ELEMENT *last_child;
ELEMENT *current = new_element (ET_line_arg);
add_to_element_args (arguments_container, current);
@@ -634,8 +629,6 @@ handle_macro (ELEMENT *current, char **line_inout, enum
command_id cmd)
}
}
}
- last_child = last_args_child (arguments_container);
- remove_empty_arg (last_child);
}
expand_macro_body (macro_record, arguments_container, &expanded);
diff --git a/tp/Texinfo/XS/parsetexi/parser.h b/tp/Texinfo/XS/parsetexi/parser.h
index f65b23fadd..1b28cfc91c 100644
--- a/tp/Texinfo/XS/parsetexi/parser.h
+++ b/tp/Texinfo/XS/parsetexi/parser.h
@@ -108,6 +108,7 @@ typedef struct GLOBAL_INFO {
/* In close.c */
int is_container_empty (ELEMENT *current);
+void remove_empty_content (ELEMENT *current);
ELEMENT *close_container (ELEMENT *current);
void close_command_cleanup (ELEMENT *current);
ELEMENT *close_commands (ELEMENT *current, enum command_id
closed_block_command,
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl
b/tp/t/results/conditionals/macro_in_ifset.pl
index 2d0863c165..0655d7e3f3 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -171,6 +171,11 @@ $result_trees{'macro_in_ifset'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truc'
},
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index 7c676026de..db761e6559 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -260,6 +260,11 @@ $result_trees{'macro_in_ifset_set'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truc'
},
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index e6b309a6fe..a007e6f251 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -160,6 +160,11 @@ $result_trees{'nested_ifset_ifclear'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'conditionals'
},
@@ -455,6 +460,11 @@ $result_trees{'nested_ifset_ifclear'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'conditionals'
},
@@ -749,6 +759,11 @@ $result_trees{'nested_ifset_ifclear'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'conditionals'
},
@@ -944,6 +959,11 @@ $result_trees{'nested_ifset_ifclear'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'conditionals'
},
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 495b977620..71d8d6237c 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1050,6 +1050,11 @@ $result_trees{'at_commands_in_raw'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'othermacro'
},
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index d1666f2cf7..a34c733e58 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -102,6 +102,11 @@ $result_trees{'test_image'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'files-char'
},
@@ -665,6 +670,11 @@ $result_trees{'test_image'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'files-char'
},
@@ -1167,6 +1177,11 @@ $result_trees{'test_image'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'files-char'
},
@@ -1688,6 +1703,11 @@ $result_trees{'test_image'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'files-char'
},
@@ -2146,6 +2166,11 @@ $result_trees{'test_image'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'files-char'
},
diff --git a/tp/t/results/include/cpp_lines.pl
b/tp/t/results/include/cpp_lines.pl
index 924ed5a1ba..0cf3b26278 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -353,6 +353,11 @@ $result_trees{'cpp_lines'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macr'
},
@@ -520,6 +525,11 @@ $result_trees{'cpp_lines'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macrtwo'
},
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 ce1c7e177e..5ea96d483b 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
@@ -111,6 +111,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'begin-file'
},
@@ -234,6 +239,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'latin1'
},
@@ -623,6 +633,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'themacro'
},
diff --git a/tp/t/results/include/macro_definition_in_include.pl
b/tp/t/results/include/macro_definition_in_include.pl
index 88d341991b..5ca215f806 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -127,6 +127,11 @@ $result_trees{'macro_definition_in_include'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'themacro'
},
diff --git a/tp/t/results/include/macro_in_early_commands.pl
b/tp/t/results/include/macro_in_early_commands.pl
index f148574ec7..3711b7123b 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -195,6 +195,11 @@ $result_trees{'macro_in_early_commands'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'begin-file'
},
@@ -399,6 +404,11 @@ $result_trees{'macro_in_early_commands'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'latin1'
},
@@ -782,6 +792,11 @@ $result_trees{'macro_in_early_commands'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'themacro'
},
diff --git a/tp/t/results/info_tests/def_in_copying.pl
b/tp/t/results/info_tests/def_in_copying.pl
index dc63799c56..d93db106ab 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -178,6 +178,11 @@ $result_trees{'def_in_copying'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -474,6 +479,11 @@ $result_trees{'def_in_copying'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl
b/tp/t/results/macro/arg_body_expansion_order.pl
index 571a356ac4..007141550f 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -264,6 +264,11 @@ $result_trees{'arg_body_expansion_order'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'othermacro'
},
diff --git a/tp/t/results/macro/bib_example.pl
b/tp/t/results/macro/bib_example.pl
index 8edee4e546..d7fdabdb4d 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -3751,6 +3751,11 @@ $result_trees{'bib_example'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mybibnode'
},
@@ -4168,6 +4173,11 @@ $result_trees{'bib_example'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mybibnode'
},
@@ -4281,6 +4291,11 @@ $result_trees{'bib_example'} = {
{
'counter' => 7,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mybibnode'
},
diff --git a/tp/t/results/macro/complete_macro_for_end.pl
b/tp/t/results/macro/complete_macro_for_end.pl
index cecaf79767..6dee440dc2 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -90,6 +90,11 @@ $result_trees{'complete_macro_for_end'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'theend'
},
diff --git a/tp/t/results/macro/complex_argument.pl
b/tp/t/results/macro/complex_argument.pl
index 9395221841..824781823c 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -325,6 +325,11 @@ macroseven defined
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macrofour'
},
@@ -388,6 +393,11 @@ macroseven defined
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macrofour'
},
@@ -755,6 +765,11 @@ macroseven defined
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macrofour'
},
diff --git a/tp/t/results/macro/cpp_directives_after_macros.pl
b/tp/t/results/macro/cpp_directives_after_macros.pl
index 6fed7d6096..bd1b56abd8 100644
--- a/tp/t/results/macro/cpp_directives_after_macros.pl
+++ b/tp/t/results/macro/cpp_directives_after_macros.pl
@@ -155,6 +155,11 @@ $result_trees{'cpp_directives_after_macros'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'noargsspaces'
},
@@ -204,6 +209,11 @@ $result_trees{'cpp_directives_after_macros'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptyexpansion'
},
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl
b/tp/t/results/macro/double_recursive_macro_call.pl
index 4cf0d9431e..1565391b19 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -151,6 +151,11 @@ $result_trees{'double_recursive_macro_call'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mactwo'
},
@@ -162,6 +167,11 @@ $result_trees{'double_recursive_macro_call'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macone'
},
diff --git a/tp/t/results/macro/empty_macro_argument.pl
b/tp/t/results/macro/empty_macro_argument.pl
index 270ef6a250..261b0f515c 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -71,6 +71,11 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -98,6 +103,11 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -121,6 +131,11 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -252,6 +267,11 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mytwo'
},
@@ -279,6 +299,11 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mytwo'
},
@@ -302,6 +327,11 @@ $result_trees{'empty_macro_argument'} = {
{
'counter' => 7,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mytwo'
},
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl
b/tp/t/results/macro/empty_macro_no_arg.pl
index eae8fdc90f..9ebfbb1126 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -99,6 +99,11 @@ $result_trees{'empty_macro_no_arg'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'foo'
},
diff --git a/tp/t/results/macro/expansion_order.pl
b/tp/t/results/macro/expansion_order.pl
index 4308e6f9f4..23fa06cafc 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -164,6 +164,11 @@ $result_trees{'expansion_order'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'machin'
},
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index d120ccf6c9..456d9df84f 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -1546,6 +1546,11 @@ $result_trees{'glossary'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'glossary'
},
diff --git a/tp/t/results/macro/ignored_macro_definition.pl
b/tp/t/results/macro/ignored_macro_definition.pl
index 336f7d5526..4b2d10f2b4 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -125,6 +125,11 @@ in inlinefmt tex
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
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 da9299490f..21f3d3d2d5 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -75,6 +75,16 @@ $result_trees{'include_after_empty_line_arg'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ''
+ }
+ ],
+ 'type' => 'line_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index 62e576b044..5bb9fbe28f 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -81,6 +81,11 @@ $result_trees{'leading_spaces_no_ignore'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
diff --git a/tp/t/results/macro/macro_after_paragraph.pl
b/tp/t/results/macro/macro_after_paragraph.pl
index 815e95f30b..73df319583 100644
--- a/tp/t/results/macro/macro_after_paragraph.pl
+++ b/tp/t/results/macro/macro_after_paragraph.pl
@@ -90,6 +90,11 @@ $result_trees{'macro_after_paragraph'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
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 2fda65bab6..696d0785c7 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
@@ -109,6 +109,11 @@ $result_trees{'macro_before_specific_line_command_args'} =
{
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'cpfn'
},
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 d702d3d1a2..847571d6eb 100644
--- a/tp/t/results/macro/macro_call_empty_middle_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_middle_arg.pl
@@ -183,11 +183,6 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
'info' => {
'spaces_before_argument' => {
'text' => ' '
@@ -263,11 +258,6 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
'type' => 'brace_command_arg'
},
{
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 b90a2f7f44..1f6bee8dc9 100644
--- a/tp/t/results/macro/macro_call_empty_two_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_two_arg.pl
@@ -84,6 +84,11 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'twoa'
},
@@ -124,6 +129,11 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'twoa'
},
@@ -171,11 +181,6 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
'type' => 'brace_command_arg'
},
{
@@ -229,11 +234,9 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
+ 'type' => 'brace_command_arg'
+ },
+ {
'type' => 'brace_command_arg'
}
],
@@ -284,11 +287,6 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
'type' => 'brace_command_arg'
},
{
@@ -411,6 +409,9 @@ $result_trees{'macro_call_empty_two_arg'} = {
}
],
'type' => 'brace_command_arg'
+ },
+ {
+ 'type' => 'brace_command_arg'
}
],
'extra' => {
@@ -455,11 +456,6 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
'type' => 'brace_command_arg'
},
{
@@ -518,11 +514,6 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
'type' => 'brace_command_arg'
},
{
@@ -586,11 +577,6 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
'type' => 'brace_command_arg'
},
{
@@ -644,11 +630,6 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'contents' => [
- {
- 'text' => ''
- }
- ],
'type' => 'brace_command_arg'
},
{
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 3372a83105..4cc03458cc 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -85,6 +85,11 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'inlinefirstarg'
},
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 e5681cb45d..c939c9eb6b 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
@@ -71,6 +71,11 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'startfmt'
},
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 984cb423e7..1685121273 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
@@ -71,6 +71,11 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} =
{
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'inlinefirstfmt'
},
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 33a2e3f266..2d7c2191ee 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
@@ -93,6 +93,11 @@
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'endcallinignoredinlineelse'
},
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 0a307b6fc7..2a60f53419 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
@@ -71,6 +71,11 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'startraw'
},
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 029b44812e..751b889aac 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
@@ -76,6 +76,11 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'startraw'
},
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl
b/tp/t/results/macro/macro_expands_to_empty.pl
index d1025b54ba..eac746f43d 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -80,6 +80,11 @@ $result_trees{'macro_expands_to_empty'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'foo'
},
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 6637ee1332..597dfa4aae 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
@@ -109,6 +109,11 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'beginendcond'
},
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 dc2a3b9aaf..c40878da1d 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
@@ -99,6 +99,11 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'begincond'
},
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 70ab3d99a0..9c20180fa7 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
@@ -76,6 +76,11 @@
$result_trees{'macro_expansion_end_in_ignored_ifset_content'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'beginifsetcontent'
},
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 be60725d43..b6b763fba7 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
@@ -81,6 +81,11 @@
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'beginnestedcond'
},
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 eddf77aa64..2ad01f2dca 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
@@ -81,6 +81,11 @@
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'beginnestedcond'
},
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 c4b693d8f4..9a2046d78b 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
@@ -110,6 +110,11 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macrodot'
},
@@ -128,6 +133,11 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macrodot'
},
diff --git a/tp/t/results/macro/macro_for_end.pl
b/tp/t/results/macro/macro_for_end.pl
index 0b5f97fefe..fd846aaf87 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -90,6 +90,11 @@ $result_trees{'macro_for_end'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'myend'
},
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 77123e447f..daea7d3edf 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -71,6 +71,11 @@ $result_trees{'macro_for_ignored_line_command'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'pagemacro'
},
diff --git a/tp/t/results/macro/macro_in_accent.pl
b/tp/t/results/macro/macro_in_accent.pl
index 1747cdf46c..4fb8da8d8e 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -147,6 +147,11 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aletter'
},
@@ -192,6 +197,11 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aletter'
},
@@ -234,6 +244,11 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aletter'
},
@@ -273,6 +288,11 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aletter'
},
@@ -327,6 +347,11 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aspace'
},
@@ -343,6 +368,11 @@ $result_trees{'macro_in_accent'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aletter'
},
diff --git a/tp/t/results/macro/macro_in_brace_command.pl
b/tp/t/results/macro/macro_in_brace_command.pl
index 2a8dd5324b..b6927c7ff8 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -176,6 +176,11 @@ $result_trees{'macro_in_brace_command'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'foo'
},
@@ -204,6 +209,11 @@ $result_trees{'macro_in_brace_command'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'abar'
},
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 7f4c584a9f..4ae7f9964e 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -125,6 +125,11 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'string'
},
@@ -206,6 +211,11 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'string'
},
@@ -281,6 +291,11 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'string'
},
@@ -342,6 +357,11 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'string'
},
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 89fcc800f0..359c681c36 100644
--- a/tp/t/results/macro/macro_in_empty_menu_comment.pl
+++ b/tp/t/results/macro/macro_in_empty_menu_comment.pl
@@ -90,6 +90,11 @@ $result_trees{'macro_in_empty_menu_comment'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptystring'
},
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 da80d739f2..46d2aa28ee 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
@@ -117,6 +117,11 @@
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptymacro'
},
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 f2c1938250..5b9fbfdcc6 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
@@ -96,6 +96,11 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptymacro'
},
diff --git a/tp/t/results/macro/macro_in_empty_text.pl
b/tp/t/results/macro/macro_in_empty_text.pl
index 7b6a92ff2b..e46c93746c 100644
--- a/tp/t/results/macro/macro_in_empty_text.pl
+++ b/tp/t/results/macro/macro_in_empty_text.pl
@@ -90,6 +90,11 @@ $result_trees{'macro_in_empty_text'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptystring'
},
diff --git a/tp/t/results/macro/macro_in_end_argument.pl
b/tp/t/results/macro/macro_in_end_argument.pl
index 72b4b92f90..cc009856fd 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -120,6 +120,11 @@ $result_trees{'macro_in_end_argument'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'acartouche'
},
diff --git a/tp/t/results/macro/macro_in_index_commands.pl
b/tp/t/results/macro/macro_in_index_commands.pl
index 93b924dbfc..65ac414f7a 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -200,6 +200,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'fn'
},
@@ -241,6 +246,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'cp'
},
@@ -263,6 +273,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'syncodeindexcommand'
},
@@ -425,6 +440,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truc'
},
@@ -617,6 +637,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'codeidx'
},
@@ -773,6 +798,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'trucindexcommand'
},
@@ -963,6 +993,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 7,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'defcodeindexentry'
},
@@ -1034,6 +1069,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 8,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truc'
},
@@ -1063,6 +1103,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 9,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'codeidx'
},
@@ -1169,6 +1214,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 10,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truc'
},
@@ -1239,6 +1289,11 @@ $result_trees{'macro_in_index_commands'} = {
{
'counter' => 11,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'cp'
},
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index 09f0431f45..6e83402f7e 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -101,6 +101,11 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'badmacro'
},
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl
b/tp/t/results/macro/macro_in_macro_arg.pl
index dc93137f1b..7cb4fcc38b 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -239,6 +239,11 @@ $result_trees{'macro_in_macro_arg'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macroone'
},
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 e00fa6b08a..604ab6a2ed 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -168,6 +168,11 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macrooneone'
},
diff --git a/tp/t/results/macro/macro_in_menu.pl
b/tp/t/results/macro/macro_in_menu.pl
index 5301dfb0ec..a5e0dd19e0 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -405,6 +405,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'starspaces'
},
@@ -433,6 +438,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'twocolon'
},
@@ -499,6 +509,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'spaces'
},
@@ -523,6 +538,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'astar'
},
@@ -577,6 +597,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'astar'
},
@@ -625,6 +650,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aspace'
},
@@ -700,6 +730,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 7,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'acolon'
},
@@ -726,6 +761,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 8,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'acolon'
},
@@ -744,6 +784,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 9,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aspace'
},
@@ -824,6 +869,11 @@ $result_trees{'macro_in_menu'} = {
{
'counter' => 10,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aspace'
},
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 5e4404313c..367df86e4c 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
@@ -90,6 +90,11 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'}
= {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptystring'
},
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 f3944f2ee0..8c2cf2086e 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
@@ -99,6 +99,11 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptystring'
},
@@ -117,6 +122,11 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptystring'
},
@@ -144,6 +154,11 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptystring'
},
@@ -176,6 +191,11 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptystring'
},
diff --git a/tp/t/results/macro/macro_in_menu_description.pl
b/tp/t/results/macro/macro_in_menu_description.pl
index 9f5e246d07..48f8caf4ab 100644
--- a/tp/t/results/macro/macro_in_menu_description.pl
+++ b/tp/t/results/macro/macro_in_menu_description.pl
@@ -142,6 +142,11 @@ $result_trees{'macro_in_menu_description'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptystring'
},
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl
b/tp/t/results/macro/macro_in_misc_commands.pl
index 08fc562f7e..190cee5cc7 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -182,6 +182,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'Top'
},
@@ -210,6 +215,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'text'
},
@@ -249,6 +259,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'text'
},
@@ -498,6 +513,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'en'
},
@@ -532,6 +552,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'documentlanguagecommand'
},
@@ -752,6 +777,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'pagesizesarg'
},
@@ -774,6 +804,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 7,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'afourpapermacro'
},
@@ -813,6 +848,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 8,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'text'
},
@@ -862,6 +902,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 9,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'text'
},
@@ -911,6 +956,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 10,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'text'
},
@@ -1055,6 +1105,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 11,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'needarg'
},
@@ -1139,6 +1194,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 12,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'raisesectionsmacro'
},
@@ -1224,6 +1284,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 13,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'lowersectionsmacro'
},
@@ -1439,6 +1504,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 14,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'definfoenclosename'
},
@@ -1619,6 +1689,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 15,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'strongmacro'
},
@@ -1692,6 +1767,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 17,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'strongname'
},
@@ -1734,6 +1814,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 16,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'strongname'
},
@@ -1758,6 +1843,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 18,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'strongmacro'
},
@@ -1947,6 +2037,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 19,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'kbdinputstylearg'
},
@@ -2421,6 +2516,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 20,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'asisarg'
},
@@ -2477,6 +2577,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 21,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'zero'
},
@@ -2533,6 +2638,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 22,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'nonearg'
},
@@ -2589,6 +2699,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 23,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'four'
},
@@ -2645,6 +2760,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 24,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'nonearg'
},
@@ -2701,6 +2821,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 25,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'six'
},
@@ -2876,6 +3001,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 26,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'endarg'
},
@@ -2932,6 +3062,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 27,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'separatearg'
},
@@ -3107,6 +3242,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 28,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'onarg'
},
@@ -3163,6 +3303,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 29,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'offarg'
},
@@ -3297,6 +3442,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 30,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'ten'
},
@@ -3483,6 +3633,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 31,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'falsearg'
},
@@ -3544,6 +3699,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 32,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truearg'
},
@@ -3754,6 +3914,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 33,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'pagemacro'
},
@@ -3796,6 +3961,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 34,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'noindentmacro'
},
@@ -3835,6 +4005,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 35,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'refillmacro'
},
@@ -3869,6 +4044,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 36,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'noindentmacro'
},
@@ -3909,6 +4089,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 37,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'noindentmacro'
},
@@ -3951,6 +4136,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 38,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'noindentmacro'
},
@@ -3987,6 +4177,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 39,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'pagemacro'
},
@@ -4026,6 +4221,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 40,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'pagemacro'
},
@@ -4075,6 +4275,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 41,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'pagemacro'
},
@@ -4120,6 +4325,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 42,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'noindentmacro'
},
@@ -4159,6 +4369,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 43,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'refillmacro'
},
@@ -4253,6 +4468,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 44,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'contentsmacro'
},
@@ -4369,6 +4589,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 45,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'exdentmacro'
},
@@ -4514,6 +4739,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 46,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'two'
},
@@ -4655,6 +4885,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 47,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'text'
},
@@ -4776,6 +5011,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 48,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'text'
},
@@ -4854,6 +5094,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 49,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'contentsmacro'
},
@@ -4954,6 +5199,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 50,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'shortcontentsmacro'
},
@@ -5051,6 +5301,11 @@ $result_trees{'macro_in_misc_commands'} = {
{
'counter' => 51,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'byemacro'
},
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 b88e3e2d34..20626ff4d6 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
@@ -119,6 +119,11 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptymacro'
},
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 3328ce117c..14c14dfb3d 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
@@ -98,6 +98,11 @@ $result_trees{'macro_in_table_empty_before_item'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'emptymacro'
},
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 1c0a8920d3..6db26176e0 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
@@ -80,6 +80,11 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'setargendignored'
},
@@ -148,6 +153,11 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} =
{
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'setargendignored'
},
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 7408261ce6..7b811ff943 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
@@ -80,6 +80,11 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'clearargendignored'
},
@@ -148,6 +153,11 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'clearargendignored'
},
diff --git a/tp/t/results/macro/macro_name_with_digit.pl
b/tp/t/results/macro/macro_name_with_digit.pl
index 52a07fa099..167b809832 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -173,6 +173,11 @@ $result_trees{'macro_name_with_digit'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'macro1'
},
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 9688345436..e6bc1bdf04 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -71,6 +71,11 @@ $result_trees{'macro_no_arg_expansion'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'testone'
},
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 ef9fce6c35..8ef5338173 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
@@ -75,6 +75,11 @@ $result_trees{'macro_one_arg_end_of_file'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'line_arg'
+ }
+ ],
'extra' => {
'name' => 'onearg'
},
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 69f7cb037c..475ee90ca3 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -78,6 +78,11 @@ $result_trees{'macro_zero'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'zero'
},
diff --git a/tp/t/results/macro/nested_macro_call.pl
b/tp/t/results/macro/nested_macro_call.pl
index efccffddb8..e6b2873260 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -145,6 +145,11 @@ $result_trees{'nested_macro_call'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truc'
},
@@ -157,6 +162,11 @@ $result_trees{'nested_macro_call'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'machin'
},
diff --git a/tp/t/results/macro/paragraph_and_macro.pl
b/tp/t/results/macro/paragraph_and_macro.pl
index cd1eb4c7a5..42d3030d96 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -195,6 +195,11 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aempty'
},
@@ -223,6 +228,11 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aempty'
},
@@ -253,6 +263,11 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aempty'
},
@@ -289,6 +304,11 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aspace'
},
@@ -318,6 +338,11 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aspace'
},
@@ -348,6 +373,11 @@ $result_trees{'paragraph_and_macro'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'aspace'
},
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl
b/tp/t/results/macro/recursive_call_in_macro.pl
index 27719fb6b6..8c965f0027 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -80,6 +80,11 @@ $result_trees{'recursive_call_in_macro'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'anorecurse'
},
diff --git a/tp/t/results/macro/recursive_call_in_rmacro.pl
b/tp/t/results/macro/recursive_call_in_rmacro.pl
index f18c227d05..7721271cb4 100644
--- a/tp/t/results/macro/recursive_call_in_rmacro.pl
+++ b/tp/t/results/macro/recursive_call_in_rmacro.pl
@@ -81,6 +81,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -92,6 +97,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -103,6 +113,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -114,6 +129,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -125,6 +145,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -136,6 +161,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -147,6 +177,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 7,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -158,6 +193,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 8,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -169,6 +209,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 9,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -180,6 +225,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 10,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -191,6 +241,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 11,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -202,6 +257,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 12,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -213,6 +273,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 13,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -224,6 +289,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 14,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -235,6 +305,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 15,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -246,6 +321,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 16,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -257,6 +337,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 17,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -268,6 +353,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 18,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -279,6 +369,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 19,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -290,6 +385,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 20,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -301,6 +401,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 21,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -312,6 +417,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 22,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -323,6 +433,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 23,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -334,6 +449,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 24,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -345,6 +465,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 25,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -356,6 +481,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 26,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -367,6 +497,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 27,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -378,6 +513,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 28,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -389,6 +529,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 29,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -400,6 +545,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 30,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -411,6 +561,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 31,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -422,6 +577,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 32,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -433,6 +593,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 33,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -444,6 +609,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 34,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -455,6 +625,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 35,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -466,6 +641,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 36,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -477,6 +657,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 37,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -488,6 +673,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 38,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -499,6 +689,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 39,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -510,6 +705,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 40,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -521,6 +721,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 41,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -532,6 +737,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 42,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -543,6 +753,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 43,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -554,6 +769,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 44,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -565,6 +785,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 45,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -576,6 +801,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 46,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -587,6 +817,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 47,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -598,6 +833,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 48,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -609,6 +849,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 49,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -620,6 +865,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 50,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -631,6 +881,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 51,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -642,6 +897,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 52,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -653,6 +913,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 53,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -664,6 +929,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 54,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -675,6 +945,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 55,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -686,6 +961,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 56,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -697,6 +977,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 57,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -708,6 +993,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 58,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -719,6 +1009,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 59,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -730,6 +1025,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 60,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -741,6 +1041,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 61,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -752,6 +1057,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 62,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -763,6 +1073,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 63,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -774,6 +1089,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 64,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -785,6 +1105,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 65,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -796,6 +1121,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 66,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -807,6 +1137,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 67,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -818,6 +1153,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 68,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -829,6 +1169,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 69,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -840,6 +1185,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 70,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -851,6 +1201,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 71,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -862,6 +1217,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 72,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -873,6 +1233,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 73,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -884,6 +1249,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 74,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -895,6 +1265,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 75,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -906,6 +1281,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 76,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -917,6 +1297,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 77,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -928,6 +1313,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 78,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -939,6 +1329,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 79,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -950,6 +1345,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 80,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -961,6 +1361,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 81,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -972,6 +1377,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 82,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -983,6 +1393,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 83,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -994,6 +1409,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 84,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1005,6 +1425,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 85,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1016,6 +1441,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 86,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1027,6 +1457,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 87,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1038,6 +1473,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 88,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1049,6 +1489,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 89,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1060,6 +1505,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 90,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1071,6 +1521,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 91,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1082,6 +1537,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 92,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1093,6 +1553,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 93,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1104,6 +1569,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 94,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1115,6 +1585,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 95,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1126,6 +1601,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 96,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1137,6 +1617,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 97,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1148,6 +1633,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 98,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1159,6 +1649,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 99,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
@@ -1170,6 +1665,11 @@ $result_trees{'recursive_call_in_rmacro'} = {
{
'counter' => 100,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'rec'
},
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl
b/tp/t/results/macro/simple_imbricated_macro.pl
index 23b2b9b45e..3df0a41a6c 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -86,6 +86,11 @@ $result_trees{'simple_imbricated_macro'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truc'
},
@@ -179,6 +184,11 @@ $result_trees{'simple_imbricated_macro'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'bidule'
},
diff --git a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
index 98d694ec01..719adecd8c 100644
--- a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
@@ -86,6 +86,11 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'truc'
},
@@ -179,6 +184,11 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'bidule'
},
diff --git a/tp/t/results/macro/space_macro_after_end.pl
b/tp/t/results/macro/space_macro_after_end.pl
index ad6ecd787b..fd2ece59d4 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -108,6 +108,11 @@ $result_trees{'space_macro_after_end'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'spaces'
},
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 c6f3b9d5a3..651f68f1ae 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -104,6 +104,11 @@ $result_trees{'space_macro_after_end_verbatim'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'spaces'
},
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 effd26d770..e69c934880 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -186,6 +186,11 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -210,6 +215,11 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -286,6 +296,11 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -338,6 +353,11 @@ $result_trees{'two_macros_on_a_line'} = {
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -459,6 +479,11 @@ in macro'
{
'counter' => 8,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
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 5d9c088500..00080e5cfa 100644
--- a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
+++ b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
@@ -80,6 +80,11 @@ $result_trees{'unpaired_backslash_in_macro_body'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
diff --git
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index b480037818..b23e1e8200 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -259,6 +259,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'allquotes'
},
@@ -270,6 +275,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
@@ -663,6 +673,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
@@ -1079,6 +1094,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
@@ -1631,6 +1651,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 5,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'allquotes'
},
@@ -1643,6 +1668,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 6,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
@@ -2039,6 +2069,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 7,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
@@ -2455,6 +2490,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 8,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
@@ -2754,6 +2794,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 9,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'allquotes'
},
@@ -2765,6 +2810,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 10,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
@@ -3155,6 +3205,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 11,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
@@ -3571,6 +3626,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} =
{
{
'counter' => 12,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'quotes'
},
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl
b/tp/t/results/misc_commands/kbdinputstyle.pl
index e805abcd3a..9c1b8aa3fd 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -182,6 +182,11 @@ $result_trees{'kbdinputstyle'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'codekbdmacro'
},
@@ -683,6 +688,11 @@ $result_trees{'kbdinputstyle'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'codekbdmacro'
},
@@ -1175,6 +1185,11 @@ $result_trees{'kbdinputstyle'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'codekbdmacro'
},
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 709e81f03e..9d4364c288 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -207,6 +207,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'codekbdmacro'
},
@@ -832,6 +837,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'codekbdmacro'
},
@@ -1449,6 +1459,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'codekbdmacro'
},
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index aaaef68f9d..2399d2aba5 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -600,6 +600,11 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'testallowcodebreaksexample'
},
@@ -1089,6 +1094,11 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 4,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'testallowcodebreaksexample'
},
@@ -2045,6 +2055,11 @@ $result_trees{'test_allowcodebreaks'} = {
{
'counter' => 7,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'testallowcodebreaksexample'
},
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 aa21630bf2..a95ef0639e 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -126,6 +126,11 @@ $result_trees{'star_at_command_formatting'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -394,6 +399,11 @@ $result_trees{'star_at_command_formatting'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
@@ -693,6 +703,11 @@ $result_trees{'star_at_command_formatting'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'mymacro'
},
diff --git a/tp/t/results/xtable/table_nested.pl
b/tp/t/results/xtable/table_nested.pl
index d0235da74c..27b0ba2cde 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -199,6 +199,11 @@ $result_trees{'table_nested'} = {
{
'counter' => 1,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'myvtable'
},
@@ -809,6 +814,11 @@ $result_trees{'table_nested'} = {
{
'counter' => 2,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'myvtable'
},
@@ -1432,6 +1442,11 @@ $result_trees{'table_nested'} = {
{
'counter' => 3,
'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
'extra' => {
'name' => 'myvtable'
},
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_close_container, _remove_empty_content) (_expand_macro_arguments), tp/Texinfo/XS/parsetexi/close.c (remove_empty_content, close_container), tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments): separate the code to remove empty content, put in remove_empty_content from the remaining of close_container. Do not remove completly macro arguments that are empty, only remove the contents, keep a brace_command_arg to mark that there was an empty string argument [...],
Patrice Dumas <=