[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC PATCH 02/32] texi2pod: Support @verbatim environme
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [RFC PATCH 02/32] texi2pod: Support @verbatim environment |
Date: |
Fri, 06 Oct 2017 07:24:07 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Eric Blake <address@hidden> writes:
> On 10/02/2017 10:25 AM, Markus Armbruster wrote:
>> Signed-off-by: Markus Armbruster <address@hidden>
>> ---
>> scripts/texi2pod.pl | 11 +++++++++--
>> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> My perl is a bit rusty, but I think I can handle this one.
>
>>
>> diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl
>> index 39ce584a32..2171f8b819 100755
>> --- a/scripts/texi2pod.pl
>> +++ b/scripts/texi2pod.pl
>> @@ -85,6 +85,13 @@ if (defined $out) {
>>
>> while(defined $inf) {
>> while(<$inf>) {
>> + # Verbatim environment
>> + if (defined $endw and $endw eq "verbatim"
>> + and not (/address@hidden([a-z]+)/ and $1 eq $endw)) {
>
> You anchored to the beginning, but not the end, of the line; that means
> you accept '@end verbatim garbage' as an end marker. Worth adding $?
Cribbed from
# End-block handler goes up here because it needs to operate even
# if we are skipping.
/address@hidden([a-z]+)/ and do {
# Ignore @end foo, where foo is not an operation which may
# cause us to skip, if we are presently skipping.
my $ended = $1;
next if $skipping && $ended !~
/^(?:ifset|ifclear|ignore|menu|iftex|copying)$/;
die "address@hidden $ended without address@hidden at line $.\n" unless
defined $endw;
die "address@hidden ended by address@hidden $ended at line $.\n" unless
$ended eq $endw;
$endw = pop @endwstack;
I'd prefer to stick to this regexp.
texi2pod.pl parses quite sloppily in general.
> If that's the only change, I'm okay with adding:
>
> Reviewed-by: Eric Blake <address@hidden>
Does this apply to the unchanged patch, too?
- [Qemu-devel] [RFC PATCH 00/32] Command line QAPIfication, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 24/32] qapi-options: Generate help string, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 18/32] docs/devel/qapi-code-gen.txt: Rewrite section on schema syntax, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 16/32] qapi: Factor out _make_implicit_wrapper_type(), Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 01/32] tests/qapi-schema: Improve coverage of '@', Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 04/32] qapi2texi: Fix for '@' not followed by \w character, Markus Armbruster, 2017/10/02