branch master updated: * tp/t/input_files/delcomment_followed_by_cpp_line.texi: add more cases of del comment followed by cpp directives.

[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 cda5d3eb70 * tp/t/input_files/delcomment_followed_by_cpp_line.texi: 
add more cases of del comment followed by cpp directives.
cda5d3eb70 is described below

commit cda5d3eb703aec8425ec9e5c40e38744b7121e32
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 9 19:07:20 2023 +0100

    * tp/t/input_files/delcomment_followed_by_cpp_line.texi: add more
    cases of del comment followed by cpp directives.
---
 ChangeLog                                          |  5 ++
 tp/TODO                                            |  5 +-
 .../delcomment_followed_by_cpp_line.texi           | 10 +++
 .../coverage/delcomment_followed_by_cpp_line.pl    | 98 ++++++++++++++++++++++
 4 files changed, 114 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ea402e5cda..ede88825d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-01-09  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/t/input_files/delcomment_followed_by_cpp_line.texi: add more
+       cases of del comment followed by cpp directives.
+
 2023-01-09  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/Converter.pm (initialize_tree_units_files)
diff --git a/tp/TODO b/tp/TODO
index accc935612..b3cf8eb81e 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,10 +13,7 @@ Before next release
 Bugs
 ====
 
-test with cpp directive in macro, verify that file name is stil changed
-after the macro expansion
-
-on the same line as a macro expansion check the source_info, incorrect macro?
+Fix delcomment_followed_by_cpp_line test.
 
 HTML API
 ========
diff --git a/tp/t/input_files/delcomment_followed_by_cpp_line.texi 
b/tp/t/input_files/delcomment_followed_by_cpp_line.texi
index a8ec63edc9..a5d1ad9549 100644
--- a/tp/t/input_files/delcomment_followed_by_cpp_line.texi
+++ b/tp/t/input_files/delcomment_followed_by_cpp_line.texi
@@ -9,4 +9,14 @@
 
 @unknown
 
+   this is a comment.
+#line 106 "a_file_after_space_del_comment"
+
+@unknown1
+
+ a  this is a comment.
+#line 206 "a_file_after_text_space_del_comment"
+
+@unknown2
+
 @bye
diff --git a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl 
b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
index 9e71037dd6..44ac138e58 100644
--- a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
+++ b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
@@ -115,6 +115,70 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
         },
         {
           'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'text' => '  ',
+          'type' => 'spaces_before_paragraph'
+        },
+        {
+          'contents' => [
+            {
+              'text' => '#line 106 "a_file_after_space_del_comment"
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => '
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'text' => ' ',
+          'type' => 'spaces_before_paragraph'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'a #line 206 "a_file_after_text_space_del_comment"
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => '
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
 ',
           'type' => 'empty_line'
         }
@@ -144,6 +208,14 @@ $result_texis{'delcomment_followed_by_cpp_line'} = 
'\\input texinfo
 
 
 
+  #line 106 "a_file_after_space_del_comment"
+
+
+
+ a #line 206 "a_file_after_text_space_del_comment"
+
+
+
 @bye
 ';
 
@@ -153,6 +225,14 @@ $result_texts{'delcomment_followed_by_cpp_line'} = '
 
 
 
+#line 106 "a_file_after_space_del_comment"
+
+
+
+a #line 206 "a_file_after_text_space_del_comment"
+
+
+
 ';
 
 $result_errors{'delcomment_followed_by_cpp_line'} = [
@@ -164,6 +244,24 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
     'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
+  },
+  {
+    'error_line' => 'unknown command `unknown1\'
+',
+    'file_name' => 'a_file_after_del_comment',
+    'line_nr' => 53,
+    'macro' => '',
+    'text' => 'unknown command `unknown1\'',
+    'type' => 'error'
+  },
+  {
+    'error_line' => 'unknown command `unknown2\'
+',
+    'file_name' => 'a_file_after_del_comment',
+    'line_nr' => 58,
+    'macro' => '',
+    'text' => 'unknown command `unknown2\'',
+    'type' => 'error'
   }
 ];