Mercurial > vim
diff src/proto/eval.pro @ 20731:ab27db64f1fb v8.2.0918
patch 8.2.0918: duplicate code for evaluating expression argument
Commit: https://github.com/vim/vim/commit/a9c010494767e43a51c443cac35ebc80d0831d0b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 7 14:50:50 2020 +0200
patch 8.2.0918: duplicate code for evaluating expression argument
Problem: Duplicate code for evaluating expression argument.
Solution: Merge the code and make the use more flexible.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 07 Jun 2020 15:00:04 +0200 |
parents | f502455965c0 |
children | 7ee565134d4a |
line wrap: on
line diff
--- a/src/proto/eval.pro +++ b/src/proto/eval.pro @@ -4,6 +4,7 @@ varnumber_T num_modulus(varnumber_T n1, void eval_init(void); void eval_clear(void); int eval_to_bool(char_u *arg, int *error, char_u **nextcmd, int skip); +int eval_expr_valid_arg(typval_T *tv); int eval_expr_typval(typval_T *expr, typval_T *argv, int argc, typval_T *rettv); int eval_expr_to_bool(typval_T *expr, int *error); char_u *eval_to_string_skip(char_u *arg, char_u **nextcmd, int skip); @@ -19,14 +20,14 @@ void *call_func_retlist(char_u *func, in int eval_foldexpr(char_u *arg, int *cp); char_u *get_lval(char_u *name, typval_T *rettv, lval_T *lp, int unlet, int skip, int flags, int fne_flags); void clear_lval(lval_T *lp); -void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv, int copy, int is_const, char_u *op); +void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv, int copy, int flags, char_u *op); void *eval_for_line(char_u *arg, int *errp, char_u **nextcmdp, int skip); int next_for_item(void *fi_void, char_u *arg); void free_for_info(void *fi_void); void set_context_for_expression(expand_T *xp, char_u *arg, cmdidx_T cmdidx); int pattern_match(char_u *pat, char_u *text, int ic); -int eval0(char_u *arg, typval_T *rettv, char_u **nextcmd, int evaluate); -int eval1(char_u **arg, typval_T *rettv, int evaluate); +int eval0(char_u *arg, typval_T *rettv, char_u **nextcmd, int flags); +int eval1(char_u **arg, typval_T *rettv, int flags); void eval_addblob(typval_T *tv1, typval_T *tv2); int eval_addlist(typval_T *tv1, typval_T *tv2); char_u *partial_name(partial_T *pt); @@ -50,7 +51,7 @@ int get_name_len(char_u **arg, char_u ** char_u *find_name_end(char_u *arg, char_u **expr_start, char_u **expr_end, int flags); int eval_isnamec(int c); int eval_isnamec1(int c); -int handle_subscript(char_u **arg, typval_T *rettv, int evaluate, int verbose, char_u *start_leader, char_u **end_leaderp); +int handle_subscript(char_u **arg, typval_T *rettv, int flags, int verbose, char_u *start_leader, char_u **end_leaderp); int item_copy(typval_T *from, typval_T *to, int deep, int copyID); void echo_one(typval_T *rettv, int with_space, int *atstart, int *needclr); void ex_echo(exarg_T *eap);