mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-27 05:13:10 +00:00
d83ef07ca7
This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge:11c8a47
7974aab
Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit7974aab6d3
Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commiteb20b43d2d
Merge:1a09e70
5f519cb
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit1a09e709d0
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commita0ec9772cd
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit64c25a01e3
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commitece7f35ec5
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit9ff7477a92
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitbaf4e096b2
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit896a2c2b27
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commitefd47dcbda
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commited0850e2db
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit9492e7a7e9
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit1a60b93371
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit5f519cb2a2
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit2ecd24f795
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit45b777e4dc
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit981cbb6ddf
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitddb6a2a8fd
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit1e34e3191b
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit34232e152d
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit00d7e78169
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit4498aa5f57
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit290c58c72e
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
295 lines
8 KiB
Bash
Executable file
295 lines
8 KiB
Bash
Executable file
#! /bin/sh
|
|
|
|
# Script for testing regular expressions with perl to check that PCRE2 handles
|
|
# them the same. The Perl code has to have "use utf8" and "require Encode" at
|
|
# the start when running UTF-8 tests, but *not* for non-utf8 tests. (The
|
|
# "require" would actually be OK for non-utf8-tests, but is not always
|
|
# installed, so this way the script will always run for these tests.)
|
|
#
|
|
# The desired effect is achieved by making this a shell script that passes the
|
|
# Perl script to Perl through a pipe. If the first argument is "-utf8", a
|
|
# suitable prefix is set up.
|
|
#
|
|
# The remaining arguments, if any, are passed to Perl. They are an input file
|
|
# and an output file. If there is one argument, the output is written to
|
|
# STDOUT. If Perl receives no arguments, it opens /dev/tty as input, and writes
|
|
# output to STDOUT. (I haven't found a way of getting it to use STDIN, because
|
|
# of the contorted piping input.)
|
|
|
|
perl=perl
|
|
prefix=''
|
|
if [ $# -gt 0 -a "$1" = "-utf8" ] ; then
|
|
prefix="use utf8; require Encode;"
|
|
shift
|
|
fi
|
|
|
|
|
|
# The Perl script that follows has a similar specification to pcre2test, and so
|
|
# can be given identical input, except that input patterns can be followed only
|
|
# by Perl's lower case modifiers and certain other pcre2test modifiers that are
|
|
# either handled or ignored:
|
|
#
|
|
# aftertext interpreted as "print $' afterwards"
|
|
# afteralltext ignored
|
|
# dupnames ignored (Perl always allows)
|
|
# mark ignored
|
|
# no_auto_possess ignored
|
|
# no_start_optimize ignored
|
|
# ucp sets Perl's /u modifier
|
|
# utf invoke UTF-8 functionality
|
|
#
|
|
# The data lines must not have any pcre2test modifiers. They are processed as
|
|
# Perl double-quoted strings, so if they contain " $ or @ characters, these
|
|
# have to be escaped. For this reason, all such characters in the
|
|
# Perl-compatible testinput1 and testinput4 files are escaped so that they can
|
|
# be used for perltest as well as for pcre2test. The output from this script
|
|
# should be same as from pcre2test, apart from the initial identifying banner.
|
|
#
|
|
# The other testinput files are not suitable for feeding to perltest.sh,
|
|
# because they make use of the special modifiers that pcre2test uses for
|
|
# testing features of PCRE2. Some of these files also contain malformed regular
|
|
# expressions, in order to check that PCRE2 diagnoses them correctly.
|
|
|
|
(echo "$prefix" ; cat <<'PERLEND'
|
|
|
|
# Function for turning a string into a string of printing chars.
|
|
|
|
sub pchars {
|
|
my($t) = "";
|
|
if ($utf8)
|
|
{
|
|
@p = unpack('U*', $_[0]);
|
|
foreach $c (@p)
|
|
{
|
|
if ($c >= 32 && $c < 127) { $t .= chr $c; }
|
|
else { $t .= sprintf("\\x{%02x}", $c);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
foreach $c (split(//, $_[0]))
|
|
{
|
|
if (ord $c >= 32 && ord $c < 127) { $t .= $c; }
|
|
else { $t .= sprintf("\\x%02x", ord $c); }
|
|
}
|
|
}
|
|
$t;
|
|
}
|
|
|
|
|
|
# Read lines from a named file or stdin and write to a named file or stdout;
|
|
# lines consist of a regular expression, in delimiters and optionally followed
|
|
# by options, followed by a set of test data, terminated by an empty line.
|
|
|
|
# Sort out the input and output files
|
|
|
|
if (@ARGV > 0)
|
|
{
|
|
open(INFILE, "<$ARGV[0]") || die "Failed to open $ARGV[0]\n";
|
|
$infile = "INFILE";
|
|
$interact = 0;
|
|
}
|
|
else
|
|
{
|
|
open(INFILE, "</dev/tty") || die "Failed to open /dev/tty\n";
|
|
$infile = "INFILE";
|
|
$interact = 1;
|
|
}
|
|
|
|
if (@ARGV > 1)
|
|
{
|
|
open(OUTFILE, ">$ARGV[1]") || die "Failed to open $ARGV[1]\n";
|
|
$outfile = "OUTFILE";
|
|
}
|
|
else { $outfile = "STDOUT"; }
|
|
|
|
printf($outfile "Perl $] Regular Expressions\n\n");
|
|
|
|
# Main loop
|
|
|
|
NEXT_RE:
|
|
for (;;)
|
|
{
|
|
printf " re> " if $interact;
|
|
last if ! ($_ = <$infile>);
|
|
printf $outfile "$_" if ! $interact;
|
|
next if ($_ =~ /^\s*$/ || $_ =~ /^#/);
|
|
|
|
$pattern = $_;
|
|
|
|
while ($pattern !~ /^\s*(.).*\1/s)
|
|
{
|
|
printf " > " if $interact;
|
|
last if ! ($_ = <$infile>);
|
|
printf $outfile "$_" if ! $interact;
|
|
$pattern .= $_;
|
|
}
|
|
|
|
chomp($pattern);
|
|
$pattern =~ s/\s+$//;
|
|
|
|
# Split the pattern from the modifiers and adjust them as necessary.
|
|
|
|
$pattern =~ /^\s*((.).*\2)(.*)$/s;
|
|
$pat = $1;
|
|
$mod = $3;
|
|
|
|
# The private "aftertext" modifier means "print $' afterwards".
|
|
|
|
$showrest = ($mod =~ s/aftertext,?//);
|
|
|
|
# "allaftertext" is used by pcre2test to print remainders after captures
|
|
|
|
$mod =~ s/allaftertext,?//;
|
|
|
|
# Detect utf
|
|
|
|
$utf8 = $mod =~ s/utf,?//;
|
|
|
|
# Remove "dupnames".
|
|
|
|
$mod =~ s/dupnames,?//;
|
|
|
|
# Remove "mark" (asks pcre2test to check MARK data) */
|
|
|
|
$mod =~ s/mark,?//;
|
|
|
|
# "ucp" asks pcre2test to set PCRE2_UCP; change this to /u for Perl
|
|
|
|
$mod =~ s/ucp,?/u/;
|
|
|
|
# Remove "no_auto_possess" and "no_start_optimize" (disable PCRE2 optimizations)
|
|
|
|
$mod =~ s/no_auto_possess,?//;
|
|
$mod =~ s/no_start_optimize,?//;
|
|
|
|
# Add back retained modifiers and check that the pattern is valid.
|
|
|
|
$mod =~ s/,//g;
|
|
$pattern = "$pat$mod";
|
|
eval "\$_ =~ ${pattern}";
|
|
if ($@)
|
|
{
|
|
printf $outfile "Error: $@";
|
|
if (! $interact)
|
|
{
|
|
for (;;)
|
|
{
|
|
last if ! ($_ = <$infile>);
|
|
last if $_ =~ /^\s*$/;
|
|
}
|
|
}
|
|
next NEXT_RE;
|
|
}
|
|
|
|
# If the /g modifier is present, we want to put a loop round the matching;
|
|
# otherwise just a single "if".
|
|
|
|
$cmd = ($pattern =~ /g[a-z]*$/)? "while" : "if";
|
|
|
|
# If the pattern is actually the null string, Perl uses the most recently
|
|
# executed (and successfully compiled) regex is used instead. This is a
|
|
# nasty trap for the unwary! The PCRE2 test suite does contain null strings
|
|
# in places - if they are allowed through here all sorts of weird and
|
|
# unexpected effects happen. To avoid this, we replace such patterns with
|
|
# a non-null pattern that has the same effect.
|
|
|
|
$pattern = "/(?#)/$2" if ($pattern =~ /^(.)\1(.*)$/);
|
|
|
|
# Read data lines and test them
|
|
|
|
for (;;)
|
|
{
|
|
printf "data> " if $interact;
|
|
last NEXT_RE if ! ($_ = <$infile>);
|
|
chomp;
|
|
printf $outfile "$_\n" if ! $interact;
|
|
|
|
s/\s+$//; # Remove trailing space
|
|
s/^\s+//; # Remove leading space
|
|
|
|
last if ($_ eq "");
|
|
$x = eval "\"$_\""; # To get escapes processed
|
|
|
|
# Empty array for holding results, ensure $REGERROR and $REGMARK are
|
|
# unset, then do the matching.
|
|
|
|
@subs = ();
|
|
|
|
$pushes = "push \@subs,\$&;" .
|
|
"push \@subs,\$1;" .
|
|
"push \@subs,\$2;" .
|
|
"push \@subs,\$3;" .
|
|
"push \@subs,\$4;" .
|
|
"push \@subs,\$5;" .
|
|
"push \@subs,\$6;" .
|
|
"push \@subs,\$7;" .
|
|
"push \@subs,\$8;" .
|
|
"push \@subs,\$9;" .
|
|
"push \@subs,\$10;" .
|
|
"push \@subs,\$11;" .
|
|
"push \@subs,\$12;" .
|
|
"push \@subs,\$13;" .
|
|
"push \@subs,\$14;" .
|
|
"push \@subs,\$15;" .
|
|
"push \@subs,\$16;" .
|
|
"push \@subs,\$'; }";
|
|
|
|
undef $REGERROR;
|
|
undef $REGMARK;
|
|
|
|
eval "${cmd} (\$x =~ ${pattern}) {" . $pushes;
|
|
|
|
if ($@)
|
|
{
|
|
printf $outfile "Error: $@\n";
|
|
next NEXT_RE;
|
|
}
|
|
elsif (scalar(@subs) == 0)
|
|
{
|
|
printf $outfile "No match";
|
|
if (defined $REGERROR && $REGERROR != 1)
|
|
{ printf $outfile (", mark = %s", &pchars($REGERROR)); }
|
|
printf $outfile "\n";
|
|
}
|
|
else
|
|
{
|
|
while (scalar(@subs) != 0)
|
|
{
|
|
printf $outfile (" 0: %s\n", &pchars($subs[0]));
|
|
printf $outfile (" 0+ %s\n", &pchars($subs[17])) if $showrest;
|
|
$last_printed = 0;
|
|
for ($i = 1; $i <= 16; $i++)
|
|
{
|
|
if (defined $subs[$i])
|
|
{
|
|
while ($last_printed++ < $i-1)
|
|
{ printf $outfile ("%2d: <unset>\n", $last_printed); }
|
|
printf $outfile ("%2d: %s\n", $i, &pchars($subs[$i]));
|
|
$last_printed = $i;
|
|
}
|
|
}
|
|
splice(@subs, 0, 18);
|
|
}
|
|
|
|
# It seems that $REGMARK is not marked as UTF-8 even when use utf8 is
|
|
# set and the input pattern was a UTF-8 string. We can, however, force
|
|
# it to be so marked.
|
|
|
|
if (defined $REGMARK && $REGMARK != 1)
|
|
{
|
|
$xx = $REGMARK;
|
|
$xx = Encode::decode_utf8($xx) if $utf8;
|
|
printf $outfile ("MK: %s\n", &pchars($xx));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
# printf $outfile "\n";
|
|
|
|
PERLEND
|
|
) | $perl - $@
|
|
|
|
# End
|