[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), tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): for @item, there is a difference between the command name, and the name used to access data information, which is item_LINE. Check preferentially command data with the modified name and use the original name in messages and command name checks. Pass both the original command and the data access name to han [...] |
|
Date: |
Fri, 03 Mar 2023 18:13:42 -0500 |
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 f86d1004d2 * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line),
tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): for @item,
there is a difference between the command name, and the name used to access
data information, which is item_LINE. Check preferentially command data with
the modified name and use the original name in messages and command name
checks. Pass both the original command and the da [...]
f86d1004d2 is described below
commit f86d1004d216c663735b7d64fea37f4ba174795d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Mar 4 00:13:28 2023 +0100
* tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line),
tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command):
for @item, there is a difference between the command name, and the
name used to access data information, which is item_LINE. Check
preferentially command data with the modified name and use the
original name in messages and command name checks. Pass both
the original command and the data access name to handle_line_command.
Reorganize command processing in process_remaining_on_line, closing a
containing paragraph as soon as possible to be able to check the
parent command, and opening a paragraph as late as possible.
---
ChangeLog | 14 +++++
tp/Texinfo/ParserNonXS.pm | 24 +++----
tp/Texinfo/XS/parsetexi/context_stack.c | 2 +-
tp/Texinfo/XS/parsetexi/end_line.c | 2 +-
tp/Texinfo/XS/parsetexi/handle_commands.c | 23 +++----
tp/Texinfo/XS/parsetexi/handle_commands.h | 2 +-
tp/Texinfo/XS/parsetexi/parser.c | 73 +++++++++++++---------
tp/t/results/invalid_nestings/bad_style_nesting.pl | 9 ---
tp/t/results/invalid_nestings/bad_tab_nesting.pl | 9 ---
.../invalid_nestings/cartouche_in_style_command.pl | 9 ---
tp/t/results/invalid_nestings/center.pl | 45 ++++++-------
.../invalid_nestings/def_in_style_command.pl | 9 ---
.../invalid_nestings/enumerate_in_style_command.pl | 9 ---
.../invalid_nestings/example_in_style_command.pl | 9 ---
.../invalid_nestings/float_in_style_command.pl | 9 ---
.../flushright_in_style_command.pl | 9 ---
tp/t/results/invalid_nestings/in_errormsg.pl | 9 ---
tp/t/results/invalid_nestings/item_in_ref.pl | 9 ---
.../invalid_nestings/menu_in_style_command.pl | 9 ---
.../multitable_in_style_command.pl | 9 ---
tp/t/results/invalid_nestings/quotation_in_ref.pl | 9 ---
.../invalid_nestings/quotation_in_style_command.pl | 9 ---
.../style_not_closed_in_table_line.pl | 9 ---
tp/t/results/invalid_nestings/table_in_code.pl | 9 ---
tp/t/results/invalid_nestings/verbatim_in_ref.pl | 9 ---
.../misc_commands/definfoenclose_nestings.pl | 9 ---
tp/t/results/raw/verbatim_in_brace_command.pl | 9 ---
27 files changed, 101 insertions(+), 255 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e0b2c8afa8..f064a1cc63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2023-03-03 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
+ tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line),
+ tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command):
+ for @item, there is a difference between the command name, and the
+ name used to access data information, which is item_LINE. Check
+ preferentially command data with the modified name and use the
+ original name in messages and command name checks. Pass both
+ the original command and the data access name to handle_line_command.
+ Reorganize command processing in process_remaining_on_line, closing a
+ containing paragraph as soon as possible to be able to check the
+ parent command, and opening a paragraph as late as possible.
+
2023-03-03 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_handle_other_command)
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 3d9ba843b4..2776aa8a35 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -6138,6 +6138,13 @@ sub _process_remaining_on_line($$$$)
$command), $source_info);
}
+ if ($self->{'close_paragraph_commands'}->{$command}) {
+ $current = _end_paragraph($self, $current, $source_info);
+ }
+ if ($self->{'close_preformatted_commands'}->{$command}) {
+ $current = _end_preformatted($self, $current, $source_info);
+ }
+
_check_valid_nesting ($self, $current, $command, $source_info);
_check_valid_nesting_context ($self, $command, $source_info);
@@ -6149,18 +6156,6 @@ sub _process_remaining_on_line($$$$)
# goto funexit; # used in XS code
}
- unless ($self->{'no_paragraph_commands'}->{$command}) {
- my $paragraph = _begin_paragraph($self, $current, $source_info);
- $current = $paragraph if ($paragraph);
- }
-
- if ($self->{'close_paragraph_commands'}->{$command}) {
- $current = _end_paragraph($self, $current, $source_info);
- }
- if ($self->{'close_preformatted_commands'}->{$command}) {
- $current = _end_preformatted($self, $current, $source_info);
- }
-
if ($in_index_commands{$command}
and $current->{'contents'}
and $current->{'contents'}->[-1]
@@ -6181,6 +6176,11 @@ sub _process_remaining_on_line($$$$)
}
}
+ unless ($self->{'no_paragraph_commands'}->{$command}) {
+ my $paragraph = _begin_paragraph($self, $current, $source_info);
+ $current = $paragraph if ($paragraph);
+ }
+
if (defined($nobrace_commands{$command})
and ($command ne 'item' or !_item_line_parent($current))) {
($current, $line, $retval)
diff --git a/tp/Texinfo/XS/parsetexi/context_stack.c
b/tp/Texinfo/XS/parsetexi/context_stack.c
index cfeb14abb3..0a7d07a8a2 100644
--- a/tp/Texinfo/XS/parsetexi/context_stack.c
+++ b/tp/Texinfo/XS/parsetexi/context_stack.c
@@ -66,7 +66,7 @@ enum command_id
top_command (COMMAND_STACK *stack)
{
if (stack->top == 0)
- fatal ("command stack empty");
+ fatal ("command stack empty for top");
return stack->stack[stack->top - 1];
}
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 4f37604f8f..168b283469 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1550,7 +1550,7 @@ end_line_misc_line (ELEMENT *current)
cmd = current->parent->cmd;
if (!cmd)
- fatal ("command name unknown for @end");
+ fatal ("command name unknown for line command end");
if ((command_data(cmd).flags & CF_contain_basic_inline)
|| cmd == CM_item) /* CM_item_LINE on stack */
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 0eb767e457..c46aa0df39 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -290,9 +290,11 @@ handle_other_command (ELEMENT *current, char **line_inout,
/* STATUS is set to GET_A_NEW_LINE if we should get a new line after this,
to FINISHED_TOTALLY if we should stop processing completely. */
+/* data_cmd (used for the information on the command) and cmd (for the command
name)
+ is different only for @item */
ELEMENT *
handle_line_command (ELEMENT *current, char **line_inout,
- enum command_id cmd, int *status)
+ enum command_id cmd, enum command_id data_cmd, int
*status)
{
ELEMENT *misc = 0;
char *line = *line_inout;
@@ -301,7 +303,7 @@ handle_line_command (ELEMENT *current, char **line_inout,
*status = STILL_MORE_TO_PROCESS;
/* Root commands (like @node) and @bye */
- if (command_data(cmd).flags & CF_root || cmd == CM_bye)
+ if (command_data(data_cmd).flags & CF_root || cmd == CM_bye)
{
ELEMENT *closed_elt; /* Not used */
current = close_commands (current, 0, &closed_elt, cmd);
@@ -318,7 +320,7 @@ handle_line_command (ELEMENT *current, char **line_inout,
/* Look up information about this command
( text line lineraw specific special ). */
- arg_spec = command_data(cmd).data;
+ arg_spec = command_data(data_cmd).data;
/* All the cases using the raw line.
With LINE_lineraw, the line is taken as is as argument, and possibly
@@ -507,7 +509,7 @@ handle_line_command (ELEMENT *current, char **line_inout,
/* text, line, or a number.
(This includes handling of "@end", which is LINE_text.) */
- if (cmd == CM_item_LINE || cmd == CM_itemx)
+ if (cmd == CM_item || cmd == CM_itemx)
{
ELEMENT *parent;
if ((parent = item_line_parent (current)))
@@ -519,11 +521,11 @@ handle_line_command (ELEMENT *current, char **line_inout,
else
{
line_error ("@%s outside of table or list",
- cmd == CM_item_LINE ? "item" : "itemx");
+ command_name(cmd));
current = begin_preformatted (current);
}
misc = new_element (ET_NONE);
- misc->cmd = (cmd == CM_item_LINE) ? CM_item : CM_itemx;
+ misc->cmd = cmd;
misc->source_info = current_source_info;
add_to_element_contents (current, misc);
}
@@ -568,7 +570,7 @@ handle_line_command (ELEMENT *current, char **line_inout,
add_to_element_contents (current, misc);
- if (command_data(cmd).flags & CF_sectioning_heading)
+ if (command_data(data_cmd).flags & CF_sectioning_heading)
{
if (global_info.sections_level)
{
@@ -578,7 +580,7 @@ handle_line_command (ELEMENT *current, char **line_inout,
}
/* @def*x */
- if (command_data(cmd).flags & CF_def)
+ if (command_data(data_cmd).flags & CF_def)
{
enum command_id base_command;
int after_paragraph;
@@ -647,9 +649,8 @@ handle_line_command (ELEMENT *current, char **line_inout,
arg = new_element (ET_line_arg);
add_to_element_args (current, arg);
- if (command_data(cmd).flags & CF_contain_basic_inline)
- push_command (&nesting_context.basic_inline_stack_on_line,
- cmd == CM_item_LINE ? CM_item : cmd);
+ if (command_data(data_cmd).flags & CF_contain_basic_inline)
+ push_command (&nesting_context.basic_inline_stack_on_line, cmd);
/* LINE_specific commands arguments are handled in a specific way.
The only other line commands that have more than one argument is
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.h
b/tp/Texinfo/XS/parsetexi/handle_commands.h
index c281d1656f..f06e7889c2 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.h
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.h
@@ -7,7 +7,7 @@
ELEMENT *handle_other_command (ELEMENT *current, char **line_inout,
enum command_id cmd_id, int *status);
ELEMENT *handle_line_command (ELEMENT *current, char **line_inout,
- enum command_id cmd_id, int *status);
+ enum command_id cmd_id, enum command_id data_cmd, int *status);
ELEMENT *handle_block_command (ELEMENT *current, char **line_inout,
enum command_id cmd_id, int *new_line);
ELEMENT *handle_brace_command (ELEMENT *current, char **line_inout,
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index d77d97f210..df2a76d141 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1284,7 +1284,6 @@ check_valid_nesting_context (enum command_id cmd)
command_name(cmd),
command_name(invalid_context));
}
-
}
/* *LINEP is a pointer into the line being processed. It is advanced past any
@@ -1799,9 +1798,14 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
argument (an opening brace, or a character after spaces for
accent commands) was not found and there is already a new command.
- It would have been nice to allow for comments, but there is no
- container in the tree to put them when after command and before brace
- or argument for accent commands. */
+ NOTE the last element in the current command contents is an element that
+ is transiently in the tree, and is put in the info hash by
+ gather_spaces_after_cmd_before_arg. It could therefore be possible
+ to accept an @comment here and put it in this element. It would not
+ necessarily be a good idea, as it would mean having an element
+ in the info hash that holds something more complex than text and source
+ marks.
+ */
if (command_flags(current) & CF_brace && (cmd || command))
{
@@ -1984,10 +1988,13 @@ process_remaining_on_line (ELEMENT **current_inout,
char **line_inout)
else if (cmd)
{
int def_line_continuation;
+ /* command used for gathering data on the command. For @item command */
+ enum command_id data_cmd = cmd;
- line = line_after_command;
debug ("COMMAND %s", command_name(cmd));
+ line = line_after_command;
+
/* @value not expanded (expansion is done above), and @txiinternalvalue
*/
if ((cmd == CM_value) || (cmd == CM_txiinternalvalue))
{
@@ -2090,7 +2097,8 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
def_line_continuation = (current_context() == ct_def
&& cmd == CM_NEWLINE);
- /* warn on not appearing at line beginning */
+ /* warn on not appearing at line beginning. Need to do before closing
+ paragraph as it also closes the empty line */
if (!def_line_continuation
&& !abort_empty_line (¤t, NULL)
&& ((cmd == CM_node || cmd == CM_bye)
@@ -2106,8 +2114,23 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
command_name(cmd));
}
+ if (cmd)
+ {
+ if (command_data(cmd).flags & CF_close_paragraph)
+ current = end_paragraph (current, 0, 0);
+ if (close_preformatted_command (cmd))
+ current = end_preformatted (current, 0, 0);
+ }
+
+ /* cannot check parent before closing paragraph/preformatted */
+ if (cmd == CM_item && item_line_parent (current))
+ data_cmd = CM_item_LINE;
+
if (current->parent)
{
+ /* NOTE the command name appears in the functions, so it is
+ better to use cmd and not data_cmd. This means that all
+ the checks are done with @item as NOBRACE_skipspace */
check_valid_nesting (current, cmd);
check_valid_nesting_context (cmd);
}
@@ -2121,23 +2144,6 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
goto funexit;
}
- /* check command doesn't start a paragraph */
- if (!(command_data(cmd).flags & CF_no_paragraph))
- {
- ELEMENT *paragraph;
- paragraph = begin_paragraph (current);
- if (paragraph)
- current = paragraph;
- }
-
- if (cmd)
- {
- if (command_data(cmd).flags & CF_close_paragraph)
- current = end_paragraph (current, 0, 0);
- if (close_preformatted_command (cmd))
- current = end_preformatted (current, 0, 0);
- }
-
if ((cmd == CM_sortas
|| cmd == CM_seeentry
|| cmd == CM_seealso
@@ -2164,12 +2170,17 @@ process_remaining_on_line (ELEMENT **current_inout,
char **line_inout)
}
}
- if (cmd == CM_item && item_line_parent (current))
- cmd = CM_item_LINE;
- /* We could possibly have done this before check_valid_nesting. */
+ /* check command doesn't start a paragraph */
+ if (!(command_data(data_cmd).flags & CF_no_paragraph))
+ {
+ ELEMENT *paragraph;
+ paragraph = begin_paragraph (current);
+ if (paragraph)
+ current = paragraph;
+ }
/* No-brace command */
- if (command_data(cmd).flags & CF_nobrace)
+ if (command_data(data_cmd).flags & CF_nobrace)
{
int status;
current = handle_other_command (current, &line, cmd, &status);
@@ -2179,17 +2190,17 @@ process_remaining_on_line (ELEMENT **current_inout,
char **line_inout)
goto funexit;
}
}
- else if (command_data(cmd).flags & CF_line)
+ else if (command_data(data_cmd).flags & CF_line)
{
int status;
- current = handle_line_command (current, &line, cmd, &status);
+ current = handle_line_command (current, &line, cmd, data_cmd,
&status);
if (status == GET_A_NEW_LINE || status == FINISHED_TOTALLY)
{
retval = status;
goto funexit;
}
}
- else if (command_data(cmd).flags & CF_block)
+ else if (command_data(data_cmd).flags & CF_block)
{
int new_line = 0;
current = handle_block_command (current, &line, cmd, &new_line);
@@ -2201,7 +2212,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
goto funexit;
}
}
- else if (command_data(cmd).flags & (CF_brace | CF_accent))
+ else if (command_data(data_cmd).flags & (CF_brace | CF_accent))
{
current = handle_brace_command (current, &line, cmd);
}
diff --git a/tp/t/results/invalid_nestings/bad_style_nesting.pl
b/tp/t/results/invalid_nestings/bad_style_nesting.pl
index cc431a52fc..79acc38b73 100644
--- a/tp/t/results/invalid_nestings/bad_style_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_style_nesting.pl
@@ -114,15 +114,6 @@ in quotation
';
$result_errors{'bad_style_nesting'} = [
- {
- 'error_line' => 'warning: @quotation should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@quotation should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index ba46b57313..753c6e6879 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -204,15 +204,6 @@ bidule
';
$result_errors{'bad_tab_nesting'} = [
- {
- 'error_line' => 'warning: @tab should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => '',
- 'text' => '@tab should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
index b866516166..d41eb1a3d3 100644
--- a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
@@ -120,15 +120,6 @@ cartouche
';
$result_errors{'cartouche_in_style_command'} = [
- {
- 'error_line' => 'warning: @cartouche should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@cartouche should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/center.pl
b/tp/t/results/invalid_nestings/center.pl
index f685811bb7..d8cfc2d121 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -1518,22 +1518,22 @@ $result_errors{'center'} = [
'type' => 'warning'
},
{
- 'error_line' => 'warning: @center should not appear in @code
+ 'error_line' => '@code missing closing brace
',
'file_name' => '',
'line_nr' => 15,
'macro' => '',
- 'text' => '@center should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
- 'error_line' => '@code missing closing brace
+ 'error_line' => 'warning: @center should not appear in @center
',
'file_name' => '',
'line_nr' => 15,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @center',
+ 'type' => 'warning'
},
{
'error_line' => 'misplaced }
@@ -1553,15 +1553,6 @@ $result_errors{'center'} = [
'text' => '@center should only appear at the beginning of a line',
'type' => 'warning'
},
- {
- 'error_line' => 'warning: @center should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 19,
- 'macro' => '',
- 'text' => '@center should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
@@ -1653,22 +1644,22 @@ $result_errors{'center'} = [
'type' => 'warning'
},
{
- 'error_line' => 'warning: @center should not appear in @samp
+ 'error_line' => '@samp missing closing brace
',
'file_name' => '',
'line_nr' => 33,
'macro' => '',
- 'text' => '@center should not appear in @samp',
- 'type' => 'warning'
+ 'text' => '@samp missing closing brace',
+ 'type' => 'error'
},
{
- 'error_line' => '@samp missing closing brace
+ 'error_line' => 'warning: @center should not appear in @center
',
'file_name' => '',
'line_nr' => 33,
'macro' => '',
- 'text' => '@samp missing closing brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @center',
+ 'type' => 'warning'
},
{
'error_line' => 'misplaced }
@@ -1689,22 +1680,22 @@ $result_errors{'center'} = [
'type' => 'warning'
},
{
- 'error_line' => 'warning: @center should not appear in @samp
+ 'error_line' => '@samp missing closing brace
',
'file_name' => '',
'line_nr' => 35,
'macro' => '',
- 'text' => '@center should not appear in @samp',
- 'type' => 'warning'
+ 'text' => '@samp missing closing brace',
+ 'type' => 'error'
},
{
- 'error_line' => '@samp missing closing brace
+ 'error_line' => 'warning: @center should not appear in @center
',
'file_name' => '',
'line_nr' => 35,
'macro' => '',
- 'text' => '@samp missing closing brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @center',
+ 'type' => 'warning'
},
{
'error_line' => 'misplaced }
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index 90ee864d3f..6fbca72aa7 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -191,15 +191,6 @@ text
';
$result_errors{'def_in_style_command'} = [
- {
- 'error_line' => 'warning: @defun should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@defun should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
index 5c3c5a028a..a20e709b26 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -144,15 +144,6 @@ $result_texts{'enumerate_in_style_command'} = '
';
$result_errors{'enumerate_in_style_command'} = [
- {
- 'error_line' => 'warning: @enumerate should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@enumerate should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/example_in_style_command.pl
b/tp/t/results/invalid_nestings/example_in_style_command.pl
index 2e56c9d3d6..8eada95bc2 100644
--- a/tp/t/results/invalid_nestings/example_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/example_in_style_command.pl
@@ -114,15 +114,6 @@ example
';
$result_errors{'example_in_style_command'} = [
- {
- 'error_line' => 'warning: @example should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@example should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/float_in_style_command.pl
b/tp/t/results/invalid_nestings/float_in_style_command.pl
index f002cb094b..60f8c57373 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -175,15 +175,6 @@ in float
';
$result_errors{'float_in_style_command'} = [
- {
- 'error_line' => 'warning: @float should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@float should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/flushright_in_style_command.pl
b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
index 5de42723e7..8a939f237f 100644
--- a/tp/t/results/invalid_nestings/flushright_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
@@ -114,15 +114,6 @@ in flushright
';
$result_errors{'flushright_in_style_command'} = [
- {
- 'error_line' => 'warning: @flushright should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@flushright should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl
b/tp/t/results/invalid_nestings/in_errormsg.pl
index db26aba54f..aea77719a7 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -296,15 +296,6 @@ $result_errors{'in_errormsg'} = [
'text' => '@ref should not appear anywhere inside @errormsg',
'type' => 'warning'
},
- {
- 'error_line' => 'warning: @table should not appear anywhere inside
@errormsg
-',
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => '',
- 'text' => '@table should not appear anywhere inside @errormsg',
- 'type' => 'warning'
- },
{
'error_line' => '@errormsg missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 96f2609e48..bed16c5568 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -243,15 +243,6 @@ Topsecond item
';
$result_errors{'item_in_ref'} = [
- {
- 'error_line' => 'warning: @item should not appear anywhere inside @ref
-',
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => '',
- 'text' => '@item should not appear anywhere inside @ref',
- 'type' => 'warning'
- },
{
'error_line' => '@ref missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/menu_in_style_command.pl
b/tp/t/results/invalid_nestings/menu_in_style_command.pl
index 61c2c16d63..46a846ef41 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -240,15 +240,6 @@ $result_menus{'menu_in_style_command'} = {
};
$result_errors{'menu_in_style_command'} = [
- {
- 'error_line' => 'warning: @menu should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => '',
- 'text' => '@menu should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
index 0431251700..6f5eae0279 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -220,15 +220,6 @@ truc machin
';
$result_errors{'multitable_in_style_command'} = [
- {
- 'error_line' => 'warning: @multitable should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => '',
- 'text' => '@multitable should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index 2a8ad8a43c..5b6a52ddfb 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -188,15 +188,6 @@ $result_menus{'quotation_in_ref'} = {
};
$result_errors{'quotation_in_ref'} = [
- {
- 'error_line' => 'warning: @quotation should not appear anywhere inside
@xref
-',
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => '',
- 'text' => '@quotation should not appear anywhere inside @xref',
- 'type' => 'warning'
- },
{
'error_line' => '@xref missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/quotation_in_style_command.pl
b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
index e4bb98a1d6..160327304a 100644
--- a/tp/t/results/invalid_nestings/quotation_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
@@ -114,15 +114,6 @@ a quotation
';
$result_errors{'quotation_in_style_command'} = [
- {
- 'error_line' => 'warning: @quotation should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@quotation should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
index ff4c2b7189..3577798beb 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
@@ -216,15 +216,6 @@ line in code in item
';
$result_errors{'style_not_closed_in_table_line'} = [
- {
- 'error_line' => 'warning: @item should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => '',
- 'text' => '@item should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl
b/tp/t/results/invalid_nestings/table_in_code.pl
index 62fb212f18..6cd3f06473 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -192,15 +192,6 @@ text
';
$result_errors{'table_in_code'} = [
- {
- 'error_line' => 'warning: @table should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => '',
- 'text' => '@table should not appear in @code',
- 'type' => 'warning'
- },
{
'error_line' => '@code missing closing brace
',
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 01750c742a..7255d82aaf 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -187,15 +187,6 @@ $result_menus{'verbatim_in_ref'} = {
};
$result_errors{'verbatim_in_ref'} = [
- {
- 'error_line' => 'warning: @verbatim should not appear anywhere inside @xref
-',
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => '',
- 'text' => '@verbatim should not appear anywhere inside @xref',
- 'type' => 'warning'
- },
{
'error_line' => '@xref missing closing brace
',
diff --git a/tp/t/results/misc_commands/definfoenclose_nestings.pl
b/tp/t/results/misc_commands/definfoenclose_nestings.pl
index fed697f88e..f72943816a 100644
--- a/tp/t/results/misc_commands/definfoenclose_nestings.pl
+++ b/tp/t/results/misc_commands/definfoenclose_nestings.pl
@@ -264,15 +264,6 @@ $result_errors{'definfoenclose_nestings'} = [
'text' => '@phoo should not appear in @code',
'type' => 'warning'
},
- {
- 'error_line' => 'warning: @center should not appear in @phoo
-',
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => '',
- 'text' => '@center should not appear in @phoo',
- 'type' => 'warning'
- },
{
'error_line' => '@phoo missing closing brace
',
diff --git a/tp/t/results/raw/verbatim_in_brace_command.pl
b/tp/t/results/raw/verbatim_in_brace_command.pl
index f2db9418aa..835430daf4 100644
--- a/tp/t/results/raw/verbatim_in_brace_command.pl
+++ b/tp/t/results/raw/verbatim_in_brace_command.pl
@@ -116,15 +116,6 @@ in verbatim
';
$result_errors{'verbatim_in_brace_command'} = [
- {
- 'error_line' => 'warning: @verbatim should not appear in @samp
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => '@verbatim should not appear in @samp',
- 'type' => 'warning'
- },
{
'error_line' => '@samp missing closing brace
',
| [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), tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): for @item, there is a difference between the command name, and the name used to access data information, which is item_LINE. Check preferentially command data with the modified name and use the original name in messages and command name checks. Pass both the original command and the data access name to han [...],
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_handle_other_command) (_handle_line_command, _handle_block_command, _handle_brace_command) (_process_remaining_on_line): split handle_*_command out of _process_remaining_on_line as in the XS parser.
- Next by Date:
branch master updated: * tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line), tp/Texinfo/ParserNonXS.pm (_end_line_misc_line, _handle_line_command), tp/maintain/regenerate_commands_perl_info.pl: in end_line_misc_line, use item_LINE to get the command data information associated to @item. Keep item_LINE in the perl commands information as in the XS parser, modify _handle_line_command and _end_line_misc_line accordingly, also to be more in line with the XS parser code. For some selected flags that are of inter [...]
- Previous by thread:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_handle_other_command) (_handle_line_command, _handle_block_command, _handle_brace_command) (_process_remaining_on_line): split handle_*_command out of _process_remaining_on_line as in the XS parser.
- Next by thread:
branch master updated: * tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line), tp/Texinfo/ParserNonXS.pm (_end_line_misc_line, _handle_line_command), tp/maintain/regenerate_commands_perl_info.pl: in end_line_misc_line, use item_LINE to get the command data information associated to @item. Keep item_LINE in the perl commands information as in the XS parser, modify _handle_line_command and _end_line_misc_line accordingly, also to be more in line with the XS parser code. For some selected flags that are of inter [...]
- Index(es):