Mercurial > vim
diff src/scriptfile.c @ 20538:9f921ba86d05 v8.2.0823
patch 8.2.0823: Vim9: script reload test is disabled
Commit: https://github.com/vim/vim/commit/25e0f5863e9010a75a1ff0d04e8f886403968755
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon May 25 22:36:50 2020 +0200
patch 8.2.0823: Vim9: script reload test is disabled
Problem: Vim9: script reload test is disabled.
Solution: Compile a function in the context of the script where it was
defined. Set execution stack for compiled function. Add a test
that an error is reported for the right file/function.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 25 May 2020 22:45:03 +0200 |
| parents | 8fa783f2c69c |
| children | 187c3fb42c8f |
line wrap: on
line diff
--- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -69,14 +69,31 @@ estack_push(etype_T type, char_u *name, * Add a user function to the execution stack. */ void -estack_push_ufunc(etype_T type, ufunc_T *ufunc, long lnum) +estack_push_ufunc(ufunc_T *ufunc, long lnum) { - estack_T *entry = estack_push(type, + estack_T *entry = estack_push(ETYPE_UFUNC, ufunc->uf_name_exp != NULL ? ufunc->uf_name_exp : ufunc->uf_name, lnum); if (entry != NULL) entry->es_info.ufunc = ufunc; } + +/* + * Return TRUE if "ufunc" with "lnum" is already at the top of the exe stack. + */ + int +estack_top_is_ufunc(ufunc_T *ufunc, long lnum) +{ + estack_T *entry; + + if (exestack.ga_len == 0) + return FALSE; + entry = ((estack_T *)exestack.ga_data) + exestack.ga_len - 1; + return entry->es_type == ETYPE_UFUNC + && STRCMP( entry->es_name, ufunc->uf_name_exp != NULL + ? ufunc->uf_name_exp : ufunc->uf_name) == 0 + && entry->es_lnum == lnum; +} #endif /*