mirror of
https://github.com/fish-shell/fish-shell
synced 2024-09-22 07:21:55 +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:11c8a477974aabAuthor: 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 commit7974aab6d3Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commiteb20b43d2dMerge:1a09e705f519cbAuthor: 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 commit1a09e709d0Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commita0ec9772cdAuthor: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit64c25a01e3Author: 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 commitece7f35ec5Author: 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() commit9ff7477a92Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitbaf4e096b2Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit896a2c2b27Author: 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) commitefd47dcbdaAuthor: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commited0850e2dbAuthor: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit9492e7a7e9Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit1a60b93371Author: 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 commit5f519cb2a2Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit2ecd24f795Author: 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 commit45b777e4dcAuthor: 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() commit981cbb6ddfAuthor: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitddb6a2a8fdAuthor: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit1e34e3191bAuthor: 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) commit34232e152dAuthor: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit00d7e78169Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit4498aa5f57Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit290c58c72eAuthor: 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
313 lines
6.9 KiB
Perl
Executable file
313 lines
6.9 KiB
Perl
Executable file
#! /usr/bin/perl -w
|
|
|
|
# Script to turn PCRE2 man pages into HTML
|
|
|
|
|
|
# Subroutine to handle font changes and other escapes
|
|
|
|
sub do_line {
|
|
my($s) = $_[0];
|
|
|
|
$s =~ s/</</g; # Deal with < and >
|
|
$s =~ s/>/>/g;
|
|
$s =~ s"\\fI(.*?)\\f[RP]"<i>$1</i>"g;
|
|
$s =~ s"\\fB(.*?)\\f[RP]"<b>$1</b>"g;
|
|
$s =~ s"\\e"\\"g;
|
|
$s =~ s/(?<=Copyright )\(c\)/©/g;
|
|
$s;
|
|
}
|
|
|
|
# Subroutine to ensure not in a paragraph
|
|
|
|
sub end_para {
|
|
if ($inpara)
|
|
{
|
|
print TEMP "</PRE>\n" if ($inpre);
|
|
print TEMP "</P>\n";
|
|
}
|
|
$inpara = $inpre = 0;
|
|
$wrotetext = 0;
|
|
}
|
|
|
|
# Subroutine to start a new paragraph
|
|
|
|
sub new_para {
|
|
&end_para();
|
|
print TEMP "<P>\n";
|
|
$inpara = 1;
|
|
}
|
|
|
|
|
|
# Main program
|
|
|
|
$innf = 0;
|
|
$inpara = 0;
|
|
$inpre = 0;
|
|
$wrotetext = 0;
|
|
$toc = 0;
|
|
$ref = 1;
|
|
|
|
while ($#ARGV >= 0 && $ARGV[0] =~ /^-/)
|
|
{
|
|
$toc = 1 if $ARGV[0] eq "-toc";
|
|
shift;
|
|
}
|
|
|
|
# Initial output to STDOUT
|
|
|
|
print <<End ;
|
|
<html>
|
|
<head>
|
|
<title>$ARGV[0] specification</title>
|
|
</head>
|
|
<body bgcolor="#FFFFFF" text="#00005A" link="#0066FF" alink="#3399FF" vlink="#2222BB">
|
|
<h1>$ARGV[0] man page</h1>
|
|
<p>
|
|
Return to the <a href="index.html">PCRE2 index page</a>.
|
|
</p>
|
|
<p>
|
|
This page is part of the PCRE2 HTML documentation. It was generated
|
|
automatically from the original man page. If there is any nonsense in it,
|
|
please consult the man page, in case the conversion went wrong.
|
|
<br>
|
|
End
|
|
|
|
print "<ul>\n" if ($toc);
|
|
|
|
open(TEMP, ">/tmp/$$") || die "Can't open /tmp/$$ for output\n";
|
|
|
|
while (<STDIN>)
|
|
{
|
|
# Handle lines beginning with a dot
|
|
|
|
if (/^\./)
|
|
{
|
|
# Some of the PCRE2 man pages used to contain instances of .br. However,
|
|
# they should have all been removed because they cause trouble in some
|
|
# (other) automated systems that translate man pages to HTML. Complain if
|
|
# we find .br or .in (another macro that is deprecated).
|
|
|
|
if (/^\.br/ || /^\.in/)
|
|
{
|
|
print STDERR "\n*** Deprecated macro encountered - rewrite needed\n";
|
|
print STDERR "*** $_\n";
|
|
die "*** Processing abandoned\n";
|
|
}
|
|
|
|
# Instead of .br, relevent "literal" sections are enclosed in .nf/.fi.
|
|
|
|
elsif (/^\.nf/)
|
|
{
|
|
$innf = 1;
|
|
}
|
|
|
|
elsif (/^\.fi/)
|
|
{
|
|
$innf = 0;
|
|
}
|
|
|
|
# Handling .sp is subtle. If it is inside a literal section, do nothing if
|
|
# the next line is a non literal text line; similarly, if not inside a
|
|
# literal section, do nothing if a literal follows, unless we are inside
|
|
# a .nf/.ne section. The point being that the <pre> and </pre> that delimit
|
|
# literal sections will do the spacing. Always skip if no previous output.
|
|
|
|
elsif (/^\.sp/)
|
|
{
|
|
if ($wrotetext)
|
|
{
|
|
$_ = <STDIN>;
|
|
if ($inpre)
|
|
{
|
|
print TEMP "\n" if (/^[\s.]/);
|
|
}
|
|
else
|
|
{
|
|
print TEMP "<br>\n<br>\n" if ($innf || !/^[\s.]/);
|
|
}
|
|
redo; # Now process the lookahead line we just read
|
|
}
|
|
}
|
|
elsif (/^\.TP/ || /^\.PP/ || /^\.P/)
|
|
{
|
|
&new_para();
|
|
}
|
|
elsif (/^\.SH\s*("?)(.*)\1/)
|
|
{
|
|
# Ignore the NAME section
|
|
if ($2 =~ /^NAME\b/)
|
|
{
|
|
<STDIN>;
|
|
next;
|
|
}
|
|
|
|
&end_para();
|
|
my($title) = &do_line($2);
|
|
if ($toc)
|
|
{
|
|
printf("<li><a name=\"TOC%d\" href=\"#SEC%d\">$title</a>\n",
|
|
$ref, $ref);
|
|
printf TEMP ("<br><a name=\"SEC%d\" href=\"#TOC1\">$title</a><br>\n",
|
|
$ref, $ref);
|
|
$ref++;
|
|
}
|
|
else
|
|
{
|
|
print TEMP "<br><b>\n$title\n</b><br>\n";
|
|
}
|
|
}
|
|
elsif (/^\.SS\s*("?)(.*)\1/)
|
|
{
|
|
&end_para();
|
|
my($title) = &do_line($2);
|
|
print TEMP "<br><b>\n$title\n</b><br>\n";
|
|
}
|
|
elsif (/^\.B\s*(.*)/)
|
|
{
|
|
&new_para() if (!$inpara);
|
|
$_ = &do_line($1);
|
|
s/"(.*?)"/$1/g;
|
|
print TEMP "<b>$_</b>\n";
|
|
$wrotetext = 1;
|
|
}
|
|
elsif (/^\.I\s*(.*)/)
|
|
{
|
|
&new_para() if (!$inpara);
|
|
$_ = &do_line($1);
|
|
s/"(.*?)"/$1/g;
|
|
print TEMP "<i>$_</i>\n";
|
|
$wrotetext = 1;
|
|
}
|
|
|
|
# A comment that starts "HREF" takes the next line as a name that
|
|
# is turned into a hyperlink, using the text given, which might be
|
|
# in a special font. If it ends in () or (digits) or punctuation, they
|
|
# aren't part of the link.
|
|
|
|
elsif (/^\.\\"\s*HREF/)
|
|
{
|
|
$_=<STDIN>;
|
|
chomp;
|
|
$_ = &do_line($_);
|
|
$_ =~ s/\s+$//;
|
|
$_ =~ /^(?:<.>)?([^<(]+)(?:\(\))?(?:<\/.>)?(?:\(\d+\))?[.,;:]?$/;
|
|
print TEMP "<a href=\"$1.html\">$_</a>\n";
|
|
}
|
|
|
|
# A comment that starts "HTML" inserts literal HTML
|
|
|
|
elsif (/^\.\\"\s*HTML\s*(.*)/)
|
|
{
|
|
print TEMP $1;
|
|
}
|
|
|
|
# A comment that starts < inserts that HTML at the end of the
|
|
# *next* input line - so as not to get a newline between them.
|
|
|
|
elsif (/^\.\\"\s*(<.*>)/)
|
|
{
|
|
my($markup) = $1;
|
|
$_=<STDIN>;
|
|
chomp;
|
|
$_ = &do_line($_);
|
|
$_ =~ s/\s+$//;
|
|
print TEMP "$_$markup\n";
|
|
}
|
|
|
|
# A comment that starts JOIN joins the next two lines together, with one
|
|
# space between them. Then that line is processed. This is used in some
|
|
# displays where two lines are needed for the "man" version. JOINSH works
|
|
# the same, except that it assumes this is a shell command, so removes
|
|
# continuation backslashes.
|
|
|
|
elsif (/^\.\\"\s*JOIN(SH)?/)
|
|
{
|
|
my($one,$two);
|
|
$one = <STDIN>;
|
|
$two = <STDIN>;
|
|
$one =~ s/\s*\\e\s*$// if (defined($1));
|
|
chomp($one);
|
|
$two =~ s/^\s+//;
|
|
$_ = "$one $two";
|
|
redo; # Process the joined lines
|
|
}
|
|
|
|
# .EX/.EE are used in the pcre2demo page to bracket the entire program,
|
|
# which is unmodified except for turning backslash into "\e".
|
|
|
|
elsif (/^\.EX\s*$/)
|
|
{
|
|
print TEMP "<PRE>\n";
|
|
while (<STDIN>)
|
|
{
|
|
last if /^\.EE\s*$/;
|
|
s/\\e/\\/g;
|
|
s/&/&/g;
|
|
s/</</g;
|
|
s/>/>/g;
|
|
print TEMP;
|
|
}
|
|
}
|
|
|
|
# Ignore anything not recognized
|
|
|
|
next;
|
|
}
|
|
|
|
# Line does not begin with a dot. Replace blank lines with new paragraphs
|
|
|
|
if (/^\s*$/)
|
|
{
|
|
&end_para() if ($wrotetext);
|
|
next;
|
|
}
|
|
|
|
# Convert fonts changes and output an ordinary line. Ensure that indented
|
|
# lines are marked as literal.
|
|
|
|
$_ = &do_line($_);
|
|
&new_para() if (!$inpara);
|
|
|
|
if (/^\s/)
|
|
{
|
|
if (!$inpre)
|
|
{
|
|
print TEMP "<pre>\n";
|
|
$inpre = 1;
|
|
}
|
|
}
|
|
elsif ($inpre)
|
|
{
|
|
print TEMP "</pre>\n";
|
|
$inpre = 0;
|
|
}
|
|
|
|
# Add <br> to the end of a non-literal line if we are within .nf/.fi
|
|
|
|
$_ .= "<br>\n" if (!$inpre && $innf);
|
|
|
|
print TEMP;
|
|
$wrotetext = 1;
|
|
}
|
|
|
|
# The TOC, if present, will have been written - terminate it
|
|
|
|
print "</ul>\n" if ($toc);
|
|
|
|
# Copy the remainder to the standard output
|
|
|
|
close(TEMP);
|
|
open(TEMP, "/tmp/$$") || die "Can't open /tmp/$$ for input\n";
|
|
|
|
print while (<TEMP>);
|
|
|
|
print <<End ;
|
|
<p>
|
|
Return to the <a href="index.html">PCRE2 index page</a>.
|
|
</p>
|
|
End
|
|
|
|
close(TEMP);
|
|
unlink("/tmp/$$");
|
|
|
|
# End
|