[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line), tp/Texin
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line), tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line): use the same error message for superfluous argument to @end command after the command argument as for other cases of superfluous argument triggered by unexpected @-commands on @end ond other similar commands line. |
|
Date: |
Tue, 20 Sep 2022 16:30:19 -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 351b35254d * tp/Texinfo/ParserNonXS.pm (_end_line),
tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line): use the same error
message for superfluous argument to @end command after the command argument as
for other cases of superfluous argument triggered by unexpected @-commands on
@end ond other similar commands line.
351b35254d is described below
commit 351b35254dd310e48650803edbdeb2e73db45b12
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Sep 20 22:30:04 2022 +0200
* tp/Texinfo/ParserNonXS.pm (_end_line),
tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line): use
the same error message for superfluous argument to @end command
after the command argument as for other cases of superfluous
argument triggered by unexpected @-commands on @end ond other
similar commands line.
---
ChangeLog | 9 ++++
tp/Texinfo/ParserNonXS.pm | 20 +++-----
tp/Texinfo/XS/parsetexi/end_line.c | 22 +++------
.../conditionals/superfluous_argument_to_end.pl | 4 +-
tp/t/results/coverage/command_in_end.pl | 12 ++---
.../command_in_end_expanded_raw_command_after.pl | 4 +-
...mand_in_end_expanded_raw_command_empty_after.pl | 4 +-
..._in_end_expanded_raw_one_char_before_command.pl | 4 +-
..._in_end_expanded_raw_two_char_before_command.pl | 4 +-
.../command_in_end_ignored_raw_command_after.pl | 4 +-
tp/t/results/coverage/symbol_after_block.pl | 56 +++++++++++-----------
tp/t/results/macro/macro_expansion.pl | 24 +++++-----
tp/t/results/macro/text_before_after.pl | 4 +-
.../preformatted/text_on_display_command_line.pl | 8 ++--
.../preformatted/text_on_example_command_line.pl | 8 ++--
tp/t/results/raw/raw_commands_and_end_of_lines.pl | 24 +++++-----
16 files changed, 102 insertions(+), 109 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7cebc2df26..fb35d0496d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-09-20 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_end_line),
+ tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line): use
+ the same error message for superfluous argument to @end command
+ after the command argument as for other cases of superfluous
+ argument triggered by unexpected @-commands on @end ond other
+ similar commands line.
+
2022-09-20 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_end_line),
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index ae96468fa7..f046b40630 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3258,19 +3258,13 @@ sub _end_line($$$)
}
}
}
- # non-ASCII spaces are also superfluous arguments
- if (($superfluous_arg or $remaining_on_line =~ /\S/)
- and defined($end_command)) {
- my $texi_line
- = Texinfo::Convert::Texinfo::convert_to_texinfo(
-
$current->{'args'}->[0]);
- # FIXME an @-command will truncate the identifier, while it
- # could have been expanded above in $text.
- $texi_line =~ s/^\s*([[:alnum:]][[:alnum:]-]*)//;
- $self->_command_error($current, $source_info,
- __("superfluous argument to \@%s %s: %s"),
- $command, $end_command, $texi_line);
- $superfluous_arg = 0; # Don't issue another error message below.
+ # non-ASCII spaces are also superfluous arguments.
+ # If there is superfluous text after @end argument, set
+ # $superfluous_arg such that the error message triggered by an
+ # unexpected @-command on the @end line is issued below. Note
+ # that $superfluous_arg may also be true if it was set above.
+ if ($end_command and $remaining_on_line =~ /\S/) {
+ $superfluous_arg = 1;
}
# if $superfluous_arg is set there is a similar and somewhat
# better error message below
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 9459c9d6f9..e0d17ca824 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1383,23 +1383,13 @@ end_line_misc_line (ELEMENT *current)
free (end_command); end_command = 0;
}
}
+ /* If there is superfluous text after @end argument, set
+ superfluous_arg such that the error message triggered
by an
+ unexpected @-command on the @end line is issued
below. Note
+ that superfluous_arg may also be true if it was set
above. */
if (end_command
- && (superfluous_arg
- || line[strspn (line, whitespace_chars)] != '\0'))
- {
- char *line, *line2;
- line = convert_to_texinfo (current->args.list[0]);
-
- line2 = line;
- line2 += strspn (line2, whitespace_chars);
- free (read_command_name (&line2));
- command_error (current,
- "superfluous argument to @end %s: "
- "%s", end_command, line2);
- superfluous_arg = 0; /* Don't issue another error
- message below. */
- free (line);
- }
+ && line[strspn (line, whitespace_chars)] != '\0')
+ superfluous_arg = 1;
}
}
/* if superfluous_arg is set there is a similar and somewhat
diff --git a/tp/t/results/conditionals/superfluous_argument_to_end.pl
b/tp/t/results/conditionals/superfluous_argument_to_end.pl
index 7b55ccc575..1a48bbafb2 100644
--- a/tp/t/results/conditionals/superfluous_argument_to_end.pl
+++ b/tp/t/results/conditionals/superfluous_argument_to_end.pl
@@ -40,12 +40,12 @@ $result_texts{'superfluous_argument_to_end'} = 'not html
$result_errors{'superfluous_argument_to_end'} = [
{
- 'error_line' => 'superfluous argument to @end ifnothtml: superfluous
+ 'error_line' => 'bad argument to @end: ifnothtml superfluous
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end ifnothtml: superfluous',
+ 'text' => 'bad argument to @end: ifnothtml superfluous',
'type' => 'error'
}
];
diff --git a/tp/t/results/coverage/command_in_end.pl
b/tp/t/results/coverage/command_in_end.pl
index cb3a47bdc0..9cfdc676a9 100644
--- a/tp/t/results/coverage/command_in_end.pl
+++ b/tp/t/results/coverage/command_in_end.pl
@@ -859,30 +859,30 @@ $result_errors{'command_in_end'} = [
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end quotation: @asis{}uotation
+ 'error_line' => 'bad argument to @end: q@asis{}uotation
',
'file_name' => '',
'line_nr' => 19,
'macro' => '',
- 'text' => 'superfluous argument to @end quotation: @asis{}uotation',
+ 'text' => 'bad argument to @end: q@asis{}uotation',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end quotation: @asis{}otation
+ 'error_line' => 'bad argument to @end: qu@asis{}otation
',
'file_name' => '',
'line_nr' => 23,
'macro' => '',
- 'text' => 'superfluous argument to @end quotation: @asis{}otation',
+ 'text' => 'bad argument to @end: qu@asis{}otation',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end quotation: @asis{}ation
+ 'error_line' => 'bad argument to @end: quot@asis{}ation
',
'file_name' => '',
'line_nr' => 27,
'macro' => '',
- 'text' => 'superfluous argument to @end quotation: @asis{}ation',
+ 'text' => 'bad argument to @end: quot@asis{}ation',
'type' => 'error'
},
{
diff --git a/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
b/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
index e3ef5b36ee..5ec03f0588 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
@@ -120,12 +120,12 @@
$result_texts{'command_in_end_expanded_raw_command_after'} = '';
$result_errors{'command_in_end_expanded_raw_command_after'} = [
{
- 'error_line' => 'superfluous argument to @end tex: @asis{asis}
+ 'error_line' => 'bad argument to @end: tex@asis{asis}
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end tex: @asis{asis}',
+ 'text' => 'bad argument to @end: tex@asis{asis}',
'type' => 'error'
}
];
diff --git
a/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
b/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
index a3988808d3..71fe2823d1 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
@@ -113,12 +113,12 @@
$result_texts{'command_in_end_expanded_raw_command_empty_after'} = '';
$result_errors{'command_in_end_expanded_raw_command_empty_after'} = [
{
- 'error_line' => 'superfluous argument to @end tex: @asis{}
+ 'error_line' => 'bad argument to @end: tex@asis{}
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end tex: @asis{}',
+ 'text' => 'bad argument to @end: tex@asis{}',
'type' => 'error'
}
];
diff --git
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
index 39769066af..5c339d31fe 100644
---
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
+++
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
@@ -118,12 +118,12 @@
$result_texts{'command_in_end_expanded_raw_one_char_before_command'} = '';
$result_errors{'command_in_end_expanded_raw_one_char_before_command'} = [
{
- 'error_line' => 'superfluous argument to @end tex: @asis{}ex
+ 'error_line' => 'bad argument to @end: t@asis{}ex
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end tex: @asis{}ex',
+ 'text' => 'bad argument to @end: t@asis{}ex',
'type' => 'error'
}
];
diff --git
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
index d4c0a25564..1d0452eb15 100644
---
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
+++
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
@@ -118,12 +118,12 @@
$result_texts{'command_in_end_expanded_raw_two_char_before_command'} = '';
$result_errors{'command_in_end_expanded_raw_two_char_before_command'} = [
{
- 'error_line' => 'superfluous argument to @end tex: @asis{}x
+ 'error_line' => 'bad argument to @end: te@asis{}x
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end tex: @asis{}x',
+ 'text' => 'bad argument to @end: te@asis{}x',
'type' => 'error'
}
];
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
index 4939292343..cef833810f 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
@@ -111,12 +111,12 @@ $result_texts{'command_in_end_ignored_raw_command_after'}
= '';
$result_errors{'command_in_end_ignored_raw_command_after'} = [
{
- 'error_line' => 'superfluous argument to @end html: @asis{asis}
+ 'error_line' => 'bad argument to @end: html@asis{asis}
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end html: @asis{asis}',
+ 'text' => 'bad argument to @end: html@asis{asis}',
'type' => 'error'
}
];
diff --git a/tp/t/results/coverage/symbol_after_block.pl
b/tp/t/results/coverage/symbol_after_block.pl
index b5e1fa359f..d92c8b06b6 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -1932,120 +1932,120 @@ Copying:
$result_errors{'symbol_after_block'} = [
{
- 'error_line' => 'superfluous argument to @end html: . On the line.
+ 'error_line' => 'bad argument to @end: html. On the line.
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end html: . On the line.',
+ 'text' => 'bad argument to @end: html. On the line.',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end html: @@ On the line.
+ 'error_line' => 'bad argument to @end: html@@ On the line.
',
'file_name' => '',
'line_nr' => 7,
'macro' => '',
- 'text' => 'superfluous argument to @end html: @@ On the line.',
+ 'text' => 'bad argument to @end: html@@ On the line.',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: ;
+ 'error_line' => 'bad argument to @end: verbatim;
',
'file_name' => '',
'line_nr' => 13,
'macro' => '',
- 'text' => 'superfluous argument to @end verbatim: ;',
+ 'text' => 'bad argument to @end: verbatim;',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: @@
+ 'error_line' => 'bad argument to @end: verbatim@@
',
'file_name' => '',
'line_nr' => 17,
'macro' => '',
- 'text' => 'superfluous argument to @end verbatim: @@',
+ 'text' => 'bad argument to @end: verbatim@@',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end table: +
+ 'error_line' => 'bad argument to @end: table+
',
'file_name' => '',
'line_nr' => 24,
'macro' => '',
- 'text' => 'superfluous argument to @end table: +',
+ 'text' => 'bad argument to @end: table+',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end table: @@
+ 'error_line' => 'bad argument to @end: table@@
',
'file_name' => '',
'line_nr' => 29,
'macro' => '',
- 'text' => 'superfluous argument to @end table: @@',
+ 'text' => 'bad argument to @end: table@@',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end itemize: \'\'
+ 'error_line' => 'bad argument to @end: itemize\'\'
',
'file_name' => '',
'line_nr' => 35,
'macro' => '',
- 'text' => 'superfluous argument to @end itemize: \'\'',
+ 'text' => 'bad argument to @end: itemize\'\'',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end itemize: @@
+ 'error_line' => 'bad argument to @end: itemize@@
',
'file_name' => '',
'line_nr' => 39,
'macro' => '',
- 'text' => 'superfluous argument to @end itemize: @@',
+ 'text' => 'bad argument to @end: itemize@@',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end multitable: ^
+ 'error_line' => 'bad argument to @end: multitable^
',
'file_name' => '',
'line_nr' => 46,
'macro' => '',
- 'text' => 'superfluous argument to @end multitable: ^',
+ 'text' => 'bad argument to @end: multitable^',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end multitable: @{
+ 'error_line' => 'bad argument to @end: multitable@{
',
'file_name' => '',
'line_nr' => 51,
'macro' => '',
- 'text' => 'superfluous argument to @end multitable: @{',
+ 'text' => 'bad argument to @end: multitable@{',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end flushleft: !
+ 'error_line' => 'bad argument to @end: flushleft!
',
'file_name' => '',
'line_nr' => 57,
'macro' => '',
- 'text' => 'superfluous argument to @end flushleft: !',
+ 'text' => 'bad argument to @end: flushleft!',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end flushleft: @@
+ 'error_line' => 'bad argument to @end: flushleft@@
',
'file_name' => '',
'line_nr' => 61,
'macro' => '',
- 'text' => 'superfluous argument to @end flushleft: @@',
+ 'text' => 'bad argument to @end: flushleft@@',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end copying: *
+ 'error_line' => 'bad argument to @end: copying*
',
'file_name' => '',
'line_nr' => 67,
'macro' => '',
- 'text' => 'superfluous argument to @end copying: *',
+ 'text' => 'bad argument to @end: copying*',
'type' => 'error'
},
{
@@ -2058,12 +2058,12 @@ $result_errors{'symbol_after_block'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end copying: @@
+ 'error_line' => 'bad argument to @end: copying@@
',
'file_name' => '',
'line_nr' => 71,
'macro' => '',
- 'text' => 'superfluous argument to @end copying: @@',
+ 'text' => 'bad argument to @end: copying@@',
'type' => 'error'
}
];
diff --git a/tp/t/results/macro/macro_expansion.pl
b/tp/t/results/macro/macro_expansion.pl
index e61fee0b61..7b4b20aae1 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -742,21 +742,21 @@ arg3
$result_errors{'macro_expansion'} = [
{
- 'error_line' => 'superfluous argument to @end verbatim: . (possibly
involving @macroone)
+ 'error_line' => 'bad argument to @end: verbatim. (possibly involving
@macroone)
',
'file_name' => '',
'line_nr' => 9,
'macro' => 'macroone',
- 'text' => 'superfluous argument to @end verbatim: .',
+ 'text' => 'bad argument to @end: verbatim.',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: . (possibly
involving @macroone)
+ 'error_line' => 'bad argument to @end: verbatim. (possibly involving
@macroone)
',
'file_name' => '',
'line_nr' => 11,
'macro' => 'macroone',
- 'text' => 'superfluous argument to @end verbatim: .',
+ 'text' => 'bad argument to @end: verbatim.',
'type' => 'error'
},
{
@@ -769,39 +769,39 @@ $result_errors{'macro_expansion'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: my arg. (possibly
involving @macroone)
+ 'error_line' => 'bad argument to @end: verbatim my arg. (possibly
involving @macroone)
',
'file_name' => '',
'line_nr' => 13,
'macro' => 'macroone',
- 'text' => 'superfluous argument to @end verbatim: my arg.',
+ 'text' => 'bad argument to @end: verbatim my arg.',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: . (possibly
involving @macroone)
+ 'error_line' => 'bad argument to @end: verbatim. (possibly involving
@macroone)
',
'file_name' => '',
'line_nr' => 15,
'macro' => 'macroone',
- 'text' => 'superfluous argument to @end verbatim: .',
+ 'text' => 'bad argument to @end: verbatim.',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: . (possibly
involving @macroone)
+ 'error_line' => 'bad argument to @end: verbatim. (possibly involving
@macroone)
',
'file_name' => '',
'line_nr' => 17,
'macro' => 'macroone',
- 'text' => 'superfluous argument to @end verbatim: .',
+ 'text' => 'bad argument to @end: verbatim.',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: . (possibly
involving @macroone)
+ 'error_line' => 'bad argument to @end: verbatim. (possibly involving
@macroone)
',
'file_name' => '',
'line_nr' => 23,
'macro' => 'macroone',
- 'text' => 'superfluous argument to @end verbatim: .',
+ 'text' => 'bad argument to @end: verbatim.',
'type' => 'error'
}
];
diff --git a/tp/t/results/macro/text_before_after.pl
b/tp/t/results/macro/text_before_after.pl
index aeb534cd08..f04a54b943 100644
--- a/tp/t/results/macro/text_before_after.pl
+++ b/tp/t/results/macro/text_before_after.pl
@@ -112,12 +112,12 @@ $result_errors{'text_before_after'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end macro: after
+ 'error_line' => 'bad argument to @end: macro after
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end macro: after',
+ 'text' => 'bad argument to @end: macro after',
'type' => 'error'
}
];
diff --git a/tp/t/results/preformatted/text_on_display_command_line.pl
b/tp/t/results/preformatted/text_on_display_command_line.pl
index 967cab0072..261a5aa900 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -387,21 +387,21 @@ in display
$result_errors{'text_on_display_command_line'} = [
{
- 'error_line' => 'superfluous argument to @end display: text after end
+ 'error_line' => 'bad argument to @end: display text after end
',
'file_name' => '',
'line_nr' => 10,
'macro' => '',
- 'text' => 'superfluous argument to @end display: text after end',
+ 'text' => 'bad argument to @end: display text after end',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end display: text after end
display nested in display
+ 'error_line' => 'bad argument to @end: display text after end display
nested in display
',
'file_name' => '',
'line_nr' => 14,
'macro' => '',
- 'text' => 'superfluous argument to @end display: text after end display
nested in display',
+ 'text' => 'bad argument to @end: display text after end display nested in
display',
'type' => 'error'
}
];
diff --git a/tp/t/results/preformatted/text_on_example_command_line.pl
b/tp/t/results/preformatted/text_on_example_command_line.pl
index b20c0b7438..9e688a958b 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -387,21 +387,21 @@ in example
$result_errors{'text_on_example_command_line'} = [
{
- 'error_line' => 'superfluous argument to @end example: text after end
+ 'error_line' => 'bad argument to @end: example text after end
',
'file_name' => '',
'line_nr' => 10,
'macro' => '',
- 'text' => 'superfluous argument to @end example: text after end',
+ 'text' => 'bad argument to @end: example text after end',
'type' => 'error'
},
{
- 'error_line' => 'superfluous argument to @end example: text after end
example nested in example
+ 'error_line' => 'bad argument to @end: example text after end example
nested in example
',
'file_name' => '',
'line_nr' => 14,
'macro' => '',
- 'text' => 'superfluous argument to @end example: text after end example
nested in example',
+ 'text' => 'bad argument to @end: example text after end example nested in
example',
'type' => 'error'
}
];
diff --git a/tp/t/results/raw/raw_commands_and_end_of_lines.pl
b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
index fc533e62dd..636865f06e 100644
--- a/tp/t/results/raw/raw_commands_and_end_of_lines.pl
+++ b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
@@ -1742,12 +1742,12 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end html: after the closing
command.
+ 'error_line' => 'bad argument to @end: html after the closing command.
',
'file_name' => '',
'line_nr' => 20,
'macro' => '',
- 'text' => 'superfluous argument to @end html: after the closing command.',
+ 'text' => 'bad argument to @end: html after the closing command.',
'type' => 'error'
},
{
@@ -1769,12 +1769,12 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end html: . A symbol after the
closing command.
+ 'error_line' => 'bad argument to @end: html. A symbol after the closing
command.
',
'file_name' => '',
'line_nr' => 29,
'macro' => '',
- 'text' => 'superfluous argument to @end html: . A symbol after the closing
command.',
+ 'text' => 'bad argument to @end: html. A symbol after the closing
command.',
'type' => 'error'
},
{
@@ -1796,12 +1796,12 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end tex: after the closing
command.
+ 'error_line' => 'bad argument to @end: tex after the closing command.
',
'file_name' => '',
'line_nr' => 48,
'macro' => '',
- 'text' => 'superfluous argument to @end tex: after the closing command.',
+ 'text' => 'bad argument to @end: tex after the closing command.',
'type' => 'error'
},
{
@@ -1823,12 +1823,12 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end tex: . A symbol after the
closing command.
+ 'error_line' => 'bad argument to @end: tex. A symbol after the closing
command.
',
'file_name' => '',
'line_nr' => 57,
'macro' => '',
- 'text' => 'superfluous argument to @end tex: . A symbol after the closing
command.',
+ 'text' => 'bad argument to @end: tex. A symbol after the closing command.',
'type' => 'error'
},
{
@@ -1850,12 +1850,12 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: after the closing
command.
+ 'error_line' => 'bad argument to @end: verbatim after the closing command.
',
'file_name' => '',
'line_nr' => 76,
'macro' => '',
- 'text' => 'superfluous argument to @end verbatim: after the closing
command.',
+ 'text' => 'bad argument to @end: verbatim after the closing command.',
'type' => 'error'
},
{
@@ -1877,12 +1877,12 @@ $result_errors{'raw_commands_and_end_of_lines'} = [
'type' => 'warning'
},
{
- 'error_line' => 'superfluous argument to @end verbatim: . A symbol after
the closing command.
+ 'error_line' => 'bad argument to @end: verbatim. A symbol after the
closing command.
',
'file_name' => '',
'line_nr' => 85,
'macro' => '',
- 'text' => 'superfluous argument to @end verbatim: . A symbol after the
closing command.',
+ 'text' => 'bad argument to @end: verbatim. A symbol after the closing
command.',
'type' => 'error'
}
];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line), tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line): use the same error message for superfluous argument to @end command after the command argument as for other cases of superfluous argument triggered by unexpected @-commands on @end ond other similar commands line.,
Patrice Dumas <=