[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_def): set par
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_def): set parent for the definition args for the argument content gathered when there is no args to finish the item before. |
|
Date: |
Mon, 06 Mar 2023 05:42:39 -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 89ef2c286c * tp/Texinfo/ParserNonXS.pm (_parse_def): set parent for
the definition args for the argument content gathered when there is no args to
finish the item before.
89ef2c286c is described below
commit 89ef2c286c5671d6e776edfcc384ca1517762d8e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Mar 6 11:42:29 2023 +0100
* tp/Texinfo/ParserNonXS.pm (_parse_def): set parent for the
definition args for the argument content gathered when there
is no args to finish the item before.
* tp/Makefile.tres, tp/t/19def.t: add def_groupings_args to
test grouping of def args more.
---
ChangeLog | 9 +
tp/Makefile.tres | 1 +
tp/t/19def.t | 10 +
tp/t/results/def/def_groupings_args.pl | 532 +++++++++++++++++++++++++++++++++
4 files changed, 552 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 0df85ede61..5a187076a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-03-06 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_def): set parent for the
+ definition args for the argument content gathered when there
+ is no args to finish the item before.
+
+ * tp/Makefile.tres, tp/t/19def.t: add def_groupings_args to
+ test grouping of def args more.
+
2023-03-05 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 7101d61c12..c9476c7a1d 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -417,6 +417,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/def/ampchar.pl \
t/results/def/code_in_def.pl \
t/results/def/def_defx_mismatch.pl \
+ t/results/def/def_groupings_args.pl \
t/results/def/defblock_no_defline.pl \
t/results/def/defline_no_params.pl \
t/results/def/defx_after_comment.pl \
diff --git a/tp/t/19def.t b/tp/t/19def.t
index 68b6ce9a37..c705453794 100644
--- a/tp/t/19def.t
+++ b/tp/t/19def.t
@@ -377,6 +377,16 @@ T
@anchor{myanchor}
'],
+['def_groupings_args',
+'@deffn a b@code{aa}c
+@end deffn
+
+@deffn a@samp{g1}
+@end deffn
+
+@deffn @var{var}c {br @samp{s}} c@code{arg})
+@end deffn
+']
);
my @test_info = (
diff --git a/tp/t/results/def/def_groupings_args.pl
b/tp/t/results/def/def_groupings_args.pl
new file mode 100644
index 0000000000..2728d9d9e9
--- /dev/null
+++ b/tp/t/results/def/def_groupings_args.pl
@@ -0,0 +1,532 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'def_groupings_args'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => 'a'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'b'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'type' => 'def_aggregate'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_index_element' => {},
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 1,
+ 'index_name' => 'fn'
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'deffn'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'deffn'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'g1'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'type' => 'def_aggregate'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {}
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'deffn'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'deffn'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'var'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'var',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'type' => 'def_aggregate'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'br '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 's'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'c'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'arg'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'delimiter'
+ },
+ 'text' => ')',
+ 'type' => 'delimiter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_index_element' => {},
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'entry_element' => {},
+ 'entry_number' => 2,
+ 'in_code' => 1,
+ 'index_name' => 'fn'
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'deffn'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'deffn'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_index_element'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'def_groupings_args'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
+
+$result_texis{'def_groupings_args'} = '@deffn a b@code{aa}c
+@end deffn
+
+@deffn a@samp{g1}
+@end deffn
+
+@deffn @var{var}c {br @samp{s}} c@code{arg})
+@end deffn
+';
+
+
+$result_texts{'def_groupings_args'} = 'a: baac
+
+ag1:
+
+varc: br s carg)
+';
+
+$result_errors{'def_groupings_args'} = [
+ {
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'entry for index `fn\' outside of any node',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: missing name for @deffn
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => 'missing name for @deffn',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'entry for index `fn\' outside of any node',
+ 'type' => 'warning'
+ }
+];
+
+
+$result_floats{'def_groupings_args'} = {};
+
+
+$result_indices_sort_strings{'def_groupings_args'} = {
+ 'fn' => [
+ 'baac',
+ 'br s'
+ ]
+};
+
+
+
+$result_converted{'plaintext'}->{'def_groupings_args'} = ' -- a: baac
+
+ -- ag1:
+
+ -- VARc: br s carg)
+';
+
+1;
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_def): set parent for the definition args for the argument content gathered when there is no args to finish the item before.,
Patrice Dumas <=