Mercurial > vim
diff src/evalvars.c @ 20725:f4455c71a8aa v8.2.0915
patch 8.2.0915: search() cannot skip over matches like searchpair() can
Commit: https://github.com/vim/vim/commit/adc17a5f9d207fd1623fd923457a46efc9214777
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 6 18:37:51 2020 +0200
patch 8.2.0915: search() cannot skip over matches like searchpair() can
Problem: Search() cannot skip over matches like searchpair() can.
Solution: Add an optional "skip" argument. (Christian Brabandt, closes https://github.com/vim/vim/issues/861)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 06 Jun 2020 18:45:03 +0200 |
parents | 70d561931721 |
children | ab27db64f1fb |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -3811,4 +3811,79 @@ free_callback(callback_T *callback) callback->cb_name = NULL; } +/* + * Process a function argument that can be a string expression or a function + * reference. + * "tv" must remain valid until calling evalarg_clean()! + * Returns FAIL when the argument is invalid. + */ + int +evalarg_get(typval_T *tv, evalarg_T *eva) +{ + if (tv->v_type == VAR_STRING + || tv->v_type == VAR_NUMBER + || tv->v_type == VAR_BOOL + || tv->v_type == VAR_SPECIAL) + { + eva->eva_string = tv_get_string_buf(tv, eva->eva_buf); + return OK; + } + + eva->eva_callback = get_callback(tv); + return eva->eva_callback.cb_name == NULL ? FAIL : OK; +} + +/* + * Return whether "eva" has a valid expression or callback. + */ + int +evalarg_valid(evalarg_T *eva) +{ + return eva->eva_string != NULL || eva->eva_callback.cb_name != NULL; +} + +/* + * Invoke the expression or callback "eva" and return the result in "tv". + * Returns FAIL if something failed + */ + int +evalarg_call(evalarg_T *eva, typval_T *tv) +{ + typval_T argv[1]; + + if (eva->eva_string != NULL) + return eval0(eva->eva_string, tv, NULL, EVAL_EVALUATE); + + argv[0].v_type = VAR_UNKNOWN; + return call_callback(&eva->eva_callback, -1, tv, 0, argv); +} + +/* + * Like evalarg_call(), but just return TRUE of FALSE. + * Sets "error" to TRUE if evaluation failed. + */ + int +evalarg_call_bool(evalarg_T *eva, int *error) +{ + typval_T tv; + int r; + + if (evalarg_call(eva, &tv) == FAIL) + { + *error = TRUE; + return FALSE; + } + r = tv_get_number(&tv); + clear_tv(&tv); + *error = FALSE; + return r; +} + + void +evalarg_clean(evalarg_T *eva) +{ + if (eva->eva_string == NULL) + free_callback(&eva->eva_callback); +} + #endif // FEAT_EVAL