Mercurial > vim
comparison src/proto/userfunc.pro @ 9723:80ac9cf77c9b v7.4.2137
commit https://github.com/vim/vim/commit/437bafe4c8a83ed71ee006eda7f54b65a90f0d4c
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 1 15:40:54 2016 +0200
patch 7.4.2137
Problem: Using function() with a name will find another function when it is
redefined.
Solution: Add funcref(). Refer to lambda using a partial. Fix several
reference counting issues.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Mon, 01 Aug 2016 15:45:07 +0200 |
parents | 6226de5f8137 |
children | f85d94eee05b |
comparison
equal
deleted
inserted
replaced
9722:1557241fd3a7 | 9723:80ac9cf77c9b |
---|---|
1 /* userfunc.c */ | 1 /* userfunc.c */ |
2 void func_init(void); | 2 void func_init(void); |
3 int get_lambda_tv(char_u **arg, typval_T *rettv, int evaluate); | 3 int get_lambda_tv(char_u **arg, typval_T *rettv, int evaluate); |
4 char_u *deref_func_name(char_u *name, int *lenp, partial_T **partialp, int no_autoload); | 4 char_u *deref_func_name(char_u *name, int *lenp, partial_T **partialp, int no_autoload); |
5 int get_func_tv(char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, partial_T *partial, dict_T *selfdict); | 5 int get_func_tv(char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, partial_T *partial, dict_T *selfdict); |
6 ufunc_T *find_func(char_u *name); | |
6 void free_all_functions(void); | 7 void free_all_functions(void); |
7 int func_call(char_u *name, typval_T *args, partial_T *partial, dict_T *selfdict, typval_T *rettv); | 8 int func_call(char_u *name, typval_T *args, partial_T *partial, dict_T *selfdict, typval_T *rettv); |
8 int call_func(char_u *funcname, int len, typval_T *rettv, int argcount_in, typval_T *argvars_in, int (*argv_func)(int, typval_T *, int), linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, partial_T *partial, dict_T *selfdict_in); | 9 int call_func(char_u *funcname, int len, typval_T *rettv, int argcount_in, typval_T *argvars_in, int (*argv_func)(int, typval_T *, int), linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, partial_T *partial, dict_T *selfdict_in); |
10 char_u *trans_function_name(char_u **pp, int skip, int flags, funcdict_T *fdp, partial_T **partial); | |
9 void ex_function(exarg_T *eap); | 11 void ex_function(exarg_T *eap); |
10 int eval_fname_script(char_u *p); | 12 int eval_fname_script(char_u *p); |
11 int translated_function_exists(char_u *name); | 13 int translated_function_exists(char_u *name); |
12 int function_exists(char_u *name, int no_deref); | 14 int function_exists(char_u *name, int no_deref); |
13 char_u *get_expanded_name(char_u *name, int check); | 15 char_u *get_expanded_name(char_u *name, int check); |
15 void prof_child_enter(proftime_T *tm); | 17 void prof_child_enter(proftime_T *tm); |
16 void prof_child_exit(proftime_T *tm); | 18 void prof_child_exit(proftime_T *tm); |
17 char_u *get_user_func_name(expand_T *xp, int idx); | 19 char_u *get_user_func_name(expand_T *xp, int idx); |
18 void ex_delfunction(exarg_T *eap); | 20 void ex_delfunction(exarg_T *eap); |
19 void func_unref(char_u *name); | 21 void func_unref(char_u *name); |
22 void func_ptr_unref(ufunc_T *fp); | |
20 void func_ref(char_u *name); | 23 void func_ref(char_u *name); |
24 void func_ptr_ref(ufunc_T *fp); | |
21 void ex_return(exarg_T *eap); | 25 void ex_return(exarg_T *eap); |
22 void ex_call(exarg_T *eap); | 26 void ex_call(exarg_T *eap); |
23 int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv); | 27 int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv); |
24 void discard_pending_return(void *rettv); | 28 void discard_pending_return(void *rettv); |
25 char_u *get_return_cmd(void *rettv); | 29 char_u *get_return_cmd(void *rettv); |
49 hashitem_T *find_hi_in_scoped_ht(char_u *name, char_u **varname, hashtab_T **pht); | 53 hashitem_T *find_hi_in_scoped_ht(char_u *name, char_u **varname, hashtab_T **pht); |
50 dictitem_T *find_var_in_scoped_ht(char_u *name, char_u **varname, int no_autoload); | 54 dictitem_T *find_var_in_scoped_ht(char_u *name, char_u **varname, int no_autoload); |
51 int set_ref_in_previous_funccal(int copyID); | 55 int set_ref_in_previous_funccal(int copyID); |
52 int set_ref_in_call_stack(int copyID); | 56 int set_ref_in_call_stack(int copyID); |
53 int set_ref_in_func_args(int copyID); | 57 int set_ref_in_func_args(int copyID); |
54 int set_ref_in_func(char_u *name, int copyID); | 58 int set_ref_in_func(char_u *name, ufunc_T *fp_in, int copyID); |
55 /* vim: set ft=c : */ | 59 /* vim: set ft=c : */ |