mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-25 12:23:09 +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
347 lines
7.2 KiB
Bash
Executable file
347 lines
7.2 KiB
Bash
Executable file
#! /bin/sh
|
|
# Wrapper for compilers which do not understand '-c -o'.
|
|
|
|
scriptversion=2012-10-14.11; # UTC
|
|
|
|
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
|
# Written by Tom Tromey <tromey@cygnus.com>.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2, or (at your option)
|
|
# any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
# distribute this file as part of a program that contains a
|
|
# configuration script generated by Autoconf, you may include it under
|
|
# the same distribution terms that you use for the rest of that program.
|
|
|
|
# This file is maintained in Automake, please report
|
|
# bugs to <bug-automake@gnu.org> or send patches to
|
|
# <automake-patches@gnu.org>.
|
|
|
|
nl='
|
|
'
|
|
|
|
# We need space, tab and new line, in precisely that order. Quoting is
|
|
# there to prevent tools from complaining about whitespace usage.
|
|
IFS=" "" $nl"
|
|
|
|
file_conv=
|
|
|
|
# func_file_conv build_file lazy
|
|
# Convert a $build file to $host form and store it in $file
|
|
# Currently only supports Windows hosts. If the determined conversion
|
|
# type is listed in (the comma separated) LAZY, no conversion will
|
|
# take place.
|
|
func_file_conv ()
|
|
{
|
|
file=$1
|
|
case $file in
|
|
/ | /[!/]*) # absolute file, and not a UNC file
|
|
if test -z "$file_conv"; then
|
|
# lazily determine how to convert abs files
|
|
case `uname -s` in
|
|
MINGW*)
|
|
file_conv=mingw
|
|
;;
|
|
CYGWIN*)
|
|
file_conv=cygwin
|
|
;;
|
|
*)
|
|
file_conv=wine
|
|
;;
|
|
esac
|
|
fi
|
|
case $file_conv/,$2, in
|
|
*,$file_conv,*)
|
|
;;
|
|
mingw/*)
|
|
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
|
;;
|
|
cygwin/*)
|
|
file=`cygpath -m "$file" || echo "$file"`
|
|
;;
|
|
wine/*)
|
|
file=`winepath -w "$file" || echo "$file"`
|
|
;;
|
|
esac
|
|
;;
|
|
esac
|
|
}
|
|
|
|
# func_cl_dashL linkdir
|
|
# Make cl look for libraries in LINKDIR
|
|
func_cl_dashL ()
|
|
{
|
|
func_file_conv "$1"
|
|
if test -z "$lib_path"; then
|
|
lib_path=$file
|
|
else
|
|
lib_path="$lib_path;$file"
|
|
fi
|
|
linker_opts="$linker_opts -LIBPATH:$file"
|
|
}
|
|
|
|
# func_cl_dashl library
|
|
# Do a library search-path lookup for cl
|
|
func_cl_dashl ()
|
|
{
|
|
lib=$1
|
|
found=no
|
|
save_IFS=$IFS
|
|
IFS=';'
|
|
for dir in $lib_path $LIB
|
|
do
|
|
IFS=$save_IFS
|
|
if $shared && test -f "$dir/$lib.dll.lib"; then
|
|
found=yes
|
|
lib=$dir/$lib.dll.lib
|
|
break
|
|
fi
|
|
if test -f "$dir/$lib.lib"; then
|
|
found=yes
|
|
lib=$dir/$lib.lib
|
|
break
|
|
fi
|
|
if test -f "$dir/lib$lib.a"; then
|
|
found=yes
|
|
lib=$dir/lib$lib.a
|
|
break
|
|
fi
|
|
done
|
|
IFS=$save_IFS
|
|
|
|
if test "$found" != yes; then
|
|
lib=$lib.lib
|
|
fi
|
|
}
|
|
|
|
# func_cl_wrapper cl arg...
|
|
# Adjust compile command to suit cl
|
|
func_cl_wrapper ()
|
|
{
|
|
# Assume a capable shell
|
|
lib_path=
|
|
shared=:
|
|
linker_opts=
|
|
for arg
|
|
do
|
|
if test -n "$eat"; then
|
|
eat=
|
|
else
|
|
case $1 in
|
|
-o)
|
|
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
|
eat=1
|
|
case $2 in
|
|
*.o | *.[oO][bB][jJ])
|
|
func_file_conv "$2"
|
|
set x "$@" -Fo"$file"
|
|
shift
|
|
;;
|
|
*)
|
|
func_file_conv "$2"
|
|
set x "$@" -Fe"$file"
|
|
shift
|
|
;;
|
|
esac
|
|
;;
|
|
-I)
|
|
eat=1
|
|
func_file_conv "$2" mingw
|
|
set x "$@" -I"$file"
|
|
shift
|
|
;;
|
|
-I*)
|
|
func_file_conv "${1#-I}" mingw
|
|
set x "$@" -I"$file"
|
|
shift
|
|
;;
|
|
-l)
|
|
eat=1
|
|
func_cl_dashl "$2"
|
|
set x "$@" "$lib"
|
|
shift
|
|
;;
|
|
-l*)
|
|
func_cl_dashl "${1#-l}"
|
|
set x "$@" "$lib"
|
|
shift
|
|
;;
|
|
-L)
|
|
eat=1
|
|
func_cl_dashL "$2"
|
|
;;
|
|
-L*)
|
|
func_cl_dashL "${1#-L}"
|
|
;;
|
|
-static)
|
|
shared=false
|
|
;;
|
|
-Wl,*)
|
|
arg=${1#-Wl,}
|
|
save_ifs="$IFS"; IFS=','
|
|
for flag in $arg; do
|
|
IFS="$save_ifs"
|
|
linker_opts="$linker_opts $flag"
|
|
done
|
|
IFS="$save_ifs"
|
|
;;
|
|
-Xlinker)
|
|
eat=1
|
|
linker_opts="$linker_opts $2"
|
|
;;
|
|
-*)
|
|
set x "$@" "$1"
|
|
shift
|
|
;;
|
|
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
|
|
func_file_conv "$1"
|
|
set x "$@" -Tp"$file"
|
|
shift
|
|
;;
|
|
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
|
|
func_file_conv "$1" mingw
|
|
set x "$@" "$file"
|
|
shift
|
|
;;
|
|
*)
|
|
set x "$@" "$1"
|
|
shift
|
|
;;
|
|
esac
|
|
fi
|
|
shift
|
|
done
|
|
if test -n "$linker_opts"; then
|
|
linker_opts="-link$linker_opts"
|
|
fi
|
|
exec "$@" $linker_opts
|
|
exit 1
|
|
}
|
|
|
|
eat=
|
|
|
|
case $1 in
|
|
'')
|
|
echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
|
exit 1;
|
|
;;
|
|
-h | --h*)
|
|
cat <<\EOF
|
|
Usage: compile [--help] [--version] PROGRAM [ARGS]
|
|
|
|
Wrapper for compilers which do not understand '-c -o'.
|
|
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
|
|
arguments, and rename the output as expected.
|
|
|
|
If you are trying to build a whole package this is not the
|
|
right script to run: please start by reading the file 'INSTALL'.
|
|
|
|
Report bugs to <bug-automake@gnu.org>.
|
|
EOF
|
|
exit $?
|
|
;;
|
|
-v | --v*)
|
|
echo "compile $scriptversion"
|
|
exit $?
|
|
;;
|
|
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
|
|
func_cl_wrapper "$@" # Doesn't return...
|
|
;;
|
|
esac
|
|
|
|
ofile=
|
|
cfile=
|
|
|
|
for arg
|
|
do
|
|
if test -n "$eat"; then
|
|
eat=
|
|
else
|
|
case $1 in
|
|
-o)
|
|
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
|
# So we strip '-o arg' only if arg is an object.
|
|
eat=1
|
|
case $2 in
|
|
*.o | *.obj)
|
|
ofile=$2
|
|
;;
|
|
*)
|
|
set x "$@" -o "$2"
|
|
shift
|
|
;;
|
|
esac
|
|
;;
|
|
*.c)
|
|
cfile=$1
|
|
set x "$@" "$1"
|
|
shift
|
|
;;
|
|
*)
|
|
set x "$@" "$1"
|
|
shift
|
|
;;
|
|
esac
|
|
fi
|
|
shift
|
|
done
|
|
|
|
if test -z "$ofile" || test -z "$cfile"; then
|
|
# If no '-o' option was seen then we might have been invoked from a
|
|
# pattern rule where we don't need one. That is ok -- this is a
|
|
# normal compilation that the losing compiler can handle. If no
|
|
# '.c' file was seen then we are probably linking. That is also
|
|
# ok.
|
|
exec "$@"
|
|
fi
|
|
|
|
# Name of file we expect compiler to create.
|
|
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
|
|
|
|
# Create the lock directory.
|
|
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
|
|
# that we are using for the .o file. Also, base the name on the expected
|
|
# object file name, since that is what matters with a parallel build.
|
|
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
|
|
while true; do
|
|
if mkdir "$lockdir" >/dev/null 2>&1; then
|
|
break
|
|
fi
|
|
sleep 1
|
|
done
|
|
# FIXME: race condition here if user kills between mkdir and trap.
|
|
trap "rmdir '$lockdir'; exit 1" 1 2 15
|
|
|
|
# Run the compile.
|
|
"$@"
|
|
ret=$?
|
|
|
|
if test -f "$cofile"; then
|
|
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
|
|
elif test -f "${cofile}bj"; then
|
|
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
|
|
fi
|
|
|
|
rmdir "$lockdir"
|
|
exit $ret
|
|
|
|
# Local Variables:
|
|
# mode: shell-script
|
|
# sh-indentation: 2
|
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
# time-stamp-start: "scriptversion="
|
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
# time-stamp-time-zone: "UTC"
|
|
# time-stamp-end: "; # UTC"
|
|
# End:
|