mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-13 16:37:34 +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
58 lines
2.4 KiB
CMake
58 lines
2.4 KiB
CMake
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... )
|
|
# This macro is intended to be used in FindXXX.cmake modules files.
|
|
# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and
|
|
# it also sets the <UPPERCASED_NAME>_FOUND variable.
|
|
# The package is found if all variables listed are TRUE.
|
|
# Example:
|
|
#
|
|
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
|
|
#
|
|
# LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and
|
|
# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
|
|
# If it is not found and REQUIRED was used, it fails with FATAL_ERROR,
|
|
# independent whether QUIET was used or not.
|
|
# If it is found, the location is reported using the VAR1 argument, so
|
|
# here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out.
|
|
# If the second argument is DEFAULT_MSG, the message in the failure case will
|
|
# be "Could NOT find LibXml2", if you don't like this message you can specify
|
|
# your own custom failure message there.
|
|
|
|
MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
|
|
|
|
IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
|
|
IF (${_NAME}_FIND_REQUIRED)
|
|
SET(_FAIL_MESSAGE "Could not find REQUIRED package ${_NAME}")
|
|
ELSE (${_NAME}_FIND_REQUIRED)
|
|
SET(_FAIL_MESSAGE "Could not find OPTIONAL package ${_NAME}")
|
|
ENDIF (${_NAME}_FIND_REQUIRED)
|
|
ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
|
|
SET(_FAIL_MESSAGE "${_FAIL_MSG}")
|
|
ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
|
|
|
|
STRING(TOUPPER ${_NAME} _NAME_UPPER)
|
|
|
|
SET(${_NAME_UPPER}_FOUND TRUE)
|
|
IF(NOT ${_VAR1})
|
|
SET(${_NAME_UPPER}_FOUND FALSE)
|
|
ENDIF(NOT ${_VAR1})
|
|
|
|
FOREACH(_CURRENT_VAR ${ARGN})
|
|
IF(NOT ${_CURRENT_VAR})
|
|
SET(${_NAME_UPPER}_FOUND FALSE)
|
|
ENDIF(NOT ${_CURRENT_VAR})
|
|
ENDFOREACH(_CURRENT_VAR)
|
|
|
|
IF (${_NAME_UPPER}_FOUND)
|
|
IF (NOT ${_NAME}_FIND_QUIETLY)
|
|
MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}")
|
|
ENDIF (NOT ${_NAME}_FIND_QUIETLY)
|
|
ELSE (${_NAME_UPPER}_FOUND)
|
|
IF (${_NAME}_FIND_REQUIRED)
|
|
MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")
|
|
ELSE (${_NAME}_FIND_REQUIRED)
|
|
IF (NOT ${_NAME}_FIND_QUIETLY)
|
|
MESSAGE(STATUS "${_FAIL_MESSAGE}")
|
|
ENDIF (NOT ${_NAME}_FIND_QUIETLY)
|
|
ENDIF (${_NAME}_FIND_REQUIRED)
|
|
ENDIF (${_NAME_UPPER}_FOUND)
|
|
ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS)
|