mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-15 01:17:45 +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
113 lines
2.9 KiB
Perl
Executable file
113 lines
2.9 KiB
Perl
Executable file
#! /usr/bin/perl -w
|
|
|
|
# Script to take the output of nroff -man and remove all the backspacing and
|
|
# the page footers and the screen commands etc so that it is more usefully
|
|
# readable online. In fact, in the latest nroff, intermediate footers don't
|
|
# seem to be generated any more.
|
|
|
|
$blankcount = 0;
|
|
$lastwascut = 0;
|
|
$firstheader = 1;
|
|
|
|
# Input on STDIN; output to STDOUT.
|
|
|
|
while (<STDIN>)
|
|
{
|
|
s/\x1b\[\d+m//g; # Remove screen controls "ESC [ number m"
|
|
s/.\x8//g; # Remove "char, backspace"
|
|
|
|
# Handle header lines. Retain only the first one we encounter, but remove
|
|
# the blank line that follows. Any others (e.g. at end of document) and the
|
|
# following blank line are dropped.
|
|
|
|
if (/^PCRE(\w*)\(([13])\)\s+PCRE\1\(\2\)$/)
|
|
{
|
|
if ($firstheader)
|
|
{
|
|
$firstheader = 0;
|
|
print;
|
|
$lastprinted = $_;
|
|
$lastwascut = 0;
|
|
}
|
|
$_=<STDIN>; # Remove a blank that follows
|
|
next;
|
|
}
|
|
|
|
# Count runs of empty lines
|
|
|
|
if (/^\s*$/)
|
|
{
|
|
$blankcount++;
|
|
$lastwascut = 0;
|
|
next;
|
|
}
|
|
|
|
# If a chunk of lines has been cut out (page footer) and the next line
|
|
# has a different indentation, put back one blank line.
|
|
|
|
if ($lastwascut && $blankcount < 1 && defined($lastprinted))
|
|
{
|
|
($a) = $lastprinted =~ /^(\s*)/;
|
|
($b) = $_ =~ /^(\s*)/;
|
|
$blankcount++ if ($a ne $b);
|
|
}
|
|
|
|
# We get here only when we have a non-blank line in hand. If it was preceded
|
|
# by 3 or more blank lines, read the next 3 lines and see if they are blank.
|
|
# If so, remove all 7 lines, and remember that we have just done a cut.
|
|
|
|
if ($blankcount >= 3)
|
|
{
|
|
for ($i = 0; $i < 3; $i++)
|
|
{
|
|
$next[$i] = <STDIN>;
|
|
$next[$i] = "" if !defined $next[$i];
|
|
$next[$i] =~ s/\x1b\[\d+m//g; # Remove screen controls "ESC [ number m"
|
|
$next[$i] =~ s/.\x8//g; # Remove "char, backspace"
|
|
}
|
|
|
|
# Cut out chunks of the form <3 blanks><non-blank><3 blanks>
|
|
|
|
if ($next[0] =~ /^\s*$/ &&
|
|
$next[1] =~ /^\s*$/ &&
|
|
$next[2] =~ /^\s*$/)
|
|
{
|
|
$blankcount -= 3;
|
|
$lastwascut = 1;
|
|
}
|
|
|
|
# Otherwise output the saved blanks, the current, and the next three
|
|
# lines. Remember the last printed line.
|
|
|
|
else
|
|
{
|
|
for ($i = 0; $i < $blankcount; $i++) { print "\n"; }
|
|
print;
|
|
for ($i = 0; $i < 3; $i++)
|
|
{
|
|
$next[$i] =~ s/.\x8//g;
|
|
print $next[$i];
|
|
$lastprinted = $_;
|
|
}
|
|
$lastwascut = 0;
|
|
$blankcount = 0;
|
|
}
|
|
}
|
|
|
|
# This non-blank line is not preceded by 3 or more blank lines. Output
|
|
# any blanks there are, and the line. Remember it. Force two blank lines
|
|
# before headings.
|
|
|
|
else
|
|
{
|
|
$blankcount = 2 if /^\S/ && !/^Last updated/ && !/^Copyright/ &&
|
|
defined($lastprinted);
|
|
for ($i = 0; $i < $blankcount; $i++) { print "\n"; }
|
|
print;
|
|
$lastprinted = $_;
|
|
$lastwascut = 0;
|
|
$blankcount = 0;
|
|
}
|
|
}
|
|
|
|
# End
|