[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8368] remove _mark_and_warn_invalid
From: |
gavinsmith0123 |
Subject: |
[8368] remove _mark_and_warn_invalid |
Date: |
Sun, 21 Oct 2018 13:29:07 -0400 (EDT) |
Revision: 8368
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8368
Author: gavin
Date: 2018-10-21 13:29:06 -0400 (Sun, 21 Oct 2018)
Log Message:
-----------
remove _mark_and_warn_invalid
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/def/double_command.pl
trunk/tp/t/results/invalid_nestings/bad_style_nesting.pl
trunk/tp/t/results/invalid_nestings/bad_tab_nesting.pl
trunk/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
trunk/tp/t/results/invalid_nestings/center.pl
trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
trunk/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
trunk/tp/t/results/invalid_nestings/example_in_style_command.pl
trunk/tp/t/results/invalid_nestings/float_in_style_command.pl
trunk/tp/t/results/invalid_nestings/flushright_in_style_command.pl
trunk/tp/t/results/invalid_nestings/in_errormsg.pl
trunk/tp/t/results/invalid_nestings/item_in_ref.pl
trunk/tp/t/results/invalid_nestings/menu_in_style_command.pl
trunk/tp/t/results/invalid_nestings/multitable_in_style_command.pl
trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
trunk/tp/t/results/invalid_nestings/on_itemize_line.pl
trunk/tp/t/results/invalid_nestings/quotation_in_ref.pl
trunk/tp/t/results/invalid_nestings/quotation_in_style_command.pl
trunk/tp/t/results/invalid_nestings/section_in_math.pl
trunk/tp/t/results/invalid_nestings/section_on_def_line.pl
trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl
trunk/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
trunk/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
trunk/tp/t/results/invalid_nestings/tab_in_index.pl
trunk/tp/t/results/invalid_nestings/table_in_code.pl
trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl
trunk/tp/t/results/macro/unknown_macro_on_line_command.pl
trunk/tp/t/results/raw/verbatim_in_brace_command.pl
trunk/tp/t/results/value/set_in_item_missing_line.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/ChangeLog 2018-10-21 17:29:06 UTC (rev 8368)
@@ -1,5 +1,13 @@
2018-10-21 Gavin Smith <address@hidden>
+ * tp/Texinfo/Parser.pm (_parse_texi):
+ Issue an error message right after checking for an invalid
+ nesting. This produces little functional change but is intended
+ to make the code easier to understand.
+ (_mark_and_warn_invalid): Remove.
+
+2018-10-21 Gavin Smith <address@hidden>
+
* tp/Texinfo/Parser.pm (_mark_and_warn_invalid): Do not set
'invalid_nesting'.
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/Texinfo/Parser.pm 2018-10-21 17:29:06 UTC (rev 8368)
@@ -3417,19 +3417,6 @@
=~ /^[^\S\r\n]*/)))
}
-# $marked_as_invalid_command may be undef, if there is no
-# tree element because the @-command construct is incorrect, for example
-# wrong @tab.
-sub _mark_and_warn_invalid($$$$)
-{
- my ($self, $command, $invalid_parent, $line_nr) = @_;
-
- if (defined($invalid_parent)) {
- $self->line_warn(sprintf(__("address@hidden should not appear in
address@hidden"),
- $command, $invalid_parent), $line_nr);
- }
-}
-
# This combines several regular expressions used in '_parse_texi' to
# look at what is next on the remaining part of the line.
# NOTE - this sub has an XS override
@@ -4083,6 +4070,11 @@
}
}
+ if (defined($invalid_parent)) {
+ $self->line_warn(sprintf(__("address@hidden should not appear in
address@hidden"),
+ $command, $invalid_parent), $line_nr);
+ }
+
last if ($def_line_continuation);
unless ($self->{'no_paragraph_commands'}->{$command}) {
@@ -4115,7 +4107,6 @@
push @{$current->{'contents'}}, $misc;
$misc->{'extra'}->{'invalid_nesting'} = 1 if ($only_in_headings);
_register_global_command($self, $misc, $line_nr);
- _mark_and_warn_invalid($self, $command, $invalid_parent, $line_nr);
$current = _begin_preformatted($self, $current)
if ($close_preformatted_commands{$command});
} else {
@@ -4234,7 +4225,6 @@
last;
}
}
- _mark_and_warn_invalid($self, $command, $invalid_parent, $line_nr);
}
# line commands
} elsif (defined($self->{'line_commands'}->{$command})) {
@@ -4344,7 +4334,6 @@
} elsif ($command eq 'novalidate') {
$self->{'info'}->{'novalidate'} = 1;
}
- _mark_and_warn_invalid($self, $command, $invalid_parent, $line_nr);
_register_global_command($self, $misc, $line_nr);
# the end of line is ignored for special commands
if ($arg_spec ne 'special' or !$has_comment) {
@@ -4460,8 +4449,6 @@
unless ($def_commands{$command});
$line = _start_empty_line_after_command($line, $current, $misc);
}
- _mark_and_warn_invalid($self, $command, $invalid_parent, $line_nr);
-
_register_global_command($self, $misc, $line_nr)
if $misc;
if ($command eq 'dircategory') {
@@ -4473,7 +4460,6 @@
my $macro = _parse_macro_command_line($self, $command, $line,
$current, $line_nr);
push @{$current->{'contents'}}, $macro;
- _mark_and_warn_invalid($self, $command, $invalid_parent, $line_nr);
$current = $current->{'contents'}->[-1];
last;
} elsif ($block_commands{$command} eq 'conditional') {
@@ -4682,7 +4668,6 @@
unless ($def_commands{$command});
}
$block->{'line_nr'} = $line_nr;
- _mark_and_warn_invalid($self, $command, $invalid_parent, $line_nr);
_register_global_command($self, $block, $line_nr);
$line = _start_empty_line_after_command($line, $current, $block);
@@ -4695,7 +4680,6 @@
$current->{'contents'}->[-1]->{'line_nr'} = $line_nr
if ($keep_line_nr_brace_commands{$command}
and !$self->{'definfoenclose'}->{$command});
- _mark_and_warn_invalid($self, $command, $invalid_parent, $line_nr);
$current = $current->{'contents'}->[-1];
if ($command eq 'click') {
$current->{'extra'}->{'clickstyle'} = $self->{'clickstyle'};
Modified: trunk/tp/t/results/def/double_command.pl
===================================================================
--- trunk/tp/t/results/def/double_command.pl 2018-10-21 17:11:31 UTC (rev
8367)
+++ trunk/tp/t/results/def/double_command.pl 2018-10-21 17:29:06 UTC (rev
8368)
@@ -788,22 +788,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':1: must be after address@hidden' to use address@hidden'
+ 'error_line' => ':1: warning: @deffnx should not appear in @deffn
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'must be after address@hidden' to use address@hidden'',
- 'type' => 'error'
+ 'text' => '@deffnx should not appear in @deffn',
+ 'type' => 'warning'
},
{
- 'error_line' => ':1: warning: @deffnx should not appear in @deffn
+ 'error_line' => ':1: must be after address@hidden' to use address@hidden'
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => '@deffnx should not appear in @deffn',
- 'type' => 'warning'
+ 'text' => 'must be after address@hidden' to use address@hidden'',
+ 'type' => 'error'
},
{
'error_line' => ':1: warning: entry for index `fn\' outside of any node
Modified: trunk/tp/t/results/invalid_nestings/bad_style_nesting.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/bad_style_nesting.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/bad_style_nesting.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -130,22 +130,22 @@
$result_errors{'bad_style_nesting'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':2: warning: @quotation should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@quotation should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @quotation should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@quotation should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':3: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/bad_tab_nesting.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/bad_tab_nesting.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/bad_tab_nesting.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -220,22 +220,22 @@
$result_errors{'bad_tab_nesting'} = [
{
- 'error_line' => ':3: @code missing closing brace
+ 'error_line' => ':3: warning: @tab should not appear in @code
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@tab should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':3: warning: @tab should not appear in @code
+ 'error_line' => ':3: @code missing closing brace
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@tab should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':3: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -138,22 +138,22 @@
$result_errors{'cartouche_in_style_command'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':2: warning: @cartouche should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@cartouche should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @cartouche should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@cartouche should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':5: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/center.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/center.pl 2018-10-21 17:11:31 UTC
(rev 8367)
+++ trunk/tp/t/results/invalid_nestings/center.pl 2018-10-21 17:29:06 UTC
(rev 8368)
@@ -1704,22 +1704,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':15: @code missing closing brace
+ 'error_line' => ':15: warning: @center should not appear in @code
',
'file_name' => '',
'line_nr' => 15,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':15: warning: @center should not appear in @code
+ 'error_line' => ':15: @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' => ':17: misplaced }
@@ -1740,22 +1740,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':19: @code missing closing brace
+ 'error_line' => ':19: warning: @center should not appear in @code
',
'file_name' => '',
'line_nr' => 19,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':19: warning: @center should not appear in @code
+ 'error_line' => ':19: @code missing closing brace
',
'file_name' => '',
'line_nr' => 19,
'macro' => '',
- 'text' => '@center should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':19: misplaced }
@@ -1767,22 +1767,22 @@
'type' => 'error'
},
{
- 'error_line' => ':22: @item outside of table or list
+ 'error_line' => ':22: warning: @item should not appear in @center
',
'file_name' => '',
'line_nr' => 22,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @center',
+ 'type' => 'warning'
},
{
- 'error_line' => ':22: warning: @item should not appear in @center
+ 'error_line' => ':22: @item outside of table or list
',
'file_name' => '',
'line_nr' => 22,
'macro' => '',
- 'text' => '@item should not appear in @center',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
},
{
'error_line' => ':21: warning: @table has text but no @item
@@ -1794,22 +1794,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':27: @item outside of table or list
+ 'error_line' => ':27: warning: @item should not appear in @center
',
'file_name' => '',
'line_nr' => 27,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @center',
+ 'type' => 'warning'
},
{
- 'error_line' => ':27: warning: @item should not appear in @center
+ 'error_line' => ':27: @item outside of table or list
',
'file_name' => '',
'line_nr' => 27,
'macro' => '',
- 'text' => '@item should not appear in @center',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
},
{
'error_line' => ':31: warning: @center should not appear in @center
@@ -1839,22 +1839,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':33: @samp missing closing brace
+ 'error_line' => ':33: warning: @center should not appear in @samp
',
'file_name' => '',
'line_nr' => 33,
'macro' => '',
- 'text' => '@samp missing closing brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @samp',
+ 'type' => 'warning'
},
{
- 'error_line' => ':33: warning: @center should not appear in @samp
+ 'error_line' => ':33: @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' => ':33: misplaced }
@@ -1875,22 +1875,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':35: @samp missing closing brace
+ 'error_line' => ':35: warning: @center should not appear in @samp
',
'file_name' => '',
'line_nr' => 35,
'macro' => '',
- 'text' => '@samp missing closing brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @samp',
+ 'type' => 'warning'
},
{
- 'error_line' => ':35: warning: @center should not appear in @samp
+ 'error_line' => ':35: @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' => ':37: misplaced }
@@ -1902,6 +1902,15 @@
'type' => 'error'
},
{
+ 'error_line' => ':41: warning: @item should not appear in @center
+',
+ 'file_name' => '',
+ 'line_nr' => 41,
+ 'macro' => '',
+ 'text' => '@item should not appear in @center',
+ 'type' => 'warning'
+ },
+ {
'error_line' => ':41: @item outside of table or list
',
'file_name' => '',
@@ -1911,12 +1920,12 @@
'type' => 'error'
},
{
- 'error_line' => ':41: warning: @item should not appear in @center
+ 'error_line' => ':41: warning: @tab should not appear in @center
',
'file_name' => '',
'line_nr' => 41,
'macro' => '',
- 'text' => '@item should not appear in @center',
+ 'text' => '@tab should not appear in @center',
'type' => 'warning'
},
{
@@ -1929,12 +1938,12 @@
'type' => 'error'
},
{
- 'error_line' => ':41: warning: @tab should not appear in @center
+ 'error_line' => ':42: warning: @item should not appear in @center
',
'file_name' => '',
- 'line_nr' => 41,
+ 'line_nr' => 42,
'macro' => '',
- 'text' => '@tab should not appear in @center',
+ 'text' => '@item should not appear in @center',
'type' => 'warning'
},
{
@@ -1947,15 +1956,6 @@
'type' => 'error'
},
{
- 'error_line' => ':42: warning: @item should not appear in @center
-',
- 'file_name' => '',
- 'line_nr' => 42,
- 'macro' => '',
- 'text' => '@item should not appear in @center',
- 'type' => 'warning'
- },
- {
'error_line' => ':45: warning: @table should only appear at the beginning
of a line
',
'file_name' => '',
Modified: trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -231,22 +231,22 @@
$result_errors{'def_in_style_command'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':2: warning: @defun should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@defun should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @defun should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@defun should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':2: warning: entry for index `fn\' outside of any node
Modified: trunk/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -155,22 +155,22 @@
$result_errors{'enumerate_in_style_command'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':2: warning: @enumerate should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@enumerate should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @enumerate should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@enumerate should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':5: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/example_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/example_in_style_command.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/example_in_style_command.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -130,22 +130,22 @@
$result_errors{'example_in_style_command'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':2: warning: @example should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@example should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @example should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@example should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':5: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/float_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/float_in_style_command.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/float_in_style_command.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -209,22 +209,22 @@
$result_errors{'float_in_style_command'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':2: warning: @float should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@float should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @float should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@float should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':6: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/flushright_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/flushright_in_style_command.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/flushright_in_style_command.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -130,22 +130,22 @@
$result_errors{'flushright_in_style_command'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':2: warning: @flushright should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@flushright should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @flushright should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@flushright should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':5: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/in_errormsg.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/in_errormsg.pl 2018-10-21 17:11:31 UTC
(rev 8367)
+++ trunk/tp/t/results/invalid_nestings/in_errormsg.pl 2018-10-21 17:29:06 UTC
(rev 8368)
@@ -349,22 +349,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':5: @errormsg missing closing brace
+ 'error_line' => ':6: warning: @table should not appear in @errormsg
',
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => '',
- 'text' => '@errormsg missing closing brace',
- 'type' => 'error'
+ 'text' => '@table should not appear in @errormsg',
+ 'type' => 'warning'
},
{
- 'error_line' => ':6: warning: @table should not appear in @errormsg
+ 'error_line' => ':5: @errormsg missing closing brace
',
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => '',
- 'text' => '@table should not appear in @errormsg',
- 'type' => 'warning'
+ 'text' => '@errormsg missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':9: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/item_in_ref.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/item_in_ref.pl 2018-10-21 17:11:31 UTC
(rev 8367)
+++ trunk/tp/t/results/invalid_nestings/item_in_ref.pl 2018-10-21 17:29:06 UTC
(rev 8368)
@@ -274,22 +274,22 @@
$result_errors{'item_in_ref'} = [
{
- 'error_line' => ':5: @ref missing closing brace
+ 'error_line' => ':6: warning: @item should not appear in @ref
',
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => '',
- 'text' => '@ref missing closing brace',
- 'type' => 'error'
+ 'text' => '@item should not appear in @ref',
+ 'type' => 'warning'
},
{
- 'error_line' => ':6: warning: @item should not appear in @ref
+ 'error_line' => ':5: @ref missing closing brace
',
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => '',
- 'text' => '@item should not appear in @ref',
- 'type' => 'warning'
+ 'text' => '@ref missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':6: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/menu_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/menu_in_style_command.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/menu_in_style_command.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -319,22 +319,22 @@
$result_errors{'menu_in_style_command'} = [
{
- 'error_line' => ':3: @code missing closing brace
+ 'error_line' => ':4: warning: @menu should not appear in @code
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@menu should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':4: warning: @menu should not appear in @code
+ 'error_line' => ':3: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => '@menu should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':7: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/multitable_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/multitable_in_style_command.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/multitable_in_style_command.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -241,22 +241,22 @@
$result_errors{'multitable_in_style_command'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':3: warning: @multitable should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@multitable should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':3: warning: @multitable should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@multitable should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':6: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -185,22 +185,22 @@
$result_errors{'multitable_item_in_index'} = [
{
- 'error_line' => ':2: @item outside of table or list
+ 'error_line' => ':2: warning: @item should not appear in @vindex
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @vindex',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @item should not appear in @vindex
+ 'error_line' => ':2: @item outside of table or list
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => '@item should not appear in @vindex',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
},
{
'error_line' => ':2: warning: entry for index `vr\' outside of any node
Modified: trunk/tp/t/results/invalid_nestings/on_itemize_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_itemize_line.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/on_itemize_line.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -389,22 +389,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':5: @item outside of table or list
+ 'error_line' => ':5: warning: @item should not appear in @itemize
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @itemize',
+ 'type' => 'warning'
},
{
- 'error_line' => ':5: warning: @item should not appear in @itemize
+ 'error_line' => ':5: @item outside of table or list
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => '@item should not appear in @itemize',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
}
];
Modified: trunk/tp/t/results/invalid_nestings/quotation_in_ref.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/quotation_in_ref.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/quotation_in_ref.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -244,22 +244,22 @@
$result_errors{'quotation_in_ref'} = [
{
- 'error_line' => ':3: @xref missing closing brace
+ 'error_line' => ':4: warning: @quotation should not appear in @xref
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => '',
- 'text' => '@xref missing closing brace',
- 'type' => 'error'
+ 'text' => '@quotation should not appear in @xref',
+ 'type' => 'warning'
},
{
- 'error_line' => ':4: warning: @quotation should not appear in @xref
+ 'error_line' => ':3: @xref missing closing brace
',
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => '@quotation should not appear in @xref',
- 'type' => 'warning'
+ 'text' => '@xref missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':7: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/quotation_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/quotation_in_style_command.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/quotation_in_style_command.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -130,22 +130,22 @@
$result_errors{'quotation_in_style_command'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':2: warning: @quotation should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@quotation should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @quotation should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@quotation should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':5: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/section_in_math.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/section_in_math.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/section_in_math.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -281,22 +281,22 @@
'type' => 'error'
},
{
- 'error_line' => ':6: @section seen before @math closing brace
+ 'error_line' => ':8: warning: @section should not appear in @math
',
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 8,
'macro' => '',
- 'text' => '@section seen before @math closing brace',
- 'type' => 'error'
+ 'text' => '@section should not appear in @math',
+ 'type' => 'warning'
},
{
- 'error_line' => ':8: warning: @section should not appear in @math
+ 'error_line' => ':6: @section seen before @math closing brace
',
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => '',
- 'text' => '@section should not appear in @math',
- 'type' => 'warning'
+ 'text' => '@section seen before @math closing brace',
+ 'type' => 'error'
}
];
Modified: trunk/tp/t/results/invalid_nestings/section_on_def_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/section_on_def_line.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/section_on_def_line.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -158,22 +158,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':1: @section seen before @end deffn
+ 'error_line' => ':1: warning: @section should not appear in @deffn
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => '@section seen before @end deffn',
- 'type' => 'error'
+ 'text' => '@section should not appear in @deffn',
+ 'type' => 'warning'
},
{
- 'error_line' => ':1: warning: @section should not appear in @deffn
+ 'error_line' => ':1: @section seen before @end deffn
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => '@section should not appear in @deffn',
- 'type' => 'warning'
+ 'text' => '@section seen before @end deffn',
+ 'type' => 'error'
},
{
'error_line' => ':5: unmatched address@hidden deffn\'
Modified: trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -287,22 +287,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':2: @section seen before @end deffn
+ 'error_line' => ':2: warning: @section should not appear in @deffnx
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => '@section seen before @end deffn',
- 'type' => 'error'
+ 'text' => '@section should not appear in @deffnx',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @section should not appear in @deffnx
+ 'error_line' => ':2: @section seen before @end deffn
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => '@section should not appear in @deffnx',
- 'type' => 'warning'
+ 'text' => '@section seen before @end deffn',
+ 'type' => 'error'
},
{
'error_line' => ':6: unmatched address@hidden deffn\'
Modified: trunk/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -237,22 +237,22 @@
$result_errors{'style_not_closed_in_table_line'} = [
{
- 'error_line' => ':4: @code missing closing brace
+ 'error_line' => ':4: warning: @item should not appear in @code
',
'file_name' => '',
'line_nr' => 4,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@item should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':4: warning: @item should not appear in @code
+ 'error_line' => ':4: @code missing closing brace
',
'file_name' => '',
'line_nr' => 4,
'macro' => '',
- 'text' => '@item should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
}
];
Modified:
trunk/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
===================================================================
---
trunk/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
2018-10-21 17:11:31 UTC (rev 8367)
+++
trunk/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
2018-10-21 17:29:06 UTC (rev 8368)
@@ -560,6 +560,15 @@
$result_errors{'style_not_closed_no_newline_root_commands'} = [
{
+ 'error_line' => ':9: warning: @node should not appear in @code
+',
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => '',
+ 'text' => '@node should not appear in @code',
+ 'type' => 'warning'
+ },
+ {
'error_line' => ':8: @node seen before @code closing brace
',
'file_name' => '',
@@ -569,12 +578,12 @@
'type' => 'error'
},
{
- 'error_line' => ':9: warning: @node should not appear in @code
+ 'error_line' => ':13: warning: @bye should not appear in @code
',
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 13,
'macro' => '',
- 'text' => '@node should not appear in @code',
+ 'text' => '@bye should not appear in @code',
'type' => 'warning'
},
{
@@ -585,15 +594,6 @@
'macro' => '',
'text' => '@bye seen before @code closing brace',
'type' => 'error'
- },
- {
- 'error_line' => ':13: warning: @bye should not appear in @code
-',
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => '',
- 'text' => '@bye should not appear in @code',
- 'type' => 'warning'
}
];
Modified: trunk/tp/t/results/invalid_nestings/tab_in_index.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/tab_in_index.pl 2018-10-21 17:11:31 UTC
(rev 8367)
+++ trunk/tp/t/results/invalid_nestings/tab_in_index.pl 2018-10-21 17:29:06 UTC
(rev 8368)
@@ -256,22 +256,22 @@
$result_errors{'tab_in_index'} = [
{
- 'error_line' => ':3: ignoring @tab outside of multitable
+ 'error_line' => ':3: warning: @tab should not appear in @vindex
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'ignoring @tab outside of multitable',
- 'type' => 'error'
+ 'text' => '@tab should not appear in @vindex',
+ 'type' => 'warning'
},
{
- 'error_line' => ':3: warning: @tab should not appear in @vindex
+ 'error_line' => ':3: ignoring @tab outside of multitable
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@tab should not appear in @vindex',
- 'type' => 'warning'
+ 'text' => 'ignoring @tab outside of multitable',
+ 'type' => 'error'
},
{
'error_line' => ':3: warning: entry for index `vr\' outside of any node
Modified: trunk/tp/t/results/invalid_nestings/table_in_code.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/table_in_code.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/table_in_code.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -214,22 +214,22 @@
$result_errors{'table_in_code'} = [
{
- 'error_line' => ':1: @code missing closing brace
+ 'error_line' => ':3: warning: @table should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => '@code missing closing brace',
- 'type' => 'error'
+ 'text' => '@table should not appear in @code',
+ 'type' => 'warning'
},
{
- 'error_line' => ':3: warning: @table should not appear in @code
+ 'error_line' => ':1: @code missing closing brace
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@table should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':7: misplaced }
Modified: trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/invalid_nestings/verbatim_in_ref.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -213,22 +213,22 @@
$result_errors{'verbatim_in_ref'} = [
{
- 'error_line' => ':3: @xref missing closing brace
+ 'error_line' => ':4: warning: @verbatim should not appear in @xref
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => '',
- 'text' => '@xref missing closing brace',
- 'type' => 'error'
+ 'text' => '@verbatim should not appear in @xref',
+ 'type' => 'warning'
},
{
- 'error_line' => ':4: warning: @verbatim should not appear in @xref
+ 'error_line' => ':3: @xref missing closing brace
',
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => '@verbatim should not appear in @xref',
- 'type' => 'warning'
+ 'text' => '@xref missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':8: misplaced }
Modified: trunk/tp/t/results/macro/unknown_macro_on_line_command.pl
===================================================================
--- trunk/tp/t/results/macro/unknown_macro_on_line_command.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/macro/unknown_macro_on_line_command.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -46,6 +46,15 @@
$result_errors{'unknown_macro_on_line_command'} = [
{
+ 'error_line' => ':1: warning: @begin should not appear in @setfilename
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@begin should not appear in @setfilename',
+ 'type' => 'warning'
+ },
+ {
'error_line' => ':1: unknown command `begin\'
',
'file_name' => '',
Modified: trunk/tp/t/results/raw/verbatim_in_brace_command.pl
===================================================================
--- trunk/tp/t/results/raw/verbatim_in_brace_command.pl 2018-10-21 17:11:31 UTC
(rev 8367)
+++ trunk/tp/t/results/raw/verbatim_in_brace_command.pl 2018-10-21 17:29:06 UTC
(rev 8368)
@@ -102,22 +102,22 @@
$result_errors{'verbatim_in_brace_command'} = [
{
- 'error_line' => ':1: @samp missing closing brace
+ 'error_line' => ':2: warning: @verbatim should not appear in @samp
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@samp missing closing brace',
- 'type' => 'error'
+ 'text' => '@verbatim should not appear in @samp',
+ 'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @verbatim should not appear in @samp
+ 'error_line' => ':1: @samp missing closing brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@verbatim should not appear in @samp',
- 'type' => 'warning'
+ 'text' => '@samp missing closing brace',
+ 'type' => 'error'
},
{
'error_line' => ':5: misplaced }
Modified: trunk/tp/t/results/value/set_in_item_missing_line.pl
===================================================================
--- trunk/tp/t/results/value/set_in_item_missing_line.pl 2018-10-21
17:11:31 UTC (rev 8367)
+++ trunk/tp/t/results/value/set_in_item_missing_line.pl 2018-10-21
17:29:06 UTC (rev 8368)
@@ -382,22 +382,22 @@
$result_errors{'set_in_item_missing_line'} = [
{
- 'error_line' => ':8: @item outside of table or list
+ 'error_line' => ':8: warning: @item should not appear in @item
',
'file_name' => '',
'line_nr' => 8,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @item',
+ 'type' => 'warning'
},
{
- 'error_line' => ':8: warning: @item should not appear in @item
+ 'error_line' => ':8: @item outside of table or list
',
'file_name' => '',
'line_nr' => 8,
'macro' => '',
- 'text' => '@item should not appear in @item',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
}
];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8368] remove _mark_and_warn_invalid,
gavinsmith0123 <=