[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_o
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c (handle_comma): remove elided as elided_brace_command_arg and elided_block as elided_rawpreformatted to convey the similarity with the corresponding containers without leading elided_. |
|
Date: |
Sat, 11 Feb 2023 14:38:21 -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 127bb17f4d * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/parser.c
(process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c
(handle_comma): remove elided as elided_brace_command_arg and elided_block as
elided_rawpreformatted to convey the similarity with the corresponding
containers without leading elided_.
127bb17f4d is described below
commit 127bb17f4d1ffcc8724e56fdce9fa6ad4694a82f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Feb 11 20:38:11 2023 +0100
* tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/element_types.txt,
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line),
tp/Texinfo/XS/parsetexi/separator.c (handle_comma): remove elided
as elided_brace_command_arg and elided_block as elided_rawpreformatted
to convey the similarity with the corresponding containers without
leading elided_.
---
ChangeLog | 10 ++++++++++
tp/TODO | 3 +--
tp/Texinfo/ParserNonXS.pm | 6 +++---
tp/Texinfo/XS/parsetexi/element_types.c | 4 ++--
tp/Texinfo/XS/parsetexi/element_types.h | 4 ++--
tp/Texinfo/XS/parsetexi/element_types.txt | 4 ++--
tp/Texinfo/XS/parsetexi/parser.c | 2 +-
tp/Texinfo/XS/parsetexi/separator.c | 4 ++--
tp/t/results/conditionals/cond.pl | 4 ++--
tp/t/results/conditionals/cond_ifhtml_ifinfo.pl | 2 +-
tp/t/results/conditionals/cond_info.pl | 4 ++--
.../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl | 4 ++--
.../cond_no-ifhtml_no-ifinfo_no-iftex.pl | 4 ++--
tp/t/results/conditionals/cond_xml.pl | 4 ++--
tp/t/results/conditionals/false_format_not_closed.pl | 2 +-
tp/t/results/conditionals/inlinefmtifelse_nesting.pl | 2 +-
.../conditionals/inlineiffmtifelse_not_closed.pl | 2 +-
.../inlineiffmtifelse_not_closed_three_arg.pl | 2 +-
.../inlineiffmtifelse_not_closed_two_arg.pl | 2 +-
.../conditionals/inlineifset_false_not_closed.pl | 2 +-
tp/t/results/conditionals/many_conditionals.pl | 2 +-
tp/t/results/converters_tests/at_commands_in_raw.pl | 2 +-
tp/t/results/converters_tests/inline.pl | 4 ++--
tp/t/results/converters_tests/inline_expand_tex.pl | 20 ++++++++++----------
tp/t/results/converters_tests/inlinefmtifelse.pl | 20 ++++++++++----------
tp/t/results/converters_tests/inlineifsetifclear.pl | 4 ++--
.../converters_tests/inlineifsetifclearspaces.pl | 4 ++--
.../command_in_end_ignored_raw_command_after.pl | 2 +-
.../command_in_end_ignored_raw_in_command.pl | 2 +-
...and_in_end_ignored_raw_one_char_before_command.pl | 2 +-
...and_in_end_ignored_raw_one_char_not_in_command.pl | 2 +-
...and_in_end_ignored_raw_two_char_before_command.pl | 2 +-
...and_in_end_ignored_raw_two_char_not_in_command.pl | 2 +-
tp/t/results/macro/ignored_macro_definition.pl | 2 +-
.../macro/macro_call_in_ignored_inlinefmtifelse.pl | 2 +-
.../macro/macro_call_in_inlinefmtifelse_format.pl | 2 +-
.../macro/macro_end_call_in_ignored_inlinefmt.pl | 2 +-
.../macro_end_call_in_ignored_inlinefmtifelse.pl | 2 +-
...macro_end_call_in_ignored_inlinefmtifelse_else.pl | 2 +-
.../macro/macro_end_call_in_ignored_inlineraw.pl | 2 +-
tp/t/results/macro/macro_end_call_in_ignored_raw.pl | 2 +-
.../macro/macro_inlineifcond_end_in_empty_ignored.pl | 4 ++--
tp/t/results/raw/inline_missing_first_arg.pl | 4 ++--
tp/t/results/raw/space_before_end.pl | 2 +-
tp/t/results/raw/spurious_arg_on_line.pl | 2 +-
tp/t/results/value/ignored_value_definition.pl | 2 +-
46 files changed, 89 insertions(+), 80 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a81cfa11b7..5853c22a71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-02-11 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
+ tp/Texinfo/XS/parsetexi/element_types.txt,
+ tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line),
+ tp/Texinfo/XS/parsetexi/separator.c (handle_comma): remove elided
+ as elided_brace_command_arg and elided_block as elided_rawpreformatted
+ to convey the similarity with the corresponding containers without
+ leading elided_.
+
2023-02-11 Gavin Smith <gavinsmith0123@gmail.com>
* tp/Texinfo/ParserNonXS.pm (%contain_full_line_commands):
diff --git a/tp/TODO b/tp/TODO
index d5595328f1..5bb89c24d5 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -30,9 +30,8 @@ Missing documentation
Tree documentation in ParserNonXS.pm
------------------------------------
-replaced, elided, elided_block types.
+replaced, elided_rawpreformatted, elided_brace_command_arg types.
-'extra'->'file' in replaced @include.
extra->'comment_at_end'
likely in many line commands
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 4ed0bd6439..afa8048a98 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4913,7 +4913,7 @@ sub _process_remaining_on_line($$$$)
and $block_commands{$current->{'cmdname'}}
and $block_commands{$current->{'cmdname'}} eq 'format_raw'
and not $self->{'expanded_formats_hash'}->{$current->{'cmdname'}}) {
- push @{$current->{'contents'}}, { 'type' => 'elided_block',
+ push @{$current->{'contents'}}, { 'type' => 'elided_rawpreformatted',
'parent' => $current };
while (not $line =~ /^\s*\@end\s+$current->{'cmdname'}/) {
# FIXME a source mark here is ignored. Tested in
@@ -6464,7 +6464,7 @@ sub _process_remaining_on_line($$$$)
$current->{'extra'}->{'expand_index'} = 2;
# Add a dummy argument for the first argument.
- push @{$current->{'args'}}, {'type' => 'elided',
+ push @{$current->{'args'}}, {'type' => 'elided_brace_command_arg',
'parent' => $current,};
# Scan forward to get the next argument.
my $brace_count = 1;
@@ -6508,7 +6508,7 @@ sub _process_remaining_on_line($$$$)
# If this command is not being expanded, add a dummy argument,
# and scan forward to the closing brace.
if (!$expandp) {
- push @{$current->{'args'}}, {'type' => 'elided',
+ push @{$current->{'args'}}, {'type' => 'elided_brace_command_arg',
'parent' => $current,};
my $brace_count = 1;
while ($brace_count > 0) {
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c
b/tp/Texinfo/XS/parsetexi/element_types.c
index bf07b48f1a..2356e33d09 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -62,8 +62,8 @@ char *element_type_names[] = {
"bracketed_inserted",
"bracketed_multitable_prototype",
"row_prototype",
-"elided",
-"elided_block",
+"elided_rawpreformatted",
+"elided_brace_command_arg",
"delimiter",
"spaces",
"untranslated",
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h
b/tp/Texinfo/XS/parsetexi/element_types.h
index 1322c64e57..f02209f1ac 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -65,8 +65,8 @@ ET_def_aggregate,
ET_bracketed_inserted,
ET_bracketed_multitable_prototype,
ET_row_prototype,
-ET_elided,
-ET_elided_block,
+ET_elided_rawpreformatted,
+ET_elided_brace_command_arg,
ET_delimiter,
ET_spaces,
ET_untranslated,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt
b/tp/Texinfo/XS/parsetexi/element_types.txt
index 2c1b61a275..8fa8e179d9 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -87,8 +87,8 @@ bracketed_multitable_prototype
row_prototype
# for unexpanded parts of conditionals
-elided
-elided_block
+elided_rawpreformatted
+elided_brace_command_arg
# for def commands
delimiter
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 46be7b3eba..6c075f54ae 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1555,7 +1555,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
char *line_dummy;
int n;
- e = new_element (ET_elided_block);
+ e = new_element (ET_elided_rawpreformatted);
add_to_element_contents (current, e);
line_dummy = line;
while (!is_end_current_command (current, &line_dummy,
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index 1e73e2b88e..9b072f7732 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -603,7 +603,7 @@ handle_comma (ELEMENT *current, char **line_inout)
add_extra_integer (current, "expand_index", 2);
/* Add a dummy argument for the first argument. */
- e = new_element (ET_elided);
+ e = new_element (ET_elided_brace_command_arg);
add_to_element_args (current, e);
/* Scan forward to get the next argument. */
@@ -658,7 +658,7 @@ handle_comma (ELEMENT *current, char **line_inout)
static char *alloc_line;
ELEMENT *e;
int brace_count = 1;
- e = new_element (ET_elided);
+ e = new_element (ET_elided_brace_command_arg);
add_to_element_args (current, e);
while (brace_count > 0)
{
diff --git a/tp/t/results/conditionals/cond.pl
b/tp/t/results/conditionals/cond.pl
index 7d7e6f37aa..220bc26ab9 100644
--- a/tp/t/results/conditionals/cond.pl
+++ b/tp/t/results/conditionals/cond.pl
@@ -62,7 +62,7 @@ $result_trees{'cond'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
@@ -244,7 +244,7 @@ $result_trees{'cond'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
index ab76319eaf..fe088b7b97 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -250,7 +250,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git a/tp/t/results/conditionals/cond_info.pl
b/tp/t/results/conditionals/cond_info.pl
index fa23d64475..55f3a1d879 100644
--- a/tp/t/results/conditionals/cond_info.pl
+++ b/tp/t/results/conditionals/cond_info.pl
@@ -62,7 +62,7 @@ $result_trees{'cond_info'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
@@ -244,7 +244,7 @@ $result_trees{'cond_info'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git
a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index ee46eb1dc0..c5f9a842eb 100644
--- a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -62,7 +62,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
@@ -244,7 +244,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index 1dd7f72744..21f6743769 100644
--- a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -62,7 +62,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
@@ -244,7 +244,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git a/tp/t/results/conditionals/cond_xml.pl
b/tp/t/results/conditionals/cond_xml.pl
index b487ca96c2..d4aeedb248 100644
--- a/tp/t/results/conditionals/cond_xml.pl
+++ b/tp/t/results/conditionals/cond_xml.pl
@@ -62,7 +62,7 @@ $result_trees{'cond_xml'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
@@ -244,7 +244,7 @@ $result_trees{'cond_xml'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git a/tp/t/results/conditionals/false_format_not_closed.pl
b/tp/t/results/conditionals/false_format_not_closed.pl
index e1852c33cb..2e830f6fac 100644
--- a/tp/t/results/conditionals/false_format_not_closed.pl
+++ b/tp/t/results/conditionals/false_format_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'false_format_not_closed'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'text' => '',
diff --git a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
index 29096d8ff5..d8da7a55f6 100644
--- a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
+++ b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
@@ -22,7 +22,7 @@ $result_trees{'inlinefmtifelse_nesting'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
index 5f6381fe29..fcd5791c1b 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
@@ -22,7 +22,7 @@ $result_trees{'inlineiffmtifelse_not_closed'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git
a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
index b521e49bf4..a51fbc7bf0 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
@@ -22,7 +22,7 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
index 216922fcf4..2b8d7cca29 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
@@ -22,7 +22,7 @@ $result_trees{'inlineiffmtifelse_not_closed_two_arg'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git a/tp/t/results/conditionals/inlineifset_false_not_closed.pl
b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
index 702689e302..9c2e7a7df5 100644
--- a/tp/t/results/conditionals/inlineifset_false_not_closed.pl
+++ b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
@@ -22,7 +22,7 @@ $result_trees{'inlineifset_false_not_closed'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineifset',
diff --git a/tp/t/results/conditionals/many_conditionals.pl
b/tp/t/results/conditionals/many_conditionals.pl
index dad8449543..df75905bb0 100644
--- a/tp/t/results/conditionals/many_conditionals.pl
+++ b/tp/t/results/conditionals/many_conditionals.pl
@@ -139,7 +139,7 @@ $result_trees{'many_conditionals'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
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 0f2bd08b4c..53b8ee4620 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -407,7 +407,7 @@ $result_trees{'at_commands_in_raw'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git a/tp/t/results/converters_tests/inline.pl
b/tp/t/results/converters_tests/inline.pl
index 626cc84542..84876eb432 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -183,7 +183,7 @@ $result_trees{'inline'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
@@ -496,7 +496,7 @@ $result_trees{'inline'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl
b/tp/t/results/converters_tests/inline_expand_tex.pl
index f71080b1b5..26e0d0eee0 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -27,7 +27,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
@@ -55,7 +55,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
@@ -83,7 +83,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
@@ -111,7 +111,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
@@ -196,7 +196,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
@@ -239,7 +239,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineraw',
@@ -267,7 +267,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineraw',
@@ -295,7 +295,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineraw',
@@ -323,7 +323,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineraw',
@@ -437,7 +437,7 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/converters_tests/inlinefmtifelse.pl
b/tp/t/results/converters_tests/inlinefmtifelse.pl
index 6e028ab097..54d30c6e1c 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse.pl
@@ -22,7 +22,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
@@ -59,7 +59,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
@@ -106,7 +106,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'type' => 'brace_command_arg'
@@ -138,7 +138,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
@@ -185,7 +185,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'type' => 'brace_command_arg'
@@ -235,7 +235,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
@@ -295,7 +295,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
@@ -347,7 +347,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
@@ -394,7 +394,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
@@ -441,7 +441,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index 34e4183822..a4d67f9f40 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -71,7 +71,7 @@ $result_trees{'inlineifsetifclear'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineifset',
@@ -137,7 +137,7 @@ $result_trees{'inlineifsetifclear'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineifclear',
diff --git a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
index 430877d038..7c7d375b13 100644
--- a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
@@ -91,7 +91,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineifset',
@@ -169,7 +169,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineifclear',
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
index 6626d21822..5ed78434e3 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
@@ -24,7 +24,7 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
index 88aff41ce4..66d1033e06 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
@@ -24,7 +24,7 @@ $result_trees{'command_in_end_ignored_raw_in_command'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'text' => '',
diff --git
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
index c6a07fba24..fe828cb5fd 100644
---
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
+++
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
@@ -24,7 +24,7 @@
$result_trees{'command_in_end_ignored_raw_one_char_before_command'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'text' => '',
diff --git
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
index 8936d69600..ff3e680b94 100644
---
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
+++
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
@@ -24,7 +24,7 @@
$result_trees{'command_in_end_ignored_raw_one_char_not_in_command'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'text' => '',
diff --git
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
index b1967d9031..2dbecee7b4 100644
---
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
+++
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
@@ -24,7 +24,7 @@
$result_trees{'command_in_end_ignored_raw_two_char_before_command'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'text' => '',
diff --git
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
index 481ef5d910..6f8ef66888 100644
---
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
+++
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
@@ -24,7 +24,7 @@
$result_trees{'command_in_end_ignored_raw_two_char_not_in_command'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'text' => '',
diff --git a/tp/t/results/macro/ignored_macro_definition.pl
b/tp/t/results/macro/ignored_macro_definition.pl
index 0eef68acda..fa76a635a3 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -89,7 +89,7 @@ $result_trees{'ignored_macro_definition'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
diff --git a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
index f4adfc7bd9..4e28fd2640 100644
--- a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
@@ -87,7 +87,7 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'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 407146749d..51e05f0432 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -101,7 +101,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
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 c70720f2d6..ad55a4697e 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
@@ -113,7 +113,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
'text' => ''
}
],
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
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 19c01600c6..dc467257d1 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
@@ -113,7 +113,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'}
= {
'text' => ''
}
],
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
},
{
'contents' => [
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 57020218a1..891f5a7b4b 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
@@ -126,7 +126,7 @@
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
'text' => ''
}
],
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmtifelse',
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 04592897c3..344f03121b 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
@@ -113,7 +113,7 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
'text' => ''
}
],
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineraw',
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 e1b5df6bb6..c93755336b 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
@@ -105,7 +105,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
'cmdname' => 'tex',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
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 002ce9d58f..558e158d2c 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
@@ -108,7 +108,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
'text' => ''
}
],
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineifset',
@@ -175,7 +175,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
'text' => ''
}
],
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineifset',
diff --git a/tp/t/results/raw/inline_missing_first_arg.pl
b/tp/t/results/raw/inline_missing_first_arg.pl
index 765ec5fc8d..bc49ad4765 100644
--- a/tp/t/results/raw/inline_missing_first_arg.pl
+++ b/tp/t/results/raw/inline_missing_first_arg.pl
@@ -22,7 +22,7 @@ $result_trees{'inline_missing_first_arg'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
@@ -44,7 +44,7 @@ $result_trees{'inline_missing_first_arg'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/raw/space_before_end.pl
b/tp/t/results/raw/space_before_end.pl
index d3f93c0b50..76a13e2528 100644
--- a/tp/t/results/raw/space_before_end.pl
+++ b/tp/t/results/raw/space_before_end.pl
@@ -161,7 +161,7 @@ $result_trees{'space_before_end'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'text' => ' '
diff --git a/tp/t/results/raw/spurious_arg_on_line.pl
b/tp/t/results/raw/spurious_arg_on_line.pl
index 111be8c3aa..59736e6a5e 100644
--- a/tp/t/results/raw/spurious_arg_on_line.pl
+++ b/tp/t/results/raw/spurious_arg_on_line.pl
@@ -184,7 +184,7 @@ $result_trees{'spurious_arg_on_line'} = {
'cmdname' => 'html',
'contents' => [
{
- 'type' => 'elided_block'
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
diff --git a/tp/t/results/value/ignored_value_definition.pl
b/tp/t/results/value/ignored_value_definition.pl
index 571f488079..96f490480f 100644
--- a/tp/t/results/value/ignored_value_definition.pl
+++ b/tp/t/results/value/ignored_value_definition.pl
@@ -50,7 +50,7 @@ $result_trees{'ignored_value_definition'} = {
'type' => 'brace_command_arg'
},
{
- 'type' => 'elided'
+ 'type' => 'elided_brace_command_arg'
}
],
'cmdname' => 'inlinefmt',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c (handle_comma): remove elided as elided_brace_command_arg and elided_block as elided_rawpreformatted to convey the similarity with the corresponding containers without leading elided_.,
Patrice Dumas <=