[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Tue, 6 Dec 2022 18:17:21 -0500 (EST) |
branch: master
commit 5a37322d0e3ba9ca75e318390b1a192c3fd263f2
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Dec 7 00:17:10 2022 +0100
* tp/Texinfo/ParserNonXS.pm (_end_line_def_line),
tp/Texinfo/XS/parsetexi/end_line.c (end_line_def_line): do not call
abort_empty_line when processing the @def* line, there is no empty
line to abort.
---
ChangeLog | 7 +++
tp/Texinfo/ParserNonXS.pm | 1 -
tp/Texinfo/XS/parsetexi/end_line.c | 2 -
tp/t/results/def/all_empty_def.pl | 72 +++++++++++-----------
tp/t/results/def/empty_def_arguments.pl | 8 +--
tp/t/results/def/no_category_or_no_name.pl | 16 ++---
.../res_parser/formatting_xml/formatting.xml | 8 +--
7 files changed, 59 insertions(+), 55 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e99d3b5bde..0f0b1a8a57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-12-06 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_end_line_def_line),
+ tp/Texinfo/XS/parsetexi/end_line.c (end_line_def_line): do not call
+ abort_empty_line when processing the @def* line, there is no empty
+ line to abort.
+
2022-12-06 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_merge_text): use explicitely scalar()
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 097f55690a..57e47beaa3 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3291,7 +3291,6 @@ sub _end_line_def_line($$$)
.Texinfo::Common::debug_print_element_short($current)."\n"
if ($self->{'DEBUG'});
- _abort_empty_line($self, $current);
_isolate_last_space($self, $current);
my $arguments = _parse_def($self, $def_command, $current);
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 0f364040ce..2dce1c4844 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1958,8 +1958,6 @@ end_line_def_line (ELEMENT *current)
free (stripped);
}
- /* in case there are no arguments at all, it needs to be called here. */
- abort_empty_line (¤t, NULL);
isolate_last_space (current);
def_info = parse_def (def_command, current);
diff --git a/tp/t/results/def/all_empty_def.pl
b/tp/t/results/def/all_empty_def.pl
index 0cbabd14f7..ad0b0b1fd8 100644
--- a/tp/t/results/def/all_empty_def.pl
+++ b/tp/t/results/def/all_empty_def.pl
@@ -15,6 +15,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -58,10 +62,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 1,
@@ -79,6 +79,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -122,10 +126,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 4,
@@ -143,6 +143,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -186,10 +190,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 7,
@@ -207,6 +207,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -250,10 +254,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 10,
@@ -271,6 +271,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -314,10 +318,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 13,
@@ -335,6 +335,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -378,10 +382,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 16,
@@ -399,6 +399,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -442,10 +446,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 19,
@@ -463,6 +463,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -506,10 +510,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 22,
@@ -527,6 +527,10 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -570,10 +574,6 @@ $result_trees{'all_empty_def'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 25,
diff --git a/tp/t/results/def/empty_def_arguments.pl
b/tp/t/results/def/empty_def_arguments.pl
index 99f465da8e..b8ecceae2f 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -189,6 +189,10 @@ $result_trees{'empty_def_arguments'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'line_arg'
}
],
@@ -197,10 +201,6 @@ $result_trees{'empty_def_arguments'} = {
'def_command' => 'deffn',
'original_def_cmdname' => 'deffnx'
},
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 3,
diff --git a/tp/t/results/def/no_category_or_no_name.pl
b/tp/t/results/def/no_category_or_no_name.pl
index 686b68cbbc..09c0a26eab 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -15,6 +15,10 @@ $result_trees{'no_category_or_no_name'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'block_line_arg'
}
],
@@ -72,10 +76,6 @@ $result_trees{'no_category_or_no_name'} = {
}
}
],
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 1,
@@ -318,6 +318,10 @@ $result_trees{'no_category_or_no_name'} = {
{
'args' => [
{
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'line_arg'
}
],
@@ -326,10 +330,6 @@ $result_trees{'no_category_or_no_name'} = {
'def_command' => 'deffn',
'original_def_cmdname' => 'deffnx'
},
- 'info' => {
- 'spaces_before_argument' => '
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 11,
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 0f1dd354a2..4057455427 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -2316,7 +2316,7 @@ in verbatim ''
<!-- c Paragraph ended before @deffngeneral was complete. -->
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="52"><var>invalid</var></indexterm><defcategory>fsetinv</defcategory>
<deffunction><var>invalid</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm></definitionterm></deffnx>
+<deffnx><definitionterm> </definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -3465,7 +3465,7 @@ in verbatim ''
<!-- c Paragraph ended before @deffngeneral was complete. -->
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="104"><var>invalid</var></indexterm><defcategory>fsetinv</defcategory>
<deffunction><var>invalid</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm></definitionterm></deffnx>
+<deffnx><definitionterm> </definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -4644,7 +4644,7 @@ in verbatim ''
<!-- c Paragraph ended before @deffngeneral was complete. -->
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="156"><var>invalid</var></indexterm><defcategory>fsetinv</defcategory>
<deffunction><var>invalid</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm></definitionterm></deffnx>
+<deffnx><definitionterm> </definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -5788,7 +5788,7 @@ Various deff lines
<!-- c Paragraph ended before @deffngeneral was complete. -->
</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="208"><var>invalid</var></indexterm><defcategory>fsetinv</defcategory>
<deffunction><var>invalid</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm></definitionterm></deffnx>
+<deffnx><definitionterm> </definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>