Mercurial > vim
changeset 25431:634aed775408 v8.2.3252
patch 8.2.3252: duplicated code for adding buffer lines
Commit: https://github.com/vim/vim/commit/4a15504e911bc90a29d862862f0b7a46d8acd12a
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Fri Jul 30 21:32:45 2021 +0200
patch 8.2.3252: duplicated code for adding buffer lines
Problem: Duplicated code for adding buffer lines.
Solution: Move code to a common function. Also move map functions to map.c.
(Yegappan Lakshmanan, closes #8665)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 30 Jul 2021 21:45:02 +0200 |
parents | e9d147592cfc |
children | 7802d2305b48 |
files | src/evalbuffer.c src/evalfunc.c src/map.c src/proto/map.pro src/version.c |
diffstat | 5 files changed, 53 insertions(+), 59 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalbuffer.c +++ b/src/evalbuffer.c @@ -287,10 +287,10 @@ f_append(typval_T *argvars, typval_T *re } /* - * "appendbufline(buf, lnum, string/list)" function + * Set or append lines to a buffer. */ - void -f_appendbufline(typval_T *argvars, typval_T *rettv) + static void +buf_set_append_line(typval_T *argvars, typval_T *rettv, int append) { linenr_T lnum; buf_T *buf; @@ -307,11 +307,20 @@ f_appendbufline(typval_T *argvars, typva else { lnum = tv_get_lnum_buf(&argvars[1], buf); - set_buffer_lines(buf, lnum, TRUE, &argvars[2], rettv); + set_buffer_lines(buf, lnum, append, &argvars[2], rettv); } } /* + * "appendbufline(buf, lnum, string/list)" function + */ + void +f_appendbufline(typval_T *argvars, typval_T *rettv) +{ + buf_set_append_line(argvars, rettv, TRUE); +} + +/* * "bufadd(expr)" function */ void @@ -837,23 +846,7 @@ f_getline(typval_T *argvars, typval_T *r void f_setbufline(typval_T *argvars, typval_T *rettv) { - linenr_T lnum; - buf_T *buf; - - if (in_vim9script() - && (check_for_buffer_arg(argvars, 0) == FAIL - || check_for_lnum_arg(argvars, 1) == FAIL - || check_for_string_or_number_or_list_arg(argvars, 2) == FAIL)) - return; - - buf = tv_get_buf(&argvars[0], FALSE); - if (buf == NULL) - rettv->vval.v_number = 1; // FAIL - else - { - lnum = tv_get_lnum_buf(&argvars[1], buf); - set_buffer_lines(buf, lnum, FALSE, &argvars[2], rettv); - } + buf_set_append_line(argvars, rettv, FALSE); } /*
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -98,8 +98,6 @@ static void f_line2byte(typval_T *argvar #ifdef FEAT_LUA static void f_luaeval(typval_T *argvars, typval_T *rettv); #endif -static void f_maparg(typval_T *argvars, typval_T *rettv); -static void f_mapcheck(typval_T *argvars, typval_T *rettv); static void f_match(typval_T *argvars, typval_T *rettv); static void f_matchend(typval_T *argvars, typval_T *rettv); static void f_matchlist(typval_T *argvars, typval_T *rettv); @@ -6734,40 +6732,6 @@ f_luaeval(typval_T *argvars, typval_T *r } #endif -/* - * "maparg()" function - */ - static void -f_maparg(typval_T *argvars, typval_T *rettv) -{ - if (in_vim9script() - && (check_for_string_arg(argvars, 0) == FAIL - || check_for_opt_string_arg(argvars, 1) == FAIL - || (argvars[1].v_type != VAR_UNKNOWN - && (check_for_opt_bool_arg(argvars, 2) == FAIL - || (argvars[2].v_type != VAR_UNKNOWN - && check_for_opt_bool_arg(argvars, 3) == FAIL))))) - return; - - get_maparg(argvars, rettv, TRUE); -} - -/* - * "mapcheck()" function - */ - static void -f_mapcheck(typval_T *argvars, typval_T *rettv) -{ - if (in_vim9script() - && (check_for_string_arg(argvars, 0) == FAIL - || check_for_opt_string_arg(argvars, 1) == FAIL - || (argvars[1].v_type != VAR_UNKNOWN - && check_for_opt_bool_arg(argvars, 2) == FAIL))) - return; - - get_maparg(argvars, rettv, FALSE); -} - typedef enum { MATCH_END, // matchend()
--- a/src/map.c +++ b/src/map.c @@ -2184,7 +2184,7 @@ check_map( return NULL; } - void + static void get_maparg(typval_T *argvars, typval_T *rettv, int exact) { char_u *keys; @@ -2288,6 +2288,40 @@ get_maparg(typval_T *argvars, typval_T * } /* + * "maparg()" function + */ + void +f_maparg(typval_T *argvars, typval_T *rettv) +{ + if (in_vim9script() + && (check_for_string_arg(argvars, 0) == FAIL + || check_for_opt_string_arg(argvars, 1) == FAIL + || (argvars[1].v_type != VAR_UNKNOWN + && (check_for_opt_bool_arg(argvars, 2) == FAIL + || (argvars[2].v_type != VAR_UNKNOWN + && check_for_opt_bool_arg(argvars, 3) == FAIL))))) + return; + + get_maparg(argvars, rettv, TRUE); +} + +/* + * "mapcheck()" function + */ + void +f_mapcheck(typval_T *argvars, typval_T *rettv) +{ + if (in_vim9script() + && (check_for_string_arg(argvars, 0) == FAIL + || check_for_opt_string_arg(argvars, 1) == FAIL + || (argvars[1].v_type != VAR_UNKNOWN + && check_for_opt_bool_arg(argvars, 2) == FAIL))) + return; + + get_maparg(argvars, rettv, FALSE); +} + +/* * "mapset()" function */ void
--- a/src/proto/map.pro +++ b/src/proto/map.pro @@ -17,7 +17,8 @@ int makemap(FILE *fd, buf_T *buf); int put_escstr(FILE *fd, char_u *strstart, int what); void check_map_keycodes(void); char_u *check_map(char_u *keys, int mode, int exact, int ign_mod, int abbr, mapblock_T **mp_ptr, int *local_ptr); -void get_maparg(typval_T *argvars, typval_T *rettv, int exact); +void f_maparg(typval_T *argvars, typval_T *rettv); +void f_mapcheck(typval_T *argvars, typval_T *rettv); void f_mapset(typval_T *argvars, typval_T *rettv); void init_mappings(void); void add_map(char_u *map, int mode);