branch master updated: * tp/t/02coverage.t, tp/Makefile.am (test_files), tp/Makefile.tres: add delcomment_on_comment with a DEL comment on a @comment line.

[Patrice Dumas]

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 a0afaef1c5 * tp/t/02coverage.t, tp/Makefile.am (test_files), 
tp/Makefile.tres: add delcomment_on_comment with a DEL comment on a @comment 
line.
a0afaef1c5 is described below

commit a0afaef1c55ae02bc7c4502a627b9f96fb61a40e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Mar 5 11:34:39 2023 +0100

    * tp/t/02coverage.t, tp/Makefile.am (test_files), tp/Makefile.tres:
    add delcomment_on_comment with a DEL comment on a @comment line.
---
 ChangeLog                                      |  5 ++
 tp/Makefile.am                                 |  1 +
 tp/Makefile.tres                               |  1 +
 tp/Texinfo/ParserNonXS.pm                      |  2 +-
 tp/t/02coverage.t                              |  3 +
 tp/t/input_files/delcomment_on_comment.texi    |  6 ++
 tp/t/results/coverage/delcomment_on_comment.pl | 97 ++++++++++++++++++++++++++
 7 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 11acd3f8cf..245f3a1295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-05  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/t/02coverage.t, tp/Makefile.am (test_files), tp/Makefile.tres:
+       add delcomment_on_comment with a DEL comment on a @comment line.
+
 2023-03-05  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_handle_line_command),
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 91ba55701f..04aaaefffb 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -204,6 +204,7 @@ test_files = \
  t/input_files/cpp_line_latin1.texi \
  t/input_files/delcomment.texi \
  t/input_files/delcomment_followed_by_cpp_line.texi \
+ t/input_files/delcomment_on_comment.texi \
  t/input_files/direntry_dircategory.texi \
  t/input_files/double_contents.texi \
  t/input_files/east_asian_in_w.texi \
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 9f1e31125a..3e96d12a57 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -304,6 +304,7 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/coverage/def.pl \
   t/results/coverage/delcomment.pl \
   t/results/coverage/delcomment_followed_by_cpp_line.pl \
+  t/results/coverage/delcomment_on_comment.pl \
   t/results/coverage/displaymath.pl \
   t/results/coverage/empty_w.pl \
   t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl \
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index e8c786cf7d..977eb95052 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -5208,7 +5208,7 @@ sub _handle_line_command($$$$$$)
       if $command_e;
 
     # This does nothing for the command being processed, as there is
-    # no line context setup nor line_args, it closes the line or block
+    # no line context setup nor line_args, but it closes a line or block
     # line @-commands the raw line command is on.  For c/comment
     # this corresponds to legitimate constructs, not for other raw
     # line commands.
diff --git a/tp/t/02coverage.t b/tp/t/02coverage.t
index b2d3f1c825..010f83813a 100644
--- a/tp/t/02coverage.t
+++ b/tp/t/02coverage.t
@@ -1010,6 +1010,9 @@ before first multitable
 ['delcomment_followed_by_cpp_line',
 undef, {'test_file' => 'delcomment_followed_by_cpp_line.texi'}
 ],
+['delcomment_on_comment', undef,
+{'test_file' => 'delcomment_on_comment.texi'},
+],
 );
 
 my %docbooc_doc_tests = (
diff --git a/tp/t/input_files/delcomment_on_comment.texi 
b/tp/t/input_files/delcomment_on_comment.texi
new file mode 100644
index 0000000000..2681b33ab3
--- /dev/null
+++ b/tp/t/input_files/delcomment_on_comment.texi
@@ -0,0 +1,6 @@
+\input texinfo
+
+some text @c a comment with del  after del.
+next line
+
+@bye
diff --git a/tp/t/results/coverage/delcomment_on_comment.pl 
b/tp/t/results/coverage/delcomment_on_comment.pl
new file mode 100644
index 0000000000..a35a1b95f6
--- /dev/null
+++ b/tp/t/results/coverage/delcomment_on_comment.pl
@@ -0,0 +1,97 @@
+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{'delcomment_on_comment'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo
+',
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        },
+        {
+          'contents' => [
+            {
+              'source_marks' => [
+                {
+                  'counter' => 1,
+                  'line' => ' after del.
+',
+                  'position' => 10,
+                  'sourcemark_type' => 'delcomment'
+                }
+              ],
+              'text' => 'some text '
+            },
+            {
+              'args' => [
+                {
+                  'text' => ' a comment with del next line
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'type' => 'before_node_section'
+    },
+    {
+      'args' => [
+        {
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye'
+    }
+  ],
+  'type' => 'document_root'
+};
+
+$result_texis{'delcomment_on_comment'} = '\\input texinfo
+
+some text @c a comment with del next line
+
+@bye
+';
+
+
+$result_texts{'delcomment_on_comment'} = 'some text 
+';
+
+$result_errors{'delcomment_on_comment'} = [];
+
+
+$result_floats{'delcomment_on_comment'} = {};
+
+
+1;