branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_texi), tp/Texinfo/XS/parsetexi/parser.c (parse_texi): revert change from 2023-01-08, do not ignore empty line early such that line after a DEL character is joined with the next 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 9fdc5f9ec2 * tp/Texinfo/ParserNonXS.pm (_parse_texi), 
tp/Texinfo/XS/parsetexi/parser.c (parse_texi): revert change from 2023-01-08, 
do not ignore empty line early such that line after a DEL character is joined 
with the next line.
9fdc5f9ec2 is described below

commit 9fdc5f9ec27020c937b774390e47dd15ea5adce0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 14 00:01:41 2023 +0100

    * tp/Texinfo/ParserNonXS.pm (_parse_texi),
    tp/Texinfo/XS/parsetexi/parser.c (parse_texi): revert change from
    2023-01-08, do not ignore empty line early such that line after
    a DEL character is joined with the next line.
---
 ChangeLog                                          |  7 +++++
 tp/TODO                                            |  2 --
 tp/Texinfo/ParserNonXS.pm                          |  6 ----
 tp/Texinfo/XS/parsetexi/parser.c                   |  8 ------
 .../coverage/delcomment_followed_by_cpp_line.pl    | 33 ++++++++++++++--------
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c57c7be0d..75001bf57f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-13  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_parse_texi),
+       tp/Texinfo/XS/parsetexi/parser.c (parse_texi): revert change from
+       2023-01-08, do not ignore empty line early such that line after
+       a DEL character is joined with the next line.
+
 2023-01-13  Patrice Dumas  <pertusus@free.fr>
 
        * doc/texinfo.texi (Comments): add that the line after the DEL
diff --git a/tp/TODO b/tp/TODO
index b3cf8eb81e..3ffd78df80 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,8 +13,6 @@ Before next release
 Bugs
 ====
 
-Fix delcomment_followed_by_cpp_line test.
-
 HTML API
 ========
 
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 4adc4f8669..888b472847 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -6027,12 +6027,6 @@ sub _parse_texi($$$)
     my $line;
     ($line, $source_info) = _next_text($self);
     last if (!defined($line));
-    # This makes sure that there is not an empty line going in
-    # _process_remaining_on_line where there is a special case if
-    # line is empty with _next_text called, while _next_text
-    # should be called here in order to have the code right below
-    # called.
-    next if ($line eq '');
 
     if ($self->{'DEBUG'}) {
       my $source_info_text = '';
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index de4b7bbdae..bdb8d78904 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -2168,14 +2168,6 @@ parse_texi (ELEMENT *root_elt, ELEMENT *current_elt)
       if (!allocated_line)
         break; /* Out of input. */
 
-      /* This makes sure that there is not an empty line going in
-         process_remaining_on_line where there is a special case if
-         line is empty with next_text called, while next_text
-         should be called here in order to have the code right below
-         called. */
-      if (*line == '\0')
-        continue;
-
       debug_nonl ("NEW LINE %s", line);
 
       /* If not in 'raw' or 'conditional' and parent isn't a 'verb',
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 44ac138e58..6fdea076f7 100644
--- a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
+++ b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
@@ -93,17 +93,26 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
             },
             {
               'text' => '
-',
-              'type' => 'empty_line'
-            },
-            {
-              'text' => '
 ',
               'type' => 'empty_line'
             }
           ],
           'type' => 'preamble_before_content'
         },
+        {
+          'contents' => [
+            {
+              'text' => '#line 46 "a_file_after_del_comment"
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
         {
           'contents' => [
             {
@@ -205,6 +214,7 @@ $result_texis{'delcomment_followed_by_cpp_line'} = '\\input 
texinfo
 @c this tests both the del comment and a file without
 @c element.
 
+#line 46 "a_file_after_del_comment"
 
 
 
@@ -222,6 +232,7 @@ $result_texis{'delcomment_followed_by_cpp_line'} = '\\input 
texinfo
 
 $result_texts{'delcomment_followed_by_cpp_line'} = '
 
+#line 46 "a_file_after_del_comment"
 
 
 
@@ -239,8 +250,8 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
   {
     'error_line' => 'unknown command `unknown\'
 ',
-    'file_name' => 'a_file_after_del_comment',
-    'line_nr' => 48,
+    'file_name' => 'delcomment_followed_by_cpp_line.texi',
+    'line_nr' => 10,
     'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
@@ -248,8 +259,8 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
   {
     'error_line' => 'unknown command `unknown1\'
 ',
-    'file_name' => 'a_file_after_del_comment',
-    'line_nr' => 53,
+    'file_name' => 'delcomment_followed_by_cpp_line.texi',
+    'line_nr' => 15,
     'macro' => '',
     'text' => 'unknown command `unknown1\'',
     'type' => 'error'
@@ -257,8 +268,8 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
   {
     'error_line' => 'unknown command `unknown2\'
 ',
-    'file_name' => 'a_file_after_del_comment',
-    'line_nr' => 58,
+    'file_name' => 'delcomment_followed_by_cpp_line.texi',
+    'line_nr' => 20,
     'macro' => '',
     'text' => 'unknown command `unknown2\'',
     'type' => 'error'