[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Regular tree structure for @value with flag not f
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Regular tree structure for @value with flag not found |
|
Date: |
Sun, 29 Oct 2023 10:56:30 -0400 |
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 03d06cb726 Regular tree structure for @value with flag not found
03d06cb726 is described below
commit 03d06cb726d671ceceab38737efcd570caa0f914
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 29 15:56:32 2023 +0100
Regular tree structure for @value with flag not found
* tp/Texinfo/ParserNonXS.pm (_new_value_element),
tp/Texinfo/Convert/HTML.pm (_convert), tp/Texinfo/Convert/Texinfo.pm
(_expand_cmd_args_to_texi), tp/Texinfo/Translations.pm
(_substitute_element_array), tp/Texinfo/XS/main/convert_to_texinfo.c
(expand_cmd_args_to_texi), tp/Texinfo/XS/main/translations.c
(substitute_element_array), tp/Texinfo/XS/parsetexi/parser.c
(new_value_element): use brace_command_arg to hold the flag text in
the first contents for @value and @txiinternalvalue.
---
ChangeLog | 13 +
tp/Texinfo/Convert/HTML.pm | 4 +-
tp/Texinfo/Convert/Texinfo.pm | 3 +-
tp/Texinfo/ParserNonXS.pm | 19 +-
tp/Texinfo/Translations.pm | 4 +-
tp/Texinfo/XS/convert/convert_html.c | 4 -
tp/Texinfo/XS/main/convert_to_texinfo.c | 3 +-
tp/Texinfo/XS/main/translations.c | 2 +-
tp/Texinfo/XS/parsetexi/parser.c | 8 +-
tp/t/results/conditionals/empty_set_in_ifset.pl | 7 +-
.../results/converters_tests/at_commands_in_raw.pl | 9 +-
tp/t/results/converters_tests/unknown_value.pl | 9 +-
.../manual_simple_latin1_with_error.pl | 9 +-
.../manual_simple_utf8_with_error.pl | 9 +-
tp/t/results/include/value_expansion_in_include.pl | 42 +-
tp/t/results/macro/bib_example.pl | 21 +-
.../macro/cpp_directives_line_value_macro.pl | 7 +-
.../transformations/protect_comma_source_mark.pl | 7 +-
...otect_hashchar_at_line_beginning_source_mark.pl | 7 +-
...ct_node_after_label_source_mark_in_protected.pl | 7 +-
tp/t/results/value/bad_syntax.pl | 9 +-
.../value/begin_like_comment_on_set_line.pl | 16 +-
.../closing_brace_in_value_in_ignored_inline.pl | 7 +-
tp/t/results/value/comment_on_clear_line.pl | 30 +-
tp/t/results/value/comment_on_set_line.pl | 28 +-
tp/t/results/value/empty_set.pl | 7 +-
tp/t/results/value/empty_value_in_line.pl | 7 +-
tp/t/results/value/ignored_value_definition.pl | 7 +-
tp/t/results/value/not_only_characters.pl | 7 +-
tp/t/results/value/recursive_expansion_in_set.pl | 700 ++++++++++++++++++---
tp/t/results/value/set_flag_command_equivalent.pl | 7 +-
tp/t/results/value/set_form_feed.pl | 21 +-
tp/t/results/value/simple.pl | 7 +-
tp/t/results/value/spaces_before_value.pl | 7 +-
tp/t/results/value/value_after_accent.pl | 14 +-
tp/t/results/value/value_after_brace_command.pl | 42 +-
tp/t/results/value/value_in_index_commands.pl | 77 ++-
.../value/value_in_invalid_documentencoding.pl | 7 +-
tp/t/results/value/value_in_misc_commands.pl | 301 +++++++--
tp/t/results/value/value_in_node.pl | 28 +-
tp/t/results/value/value_node_directions.pl | 35 +-
tp/t/results/value/value_zero.pl | 7 +-
.../value_and_macro/comma_value_in_macro_arg.pl | 7 +-
tp/t/results/value_and_macro/macro_in_value.pl | 7 +-
.../results/value_and_macro/value_in_macro_body.pl | 7 +-
.../os\303\251_utf8_no_setfilename.txt" | 2 +-
.../non_ascii_test_rawtext/os\303\251_utf8.txt" | 2 +-
47 files changed, 1335 insertions(+), 255 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 714be79ef3..f830f768a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2023-10-29 Patrice Dumas <pertusus@free.fr>
+
+ Regular tree structure for @value with flag not found
+
+ * tp/Texinfo/ParserNonXS.pm (_new_value_element),
+ tp/Texinfo/Convert/HTML.pm (_convert), tp/Texinfo/Convert/Texinfo.pm
+ (_expand_cmd_args_to_texi), tp/Texinfo/Translations.pm
+ (_substitute_element_array), tp/Texinfo/XS/main/convert_to_texinfo.c
+ (expand_cmd_args_to_texi), tp/Texinfo/XS/main/translations.c
+ (substitute_element_array), tp/Texinfo/XS/parsetexi/parser.c
+ (new_value_element): use brace_command_arg to hold the flag text in
+ the first contents for @value and @txiinternalvalue.
+
2023-10-29 Patrice Dumas <pertusus@free.fr>
No export of perl tree at parsing time with XS
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 64bc6a6dd5..17e42108f8 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -12205,9 +12205,7 @@ sub _convert($$;$)
if ($arg_idx < $spec_nr) {
$arg_spec = $args_specification[$arg_idx];
}
- if ((!$arg->{'contents'} or !scalar(@{$arg->{'contents'}}))
- # special case for @value argument
- and !defined($arg->{'text'})) {
+ if (!$arg->{'contents'} or !scalar(@{$arg->{'contents'}})) {
push @$args_formatted, undef;
next;
}
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 50ef82a871..5d17faeba3 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -263,8 +263,7 @@ sub _expand_cmd_args_to_texi($) {
$braces = 1 if (scalar(@{$cmd->{'args'}})
and ($cmd->{'args'}->[0]->{'type'}
and ($cmd->{'args'}->[0]->{'type'} eq
'brace_command_arg'
- or $cmd->{'args'}->[0]->{'type'} eq
'brace_command_context'))
- or $cmdname eq 'value');
+ or $cmd->{'args'}->[0]->{'type'} eq
'brace_command_context')));
$result .= '{' if ($braces);
if ($cmdname eq 'verb') {
$result .= $cmd->{'info'}->{'delimiter'};
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 6cd7386f19..faace47e58 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4832,13 +4832,11 @@ sub _new_value_element($$;$$)
my $value_elt = { 'cmdname' => $command,
'args' => [] };
$value_elt->{'parent'} = $current if (defined($current));
- # Add a 'brace_command_arg' container? On the one hand it is
- # not useful, as there is no contents, only a flag, on the
- # other end, it is different from other similar commands, like 'U'.
- # Beware that it is also used for txiinternalvalue, which for
- # now requires that structure, but it could easily be changed too.
- push @{$value_elt->{'args'}}, {'text' => $flag,
- 'parent' => $value_elt};
+ my $brace_command_arg = {'type' => 'brace_command_arg',
+ 'contents' => [], 'parent' => $value_elt};
+ push @{$value_elt->{'args'}}, $brace_command_arg;
+ push @{$brace_command_arg->{'contents'}}, {'text' => $flag,
+ 'parent' => $brace_command_arg};
if ($spaces_element) {
$value_elt->{'info'} = {} if (!$value_elt->{'info'});
$value_elt->{'info'}->{'spaces_after_cmd_before_arg'} = $spaces_element;
@@ -7037,7 +7035,7 @@ sub _process_remaining_on_line($$$$)
# caller should expand something along
# gdt($self, '@{No value for `{value}\'@}',
- # {'value' => {'text' => $value}});
+ # {'value' => ...});
my $new_element = _new_value_element($command, $value, $current,
$spaces_element);
push @{$current->{'contents'}}, $new_element;
@@ -8353,11 +8351,6 @@ leads to
'args' => [{'type' => 'brace_command_arg',
'contents' => [{'text' => 'in code'}]}]}
-As an exception, C<@value> flag argument is directly in the I<args> array
-reference, not in a I<brace_command_arg> container. Note that only C<@value>
-commands that are not expanded because there is no corresponding value set
-are present as elements in the tree.
-
=item bracketed_arg
Bracketed argument. On definition command and on C<@multitable> line.
diff --git a/tp/Texinfo/Translations.pm b/tp/Texinfo/Translations.pm
index d4e06b7323..cba465f966 100644
--- a/tp/Texinfo/Translations.pm
+++ b/tp/Texinfo/Translations.pm
@@ -404,12 +404,12 @@ sub _substitute_element_array($$) {
for (my $idx = 0; $idx < $nr; $idx++) {
my $element = $array->[$idx];
if ($element->{'cmdname'} and $element->{'cmdname'} eq 'txiinternalvalue')
{
- my $name = $element->{'args'}->[0]->{'text'};
+ my $name = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
if ($replaced_substrings->{$name}) {
$array->[$idx] = $replaced_substrings->{$name};
}
} else {
- _substitute($element, $replaced_substrings);
+ _substitute($element, $replaced_substrings);
}
}
}
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 5f6266398d..505dff5ba4 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -2945,10 +2945,6 @@ convert_to_html_internal (CONVERTER *self, ELEMENT
*element,
= &args_formatted->args[arg_idx];
if (arg->contents.number <= 0)
- /*
- # special case for @value argument
- and !defined($arg->{'text'}))
- */
{
continue;
}
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 8bd732ad2f..c654e31ab0 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -79,8 +79,7 @@ expand_cmd_args_to_texi (ELEMENT *e, TEXT *result)
int with_commas = 0;
braces = (e->args.list[0]->type == ET_brace_command_arg
- || e->args.list[0]->type == ET_brace_command_context
- || cmd == CM_value);
+ || e->args.list[0]->type == ET_brace_command_context);
if (braces)
ADD("{");
diff --git a/tp/Texinfo/XS/main/translations.c
b/tp/Texinfo/XS/main/translations.c
index 3299712d14..586e23977e 100644
--- a/tp/Texinfo/XS/main/translations.c
+++ b/tp/Texinfo/XS/main/translations.c
@@ -447,7 +447,7 @@ substitute_element_array (ELEMENT_LIST *list,
ELEMENT *e = list->list[idx];
if (e->cmd == CM_txiinternalvalue)
{
- char *name = e->args.list[0]->text.text;
+ char *name = e->args.list[0]->contents.list[0]->text.text;
int i;
for (i = 0; i < replaced_substrings->number; i++)
{
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index b0e172ab36..80f2912adb 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1083,12 +1083,14 @@ ELEMENT *
new_value_element (enum command_id cmd, char *flag, ELEMENT *spaces_element)
{
ELEMENT *value_elt = new_element (ET_NONE);
- ELEMENT *value_arg = new_element (ET_NONE);
+ ELEMENT *brace_command_arg = new_element (ET_brace_command_arg);
+ ELEMENT *value_text = new_element (ET_NONE);
value_elt->cmd = cmd;
- text_append (&value_arg->text, flag);
- add_to_element_args (value_elt, value_arg);
+ text_append (&value_text->text, flag);
+ add_to_element_args (value_elt, brace_command_arg);
+ add_to_element_contents (brace_command_arg, value_text);
if (spaces_element)
add_info_element_oot (value_elt, "spaces_after_cmd_before_arg",
spaces_element);
diff --git a/tp/t/results/conditionals/empty_set_in_ifset.pl
b/tp/t/results/conditionals/empty_set_in_ifset.pl
index 016a1ea88d..99c2109dc9 100644
--- a/tp/t/results/conditionals/empty_set_in_ifset.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifset.pl
@@ -77,7 +77,12 @@ $result_trees{'empty_set_in_ifset'} = {
'element' => {
'args' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
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 05a9a3a822..bc73c92ac6 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -661,7 +661,12 @@ $result_trees{'at_commands_in_raw'} = {
{
'args' => [
{
- 'text' => 'flag'
+ 'contents' => [
+ {
+ 'text' => 'flag'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1195,7 +1200,7 @@ in kbd before tex.
-.
+flag.
in kbd after tex.
diff --git a/tp/t/results/converters_tests/unknown_value.pl
b/tp/t/results/converters_tests/unknown_value.pl
index f121df93ff..c000829647 100644
--- a/tp/t/results/converters_tests/unknown_value.pl
+++ b/tp/t/results/converters_tests/unknown_value.pl
@@ -12,7 +12,12 @@ $result_trees{'unknown_value'} = {
{
'args' => [
{
- 'text' => 'unknown'
+ 'contents' => [
+ {
+ 'text' => 'unknown'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -27,7 +32,7 @@ $result_trees{'unknown_value'} = {
$result_texis{'unknown_value'} = '@value{unknown}';
-$result_texts{'unknown_value'} = '';
+$result_texts{'unknown_value'} = 'unknown';
$result_errors{'unknown_value'} = [
{
diff --git a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
index 8c1e58c317..b2cccf3db3 100644
--- a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
@@ -240,7 +240,12 @@ $result_trees{'manual_simple_latin1_with_error'} = {
{
'args' => [
{
- 'text' => "non_conn\x{f9}e"
+ 'contents' => [
+ {
+ 'text' => "non_conn\x{f9}e"
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -292,7 +297,7 @@ Testé
1 Chapitré
**********
-
+non_connùe
';
$result_sectioning{'manual_simple_latin1_with_error'} = {
diff --git a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
index 446be58152..8c920da6d2 100644
--- a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
@@ -200,7 +200,12 @@ $result_trees{'manual_simple_utf8_with_error'} = {
{
'args' => [
{
- 'text' => "non_conn\x{f9}e"
+ 'contents' => [
+ {
+ 'text' => "non_conn\x{f9}e"
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -249,7 +254,7 @@ $result_texts{'manual_simple_utf8_with_error'} = 'Testé
1 Chapitré
**********
-
+non_connùe
';
$result_sectioning{'manual_simple_utf8_with_error'} = {
diff --git a/tp/t/results/include/value_expansion_in_include.pl
b/tp/t/results/include/value_expansion_in_include.pl
index d3a2664a4b..d88332bb8a 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -203,7 +203,12 @@ $result_trees{'value_expansion_in_include'} = {
'element' => {
'args' => [
{
- 'text' => 'testvar'
+ 'contents' => [
+ {
+ 'text' => 'testvar'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -314,7 +319,12 @@ $result_trees{'value_expansion_in_include'} = {
'element' => {
'args' => [
{
- 'text' => 'testvar'
+ 'contents' => [
+ {
+ 'text' => 'testvar'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -387,7 +397,12 @@ $result_trees{'value_expansion_in_include'} = {
'element' => {
'args' => [
{
- 'text' => 'test-var'
+ 'contents' => [
+ {
+ 'text' => 'test-var'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -498,7 +513,12 @@ $result_trees{'value_expansion_in_include'} = {
'element' => {
'args' => [
{
- 'text' => 'test-var'
+ 'contents' => [
+ {
+ 'text' => 'test-var'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -545,7 +565,12 @@ $result_trees{'value_expansion_in_include'} = {
'element' => {
'args' => [
{
- 'text' => 'test_var'
+ 'contents' => [
+ {
+ 'text' => 'test_var'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -653,7 +678,12 @@ $result_trees{'value_expansion_in_include'} = {
'element' => {
'args' => [
{
- 'text' => 'test_var'
+ 'contents' => [
+ {
+ 'text' => 'test_var'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/macro/bib_example.pl
b/tp/t/results/macro/bib_example.pl
index 4c2e180ed4..51c3c8d03e 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -2803,7 +2803,12 @@ $result_trees{'bib_example'} = {
'element' => {
'args' => [
{
- 'text' => 'mybibrefnode'
+ 'contents' => [
+ {
+ 'text' => 'mybibrefnode'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3207,7 +3212,12 @@ $result_trees{'bib_example'} = {
'element' => {
'args' => [
{
- 'text' => 'mybibrefnode'
+ 'contents' => [
+ {
+ 'text' => 'mybibrefnode'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3415,7 +3425,12 @@ $result_trees{'bib_example'} = {
'element' => {
'args' => [
{
- 'text' => 'mybibrefnode'
+ 'contents' => [
+ {
+ 'text' => 'mybibrefnode'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/macro/cpp_directives_line_value_macro.pl
b/tp/t/results/macro/cpp_directives_line_value_macro.pl
index 45d0aa813c..6932c75e9f 100644
--- a/tp/t/results/macro/cpp_directives_line_value_macro.pl
+++ b/tp/t/results/macro/cpp_directives_line_value_macro.pl
@@ -364,7 +364,12 @@ $result_trees{'cpp_directives_line_value_macro'} = {
'element' => {
'args' => [
{
- 'text' => 'hash'
+ 'contents' => [
+ {
+ 'text' => 'hash'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/transformations/protect_comma_source_mark.pl
b/tp/t/results/transformations/protect_comma_source_mark.pl
index ed330539a8..bc564452b0 100644
--- a/tp/t/results/transformations/protect_comma_source_mark.pl
+++ b/tp/t/results/transformations/protect_comma_source_mark.pl
@@ -153,7 +153,12 @@ $result_trees{'protect_comma_source_mark'} = {
'element' => {
'args' => [
{
- 'text' => 'punct'
+ 'contents' => [
+ {
+ 'text' => 'punct'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
index f73a39fb80..aed1a815cb 100644
---
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
+++
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
@@ -387,7 +387,12 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
'element' => {
'args' => [
{
- 'text' => 'hash'
+ 'contents' => [
+ {
+ 'text' => 'hash'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
index 7cd353a1cf..a7572ffcf7 100644
---
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
+++
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
@@ -134,7 +134,12 @@
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
'element' => {
'args' => [
{
- 'text' => 'punct'
+ 'contents' => [
+ {
+ 'text' => 'punct'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/bad_syntax.pl b/tp/t/results/value/bad_syntax.pl
index 5f3d1f074c..9f62e44b11 100644
--- a/tp/t/results/value/bad_syntax.pl
+++ b/tp/t/results/value/bad_syntax.pl
@@ -104,7 +104,12 @@ $result_trees{'bad_syntax'} = {
{
'args' => [
{
- 'text' => 'unknown'
+ 'contents' => [
+ {
+ 'text' => 'unknown'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -143,7 +148,7 @@ $result_texts{'bad_syntax'} = '
gurgl
-
+unknown
';
$result_errors{'bad_syntax'} = [
diff --git a/tp/t/results/value/begin_like_comment_on_set_line.pl
b/tp/t/results/value/begin_like_comment_on_set_line.pl
index 1ae0a67182..01676b38bc 100644
--- a/tp/t/results/value/begin_like_comment_on_set_line.pl
+++ b/tp/t/results/value/begin_like_comment_on_set_line.pl
@@ -46,7 +46,12 @@ $result_trees{'begin_like_comment_on_set_line'} = {
{
'args' => [
{
- 'text' => 'x'
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -58,7 +63,12 @@ $result_trees{'begin_like_comment_on_set_line'} = {
'element' => {
'args' => [
{
- 'text' => 'y'
+ 'contents' => [
+ {
+ 'text' => 'y'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -96,7 +106,7 @@ $result_texis{'begin_like_comment_on_set_line'} = '@set
x@come with me
$result_texts{'begin_like_comment_on_set_line'} = '
-!! !some thing is it!
+!x! !some thing is it!
';
$result_errors{'begin_like_comment_on_set_line'} = [
diff --git a/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
b/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
index ce123c81e8..dc0e79b51e 100644
--- a/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
+++ b/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
@@ -52,7 +52,12 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = {
'element' => {
'args' => [
{
- 'text' => 'closebrace'
+ 'contents' => [
+ {
+ 'text' => 'closebrace'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/comment_on_clear_line.pl
b/tp/t/results/value/comment_on_clear_line.pl
index 58a38c4ea6..d0775c9929 100644
--- a/tp/t/results/value/comment_on_clear_line.pl
+++ b/tp/t/results/value/comment_on_clear_line.pl
@@ -135,7 +135,12 @@ $result_trees{'comment_on_clear_line'} = {
{
'args' => [
{
- 'text' => 'x'
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -146,7 +151,12 @@ $result_trees{'comment_on_clear_line'} = {
{
'args' => [
{
- 'text' => 'y'
+ 'contents' => [
+ {
+ 'text' => 'y'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -158,7 +168,12 @@ $result_trees{'comment_on_clear_line'} = {
'element' => {
'args' => [
{
- 'text' => 'z'
+ 'contents' => [
+ {
+ 'text' => 'z'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -179,7 +194,12 @@ $result_trees{'comment_on_clear_line'} = {
'element' => {
'args' => [
{
- 'text' => 't'
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -225,7 +245,7 @@ $result_texis{'comment_on_clear_line'} = '@set x
$result_texts{'comment_on_clear_line'} = '
-!!, !!, !g!, !a vv!
+!x!, !y!, !g!, !a vv!
';
$result_errors{'comment_on_clear_line'} = [
diff --git a/tp/t/results/value/comment_on_set_line.pl
b/tp/t/results/value/comment_on_set_line.pl
index 280a299f01..4b0f1de226 100644
--- a/tp/t/results/value/comment_on_set_line.pl
+++ b/tp/t/results/value/comment_on_set_line.pl
@@ -91,7 +91,12 @@ $result_trees{'comment_on_set_line'} = {
'element' => {
'args' => [
{
- 'text' => 'x'
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -112,7 +117,12 @@ $result_trees{'comment_on_set_line'} = {
'element' => {
'args' => [
{
- 'text' => 'y'
+ 'contents' => [
+ {
+ 'text' => 'y'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -133,7 +143,12 @@ $result_trees{'comment_on_set_line'} = {
'element' => {
'args' => [
{
- 'text' => 'z'
+ 'contents' => [
+ {
+ 'text' => 'z'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -154,7 +169,12 @@ $result_trees{'comment_on_set_line'} = {
'element' => {
'args' => [
{
- 'text' => 't'
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/empty_set.pl b/tp/t/results/value/empty_set.pl
index 3e250a26cc..2e923fca98 100644
--- a/tp/t/results/value/empty_set.pl
+++ b/tp/t/results/value/empty_set.pl
@@ -40,7 +40,12 @@ $result_trees{'empty_set'} = {
'element' => {
'args' => [
{
- 'text' => 'myspace'
+ 'contents' => [
+ {
+ 'text' => 'myspace'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/empty_value_in_line.pl
b/tp/t/results/value/empty_value_in_line.pl
index bd0a47decc..b93d163779 100644
--- a/tp/t/results/value/empty_value_in_line.pl
+++ b/tp/t/results/value/empty_value_in_line.pl
@@ -47,7 +47,12 @@ $result_trees{'empty_value_in_line'} = {
'element' => {
'args' => [
{
- 'text' => 'myspace'
+ 'contents' => [
+ {
+ 'text' => 'myspace'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/ignored_value_definition.pl
b/tp/t/results/value/ignored_value_definition.pl
index 4b3971267b..53b366b3cc 100644
--- a/tp/t/results/value/ignored_value_definition.pl
+++ b/tp/t/results/value/ignored_value_definition.pl
@@ -79,7 +79,12 @@ $result_trees{'ignored_value_definition'} = {
'element' => {
'args' => [
{
- 'text' => 'aa'
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/not_only_characters.pl
b/tp/t/results/value/not_only_characters.pl
index 94d015c3b5..fc6ecc550b 100644
--- a/tp/t/results/value/not_only_characters.pl
+++ b/tp/t/results/value/not_only_characters.pl
@@ -40,7 +40,12 @@ $result_trees{'not_only_characters'} = {
'element' => {
'args' => [
{
- 'text' => '-e_\'::;'
+ 'contents' => [
+ {
+ 'text' => '-e_\'::;'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/recursive_expansion_in_set.pl
b/tp/t/results/value/recursive_expansion_in_set.pl
index d4ec460d8f..381cbf1928 100644
--- a/tp/t/results/value/recursive_expansion_in_set.pl
+++ b/tp/t/results/value/recursive_expansion_in_set.pl
@@ -33,7 +33,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -47,7 +52,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -61,7 +71,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -75,7 +90,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -89,7 +109,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -103,7 +128,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -117,7 +147,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -131,7 +166,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -145,7 +185,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -159,7 +204,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -173,7 +223,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -187,7 +242,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -201,7 +261,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -215,7 +280,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -229,7 +299,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -243,7 +318,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -257,7 +337,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -271,7 +356,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -285,7 +375,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -299,7 +394,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -313,7 +413,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -327,7 +432,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -341,7 +451,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -355,7 +470,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -369,7 +489,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -383,7 +508,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -397,7 +527,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -411,7 +546,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -425,7 +565,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -439,7 +584,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -453,7 +603,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -467,7 +622,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -481,7 +641,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -495,7 +660,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -509,7 +679,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -523,7 +698,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -537,7 +717,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -551,7 +736,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -565,7 +755,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -579,7 +774,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -593,7 +793,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -607,7 +812,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -621,7 +831,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -635,7 +850,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -649,7 +869,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -663,7 +888,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -677,7 +907,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -691,7 +926,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -705,7 +945,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -719,7 +964,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -733,7 +983,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -747,7 +1002,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -761,7 +1021,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -775,7 +1040,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -789,7 +1059,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -803,7 +1078,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -817,7 +1097,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -831,7 +1116,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -845,7 +1135,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -859,7 +1154,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -873,7 +1173,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -887,7 +1192,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -901,7 +1211,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -915,7 +1230,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -929,7 +1249,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -943,7 +1268,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -957,7 +1287,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -971,7 +1306,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -985,7 +1325,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -999,7 +1344,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1013,7 +1363,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1027,7 +1382,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1041,7 +1401,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1055,7 +1420,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1069,7 +1439,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1083,7 +1458,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1097,7 +1477,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1111,7 +1496,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1125,7 +1515,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1139,7 +1534,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1153,7 +1553,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1167,7 +1572,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1181,7 +1591,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1195,7 +1610,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1209,7 +1629,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1223,7 +1648,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1237,7 +1667,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1251,7 +1686,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1265,7 +1705,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1279,7 +1724,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1293,7 +1743,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1307,7 +1762,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1321,7 +1781,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1335,7 +1800,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1349,7 +1819,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1363,7 +1838,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1377,7 +1857,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1391,7 +1876,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1405,7 +1895,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1419,7 +1914,12 @@ $result_trees{'recursive_expansion_in_set'} = {
'element' => {
'args' => [
{
- 'text' => 'V'
+ 'contents' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/set_flag_command_equivalent.pl
b/tp/t/results/value/set_flag_command_equivalent.pl
index 4b20330db3..96beaacf71 100644
--- a/tp/t/results/value/set_flag_command_equivalent.pl
+++ b/tp/t/results/value/set_flag_command_equivalent.pl
@@ -50,7 +50,12 @@ $result_trees{'set_flag_command_equivalent'} = {
'element' => {
'args' => [
{
- 'text' => 'txicodequoteundirected'
+ 'contents' => [
+ {
+ 'text' => 'txicodequoteundirected'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/set_form_feed.pl
b/tp/t/results/value/set_form_feed.pl
index 5bd87a798a..6f950b52b2 100644
--- a/tp/t/results/value/set_form_feed.pl
+++ b/tp/t/results/value/set_form_feed.pl
@@ -78,7 +78,12 @@ $result_trees{'set_form_feed'} = {
'element' => {
'args' => [
{
- 'text' => 'gg'
+ 'contents' => [
+ {
+ 'text' => 'gg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -98,7 +103,12 @@ $result_trees{'set_form_feed'} = {
'element' => {
'args' => [
{
- 'text' => 'hh'
+ 'contents' => [
+ {
+ 'text' => 'hh'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -119,7 +129,12 @@ $result_trees{'set_form_feed'} = {
'element' => {
'args' => [
{
- 'text' => 'll'
+ 'contents' => [
+ {
+ 'text' => 'll'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/simple.pl b/tp/t/results/value/simple.pl
index e7cd668caf..cf18bff5a5 100644
--- a/tp/t/results/value/simple.pl
+++ b/tp/t/results/value/simple.pl
@@ -33,7 +33,12 @@ $result_trees{'simple'} = {
'element' => {
'args' => [
{
- 'text' => 'a-_5b'
+ 'contents' => [
+ {
+ 'text' => 'a-_5b'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/spaces_before_value.pl
b/tp/t/results/value/spaces_before_value.pl
index bf8b402b9d..eb66194e92 100644
--- a/tp/t/results/value/spaces_before_value.pl
+++ b/tp/t/results/value/spaces_before_value.pl
@@ -33,7 +33,12 @@ $result_trees{'spaces_before_value'} = {
'element' => {
'args' => [
{
- 'text' => 'var'
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value',
diff --git a/tp/t/results/value/value_after_accent.pl
b/tp/t/results/value/value_after_accent.pl
index 9ed174eaa9..e2c7a0d392 100644
--- a/tp/t/results/value/value_after_accent.pl
+++ b/tp/t/results/value/value_after_accent.pl
@@ -48,7 +48,12 @@ $result_trees{'value_after_accent'} = {
'element' => {
'args' => [
{
- 'text' => 'a_letter'
+ 'contents' => [
+ {
+ 'text' => 'a_letter'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -99,7 +104,12 @@ $result_trees{'value_after_accent'} = {
'element' => {
'args' => [
{
- 'text' => 'a_letter'
+ 'contents' => [
+ {
+ 'text' => 'a_letter'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/value_after_brace_command.pl
b/tp/t/results/value/value_after_brace_command.pl
index 981a12f697..a14825de36 100644
--- a/tp/t/results/value/value_after_brace_command.pl
+++ b/tp/t/results/value/value_after_brace_command.pl
@@ -70,7 +70,12 @@ $result_trees{'value_after_brace_command'} = {
'element' => {
'args' => [
{
- 'text' => 'bracedletter'
+ 'contents' => [
+ {
+ 'text' => 'bracedletter'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -111,7 +116,12 @@ $result_trees{'value_after_brace_command'} = {
'element' => {
'args' => [
{
- 'text' => 'unknowncmd'
+ 'contents' => [
+ {
+ 'text' => 'unknowncmd'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -162,7 +172,12 @@ $result_trees{'value_after_brace_command'} = {
'element' => {
'args' => [
{
- 'text' => 'bracedletter'
+ 'contents' => [
+ {
+ 'text' => 'bracedletter'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -203,7 +218,12 @@ $result_trees{'value_after_brace_command'} = {
'element' => {
'args' => [
{
- 'text' => 'unknowncmd'
+ 'contents' => [
+ {
+ 'text' => 'unknowncmd'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -254,7 +274,12 @@ $result_trees{'value_after_brace_command'} = {
'element' => {
'args' => [
{
- 'text' => 'bracedletter'
+ 'contents' => [
+ {
+ 'text' => 'bracedletter'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -295,7 +320,12 @@ $result_trees{'value_after_brace_command'} = {
'element' => {
'args' => [
{
- 'text' => 'unknowncmd'
+ 'contents' => [
+ {
+ 'text' => 'unknowncmd'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/value_in_index_commands.pl
b/tp/t/results/value/value_in_index_commands.pl
index 8a7a1303bd..ed77329574 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -82,7 +82,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'fn'
+ 'contents' => [
+ {
+ 'text' => 'fn'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -126,7 +131,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'cp'
+ 'contents' => [
+ {
+ 'text' => 'cp'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -151,7 +161,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'syncodeindex_command'
+ 'contents' => [
+ {
+ 'text' => 'syncodeindex_command'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -276,7 +291,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'truc'
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -391,7 +411,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'codeidx'
+ 'contents' => [
+ {
+ 'text' => 'codeidx'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -500,7 +525,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'trucindex_command'
+ 'contents' => [
+ {
+ 'text' => 'trucindex_command'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -681,7 +711,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'defcodeindex_entry'
+ 'contents' => [
+ {
+ 'text' => 'defcodeindex_entry'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -749,7 +784,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'truc'
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -781,7 +821,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'codeidx'
+ 'contents' => [
+ {
+ 'text' => 'codeidx'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -884,7 +929,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'truc'
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -957,7 +1007,12 @@ $result_trees{'value_in_index_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'cp'
+ 'contents' => [
+ {
+ 'text' => 'cp'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/value_in_invalid_documentencoding.pl
b/tp/t/results/value/value_in_invalid_documentencoding.pl
index b66d64bf48..5fefa72e9a 100644
--- a/tp/t/results/value/value_in_invalid_documentencoding.pl
+++ b/tp/t/results/value/value_in_invalid_documentencoding.pl
@@ -63,7 +63,12 @@ $result_trees{'value_in_invalid_documentencoding'} = {
'element' => {
'args' => [
{
- 'text' => 'badvalue'
+ 'contents' => [
+ {
+ 'text' => 'badvalue'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/value_in_misc_commands.pl
b/tp/t/results/value/value_in_misc_commands.pl
index b679b4e2f1..2b9f87042c 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -78,7 +78,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'text'
+ 'contents' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -162,7 +167,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'text'
+ 'contents' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -341,7 +351,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'pagesizes_arg'
+ 'contents' => [
+ {
+ 'text' => 'pagesizes_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -403,7 +418,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'afourpaper_macro'
+ 'contents' => [
+ {
+ 'text' => 'afourpaper_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -445,7 +465,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'text'
+ 'contents' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -497,7 +522,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'text'
+ 'contents' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -549,7 +579,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'text'
+ 'contents' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -683,7 +718,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'need_arg'
+ 'contents' => [
+ {
+ 'text' => 'need_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -769,7 +809,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'raisesections_macro'
+ 'contents' => [
+ {
+ 'text' => 'raisesections_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -817,7 +862,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'lowersections_macro'
+ 'contents' => [
+ {
+ 'text' => 'lowersections_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1074,7 +1124,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'definfoenclose_name'
+ 'contents' => [
+ {
+ 'text' => 'definfoenclose_name'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1180,7 +1235,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'strong_macro'
+ 'contents' => [
+ {
+ 'text' => 'strong_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1256,7 +1316,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'strong_name'
+ 'contents' => [
+ {
+ 'text' => 'strong_name'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1301,7 +1366,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'strong_name'
+ 'contents' => [
+ {
+ 'text' => 'strong_name'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1328,7 +1398,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'strong_macro'
+ 'contents' => [
+ {
+ 'text' => 'strong_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1481,7 +1556,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'kbdinputstyle_arg'
+ 'contents' => [
+ {
+ 'text' => 'kbdinputstyle_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1758,7 +1838,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'asis_arg'
+ 'contents' => [
+ {
+ 'text' => 'asis_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1817,7 +1902,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'zero'
+ 'contents' => [
+ {
+ 'text' => 'zero'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1876,7 +1966,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'none_arg'
+ 'contents' => [
+ {
+ 'text' => 'none_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1935,7 +2030,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'four'
+ 'contents' => [
+ {
+ 'text' => 'four'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -1994,7 +2094,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'none_arg'
+ 'contents' => [
+ {
+ 'text' => 'none_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2053,7 +2158,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'six'
+ 'contents' => [
+ {
+ 'text' => 'six'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2151,7 +2261,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'end_arg'
+ 'contents' => [
+ {
+ 'text' => 'end_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2210,7 +2325,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'separate_arg'
+ 'contents' => [
+ {
+ 'text' => 'separate_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2290,7 +2410,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'latin1'
+ 'contents' => [
+ {
+ 'text' => 'latin1'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2396,7 +2521,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'en'
+ 'contents' => [
+ {
+ 'text' => 'en'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2433,7 +2563,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'documentlanguage_command'
+ 'contents' => [
+ {
+ 'text' => 'documentlanguage_command'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2571,7 +2706,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'on_arg'
+ 'contents' => [
+ {
+ 'text' => 'on_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2630,7 +2770,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'off_arg'
+ 'contents' => [
+ {
+ 'text' => 'off_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2721,7 +2866,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'ten'
+ 'contents' => [
+ {
+ 'text' => 'ten'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2839,7 +2989,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'false_arg'
+ 'contents' => [
+ {
+ 'text' => 'false_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2903,7 +3058,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'true_arg'
+ 'contents' => [
+ {
+ 'text' => 'true_arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -2996,7 +3156,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'page_macro'
+ 'contents' => [
+ {
+ 'text' => 'page_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3036,7 +3201,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'noindent_macro'
+ 'contents' => [
+ {
+ 'text' => 'noindent_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3079,7 +3249,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'noindent_macro'
+ 'contents' => [
+ {
+ 'text' => 'noindent_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3124,7 +3299,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'noindent_macro'
+ 'contents' => [
+ {
+ 'text' => 'noindent_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3212,7 +3392,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'page_macro'
+ 'contents' => [
+ {
+ 'text' => 'page_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3272,7 +3457,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'contents_macro'
+ 'contents' => [
+ {
+ 'text' => 'contents_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3345,7 +3535,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'exdent_macro'
+ 'contents' => [
+ {
+ 'text' => 'exdent_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3453,7 +3648,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'two'
+ 'contents' => [
+ {
+ 'text' => 'two'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3525,7 +3725,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'contents_macro'
+ 'contents' => [
+ {
+ 'text' => 'contents_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3588,7 +3793,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'shortcontents_macro'
+ 'contents' => [
+ {
+ 'text' => 'shortcontents_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -3648,7 +3858,12 @@ $result_trees{'value_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'text' => 'bye_macro'
+ 'contents' => [
+ {
+ 'text' => 'bye_macro'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/value_in_node.pl
b/tp/t/results/value/value_in_node.pl
index 61b6202eb5..0b6b4802fd 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -190,7 +190,12 @@ $result_trees{'value_in_node'} = {
'element' => {
'args' => [
{
- 'text' => 'node1'
+ 'contents' => [
+ {
+ 'text' => 'node1'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -382,7 +387,12 @@ $result_trees{'value_in_node'} = {
'element' => {
'args' => [
{
- 'text' => 'node1'
+ 'contents' => [
+ {
+ 'text' => 'node1'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -477,7 +487,12 @@ $result_trees{'value_in_node'} = {
'element' => {
'args' => [
{
- 'text' => 'sec1'
+ 'contents' => [
+ {
+ 'text' => 'sec1'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -670,7 +685,12 @@ $result_trees{'value_in_node'} = {
'element' => {
'args' => [
{
- 'text' => 'node1'
+ 'contents' => [
+ {
+ 'text' => 'node1'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/value_node_directions.pl
b/tp/t/results/value/value_node_directions.pl
index f172129a9d..489f01a073 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -72,7 +72,12 @@ $result_trees{'value_node_directions'} = {
'element' => {
'args' => [
{
- 'text' => 'a--foo'
+ 'contents' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -168,7 +173,12 @@ $result_trees{'value_node_directions'} = {
'element' => {
'args' => [
{
- 'text' => 'a--foo'
+ 'contents' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -206,7 +216,12 @@ $result_trees{'value_node_directions'} = {
'element' => {
'args' => [
{
- 'text' => 'a--foo'
+ 'contents' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -351,7 +366,12 @@ $result_trees{'value_node_directions'} = {
'element' => {
'args' => [
{
- 'text' => 'a--foo'
+ 'contents' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
@@ -456,7 +476,12 @@ $result_trees{'value_node_directions'} = {
'element' => {
'args' => [
{
- 'text' => 'a--foo'
+ 'contents' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value/value_zero.pl b/tp/t/results/value/value_zero.pl
index 220d3724f1..26821b8477 100644
--- a/tp/t/results/value/value_zero.pl
+++ b/tp/t/results/value/value_zero.pl
@@ -35,7 +35,12 @@ $result_trees{'value_zero'} = {
'element' => {
'args' => [
{
- 'text' => 'zero'
+ 'contents' => [
+ {
+ 'text' => 'zero'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
index 6acaacf6ea..9b6058f234 100644
--- a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
+++ b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
@@ -147,7 +147,12 @@ $result_trees{'comma_value_in_macro_arg'} = {
'element' => {
'args' => [
{
- 'text' => 'comma'
+ 'contents' => [
+ {
+ 'text' => 'comma'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value_and_macro/macro_in_value.pl
b/tp/t/results/value_and_macro/macro_in_value.pl
index 422c491666..8b0e7ad8c4 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -112,7 +112,12 @@ $result_trees{'macro_in_value'} = {
'element' => {
'args' => [
{
- 'text' => 'flagab'
+ 'contents' => [
+ {
+ 'text' => 'flagab'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git a/tp/t/results/value_and_macro/value_in_macro_body.pl
b/tp/t/results/value_and_macro/value_in_macro_body.pl
index bdb4a93187..f24dfe6a74 100644
--- a/tp/t/results/value_and_macro/value_in_macro_body.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_body.pl
@@ -137,7 +137,12 @@ $result_trees{'value_in_macro_body'} = {
'element' => {
'args' => [
{
- 'text' => 'bodyarg'
+ 'contents' => [
+ {
+ 'text' => 'bodyarg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
'cmdname' => 'value'
diff --git
"a/tp/tests/encoded/res_parser/non_ascii_no_setfilename_test_rawtext/os\303\251_utf8_no_setfilename.txt"
"b/tp/tests/encoded/res_parser/non_ascii_no_setfilename_test_rawtext/os\303\251_utf8_no_setfilename.txt"
index 118fa36abd..a7538871a1 100644
---
"a/tp/tests/encoded/res_parser/non_ascii_no_setfilename_test_rawtext/os\303\251_utf8_no_setfilename.txt"
+++
"b/tp/tests/encoded/res_parser/non_ascii_no_setfilename_test_rawtext/os\303\251_utf8_no_setfilename.txt"
@@ -5,7 +5,7 @@ Tôp
**********
-value vùr .
+value vùr vùr.
In included téxt.
diff --git
"a/tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.txt"
"b/tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.txt"
index 0a13ee987a..4f20b668b8 100644
--- "a/tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.txt"
+++ "b/tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.txt"
@@ -6,7 +6,7 @@ Tôp
**********
-value vùr .
+value vùr vùr.
In included téxt.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Regular tree structure for @value with flag not found,
Patrice Dumas <=