Upgrade perltest.sh to support (some) #pattern modifiers.
This commit is contained in:
parent
455ce731dc
commit
635d04fbb7
|
@ -118,6 +118,11 @@ backtrack into the first of the atomic groups. A complicated example is
|
|||
/(?>a(*:1))(?>b)(*SKIP:1)x|.*/ matched against "abc", where the *SKIP
|
||||
shouldn't find a MARK (because is in an atomic group), but it did.
|
||||
|
||||
26. Upgraded the perltest.sh script: (1) #pattern lines can now be used to set
|
||||
certain modifiers that the script recognizes; (2) Unsupported #command lines
|
||||
give a warning when they are ignored; (3) Mark data is output only if the
|
||||
"mark" modifier is present.
|
||||
|
||||
|
||||
Version 10.31 12-February-2018
|
||||
------------------------------
|
||||
|
|
|
@ -315,7 +315,8 @@ number of subject lines to be matched against that pattern. In between sets of
|
|||
test data, command lines that begin with # may appear. This file format, with
|
||||
some restrictions, can also be processed by the <b>perltest.sh</b> script that
|
||||
is distributed with PCRE2 as a means of checking that the behaviour of PCRE2
|
||||
and Perl is the same.
|
||||
and Perl is the same. For a specification of <b>perltest.sh</b>, see the
|
||||
comments near its beginning.
|
||||
</P>
|
||||
<P>
|
||||
When the input is a terminal, <b>pcre2test</b> prompts for each line of input,
|
||||
|
@ -2002,7 +2003,7 @@ Cambridge, England.
|
|||
</P>
|
||||
<br><a name="SEC21" href="#TOC1">REVISION</a><br>
|
||||
<P>
|
||||
Last updated: 27 June 2018
|
||||
Last updated: 16 July 2018
|
||||
<br>
|
||||
Copyright © 1997-2018 University of Cambridge.
|
||||
<br>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.TH PCRE2TEST 1 "27 June 2018" "PCRE 10.32"
|
||||
.TH PCRE2TEST 1 "16 July 2018" "PCRE 10.32"
|
||||
.SH NAME
|
||||
pcre2test - a program for testing Perl-compatible regular expressions.
|
||||
.SH SYNOPSIS
|
||||
|
@ -266,7 +266,8 @@ number of subject lines to be matched against that pattern. In between sets of
|
|||
test data, command lines that begin with # may appear. This file format, with
|
||||
some restrictions, can also be processed by the \fBperltest.sh\fP script that
|
||||
is distributed with PCRE2 as a means of checking that the behaviour of PCRE2
|
||||
and Perl is the same.
|
||||
and Perl is the same. For a specification of \fBperltest.sh\fP, see the
|
||||
comments near its beginning.
|
||||
.P
|
||||
When the input is a terminal, \fBpcre2test\fP prompts for each line of input,
|
||||
using "re>" to prompt for regular expression patterns, and "data>" to prompt
|
||||
|
@ -1980,6 +1981,6 @@ Cambridge, England.
|
|||
.rs
|
||||
.sp
|
||||
.nf
|
||||
Last updated: 27 June 2018
|
||||
Last updated: 16 July 2018
|
||||
Copyright (c) 1997-2018 University of Cambridge.
|
||||
.fi
|
||||
|
|
File diff suppressed because it is too large
Load Diff
31
perltest.sh
31
perltest.sh
|
@ -50,6 +50,13 @@ fi
|
|||
# ucp sets Perl's /u modifier
|
||||
# utf invoke UTF-8 functionality
|
||||
#
|
||||
# Comment lines are ignored. The #pattern command can be used to set modifiers
|
||||
# that will be added to each subsequent pattern. NOTE: this is different to
|
||||
# pcre2test where #pattern sets defaults, some of which can be overridden on
|
||||
# individual patterns. The #perltest, #forbid_utf, and #newline_default
|
||||
# commands, which are needed in the relevant pcre2test files, are ignored. Any
|
||||
# other #-command is ignored, with a warning message.
|
||||
#
|
||||
# The data lines must not have any pcre2test modifiers. Unless
|
||||
# "subject_literal" is on the pattern, data lines are processed as
|
||||
# Perl double-quoted strings, so if they contain " $ or @ characters, these
|
||||
|
@ -127,7 +134,26 @@ for (;;)
|
|||
printf " re> " if $interact;
|
||||
last if ! ($_ = <$infile>);
|
||||
printf $outfile "$_" if ! $interact;
|
||||
next if ($_ =~ /^\s*$/ || $_ =~ /^#/);
|
||||
next if ($_ =~ /^\s*$/ || $_ =~ /^#[\s!]/);
|
||||
|
||||
# A few of pcre2test's #-commands are supported, or just ignored. Any others
|
||||
# cause an error.
|
||||
|
||||
if ($_ =~ /^#pattern(.*)/)
|
||||
{
|
||||
$extra_modifiers = $1;
|
||||
chomp($extra_modifiers);
|
||||
$extra_modifiers =~ s/\s+$//;
|
||||
next;
|
||||
}
|
||||
elsif ($_ =~ /^#/)
|
||||
{
|
||||
if ($_ !~ /^#newline_default|^#perltest|^#forbid_utf/)
|
||||
{
|
||||
printf $outfile "** Warning: #-command ignored: %s", $_;
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
$pattern = $_;
|
||||
|
||||
|
@ -146,7 +172,8 @@ for (;;)
|
|||
|
||||
$pattern =~ /^\s*((.).*\2)(.*)$/s;
|
||||
$pat = $1;
|
||||
$mod = $3;
|
||||
$mod = "$3,$extra_modifiers";
|
||||
$mod =~ s/^,\s*//;
|
||||
$del = $2;
|
||||
|
||||
# The private "aftertext" modifier means "print $' afterwards".
|
||||
|
|
Loading…
Reference in New Issue