[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_o
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not set source_info for linemacro call container. |
|
Date: |
Mon, 27 Mar 2023 16:44:29 -0400 |
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 4b98ea501c * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not set
source_info for linemacro call container.
4b98ea501c is described below
commit 4b98ea501c818ef4cecd541287d4120106b4a917
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Mar 27 22:44:23 2023 +0200
* tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not
set source_info for linemacro call container.
---
ChangeLog | 6 ++++++
tp/Texinfo/ParserNonXS.pm | 2 --
tp/Texinfo/XS/parsetexi/parser.c | 2 --
tp/t/results/linemacro/api_doc_with_linemacro.pl | 25 ----------------------
tp/t/results/linemacro/braces_after_text.pl | 5 -----
tp/t/results/linemacro/empty_last_argument.pl | 15 -------------
.../results/linemacro/last_argument_with_braces.pl | 15 -------------
.../linemacro/newline_and_continuation_in_brace.pl | 5 -----
tp/t/results/linemacro/no_arguments.pl | 15 -------------
tp/t/results/linemacro/protected_spaces_on_line.pl | 15 -------------
.../linemacro/spaces_after_command_in_call.pl | 5 -----
tp/t/results/linemacro/spaces_in_args.pl | 5 -----
tp/t/results/linemacro/spaces_in_call.pl | 5 -----
tp/t/results/linemacro/text_arguments.pl | 5 -----
14 files changed, 6 insertions(+), 119 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1435323e93..899f1ee047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-27 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
+ tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not
+ set source_info for linemacro call container.
+
2023-03-27 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_parse_def): use code more similar to XS
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 0bac874d4e..498a81d7cd 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -6828,8 +6828,6 @@ sub _process_remaining_on_line($$$$)
# linemacro defined command call
push @{$current->{'contents'}}, $arguments_container;
$arguments_container->{'parent'} = $current;
- # FIXME needed? Correct?
- $arguments_container->{'source_info'} = $source_info;
$self->_push_context('ct_linecommand', $command);
$current = $arguments_container;
$current->{'args'} = [];
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 4199ed890d..7200a75686 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -2098,8 +2098,6 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
ELEMENT *line_arg = new_element (ET_line_arg);
add_to_element_contents (current, macro_call_element);
- /* FIXME needed? Correct? */
- macro_call_element->source_info = current_source_info;
push_context (ct_linecommand, cmd);
current = macro_call_element;
add_to_element_args (current, line_arg);
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index 8f95537cd7..d04278660b 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -527,11 +527,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 19,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -716,11 +711,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 22,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -930,11 +920,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 26,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -1119,11 +1104,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 29,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -1293,11 +1273,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 32,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/braces_after_text.pl
b/tp/t/results/linemacro/braces_after_text.pl
index abc3f71c17..0c942e1f0e 100644
--- a/tp/t/results/linemacro/braces_after_text.pl
+++ b/tp/t/results/linemacro/braces_after_text.pl
@@ -153,11 +153,6 @@ $result_trees{'braces_after_text'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/empty_last_argument.pl
b/tp/t/results/linemacro/empty_last_argument.pl
index 3ce39c3ab8..7a21d18cd5 100644
--- a/tp/t/results/linemacro/empty_last_argument.pl
+++ b/tp/t/results/linemacro/empty_last_argument.pl
@@ -173,11 +173,6 @@ $result_trees{'empty_last_argument'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -320,11 +315,6 @@ $result_trees{'empty_last_argument'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 10,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -492,11 +482,6 @@ $result_trees{'empty_last_argument'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl
b/tp/t/results/linemacro/last_argument_with_braces.pl
index 0e8295d238..ad7c73cf4b 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -187,11 +187,6 @@ $result_trees{'last_argument_with_braces'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -491,11 +486,6 @@ $result_trees{'last_argument_with_braces'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -788,11 +778,6 @@ $result_trees{'last_argument_with_braces'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
index 1f57b62963..ad3369b382 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -218,11 +218,6 @@ $result_trees{'newline_and_continuation_in_brace'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/no_arguments.pl
b/tp/t/results/linemacro/no_arguments.pl
index 8de6a6e00e..56add141b5 100644
--- a/tp/t/results/linemacro/no_arguments.pl
+++ b/tp/t/results/linemacro/no_arguments.pl
@@ -90,11 +90,6 @@ $result_trees{'no_arguments'} = {
'extra' => {
'name' => 'noarg'
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -165,11 +160,6 @@ $result_trees{'no_arguments'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -235,11 +225,6 @@ $result_trees{'no_arguments'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index 1b623cc22c..0f24a6f922 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -167,11 +167,6 @@ $result_trees{'protected_spaces_on_line'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -474,11 +469,6 @@ $result_trees{'protected_spaces_on_line'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 10,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
@@ -763,11 +753,6 @@ $result_trees{'protected_spaces_on_line'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/spaces_after_command_in_call.pl
b/tp/t/results/linemacro/spaces_after_command_in_call.pl
index dfa239004f..b7852adf93 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -167,11 +167,6 @@ $result_trees{'spaces_after_command_in_call'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/spaces_in_args.pl
b/tp/t/results/linemacro/spaces_in_args.pl
index 85ce8a04e2..916f16df68 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -178,11 +178,6 @@ $result_trees{'spaces_in_args'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/spaces_in_call.pl
b/tp/t/results/linemacro/spaces_in_call.pl
index 21cd032c0b..68e8381368 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -138,11 +138,6 @@ $result_trees{'spaces_in_call'} = {
'extra' => {
'name' => 'mylinecommand'
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
diff --git a/tp/t/results/linemacro/text_arguments.pl
b/tp/t/results/linemacro/text_arguments.pl
index ebecd5b225..680c9f1cf8 100644
--- a/tp/t/results/linemacro/text_arguments.pl
+++ b/tp/t/results/linemacro/text_arguments.pl
@@ -132,11 +132,6 @@ $result_trees{'text_arguments'} = {
'text' => ' '
}
},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
'type' => 'linemacro_call'
},
'sourcemark_type' => 'linemacro_expansion',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not set source_info for linemacro call container.,
Patrice Dumas <=