diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-12-21 16:04:21 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-12-21 16:04:21 +0100 |
commit | d155d7a8519987361169459b8d464ae1caef5e9c (patch) | |
tree | 26d437fd67b33ca1b57aca568d4da40151bc9a81 /src/evalfunc.c | |
parent | 162b71479bd4dcdb3a2ef9198a1444f6f99e6843 (diff) |
patch 8.1.0615: get_tv function names are not consistentv8.1.0615
Problem: Get_tv function names are not consistent.
Solution: Rename to tv_get.
Diffstat (limited to 'src/evalfunc.c')
-rw-r--r-- | src/evalfunc.c | 822 |
1 files changed, 411 insertions, 411 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 15c625c8be..cbe2a4ebb5 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -1133,12 +1133,12 @@ non_zero_arg(typval_T *argvars) * Returns -1 on error. */ static linenr_T -get_tv_lnum(typval_T *argvars) +tv_get_lnum(typval_T *argvars) { typval_T rettv; linenr_T lnum; - lnum = (linenr_T)get_tv_number_chk(&argvars[0], NULL); + lnum = (linenr_T)tv_get_number_chk(&argvars[0], NULL); if (lnum == 0) /* no valid number, try using line() */ { rettv.v_type = VAR_NUMBER; @@ -1149,6 +1149,22 @@ get_tv_lnum(typval_T *argvars) return lnum; } +/* + * Get the lnum from the first argument. + * Also accepts "$", then "buf" is used. + * Returns 0 on error. + */ + static linenr_T +tv_get_lnum_buf(typval_T *argvars, buf_T *buf) +{ + if (argvars[0].v_type == VAR_STRING + && argvars[0].vval.v_string != NULL + && argvars[0].vval.v_string[0] == '$' + && buf != NULL) + return buf->b_ml.ml_line_count; + return (linenr_T)tv_get_number_chk(&argvars[0], NULL); +} + #ifdef FEAT_FLOAT /* * Get the float value of "argvars[0]" into "f". @@ -1187,7 +1203,7 @@ f_abs(typval_T *argvars, typval_T *rettv) varnumber_T n; int error = FALSE; - n = get_tv_number_chk(&argvars[0], &error); + n = tv_get_number_chk(&argvars[0], &error); if (error) rettv->vval.v_number = -1; else if (n > 0) @@ -1240,24 +1256,8 @@ f_add(typval_T *argvars, typval_T *rettv) static void f_and(typval_T *argvars, typval_T *rettv) { - rettv->vval.v_number = get_tv_number_chk(&argvars[0], NULL) - & get_tv_number_chk(&argvars[1], NULL); -} - -/* - * Get the lnum from the first argument. - * Also accepts "$", then "buf" is used. - * Returns 0 on error. - */ - static linenr_T -get_tv_lnum_buf(typval_T *argvars, buf_T *buf) -{ - if (argvars[0].v_type == VAR_STRING - && argvars[0].vval.v_string != NULL - && argvars[0].vval.v_string[0] == '$' - && buf != NULL) - return buf->b_ml.ml_line_count; - return (linenr_T)get_tv_number_chk(&argvars[0], NULL); + rettv->vval.v_number = tv_get_number_chk(&argvars[0], NULL) + & tv_get_number_chk(&argvars[1], NULL); } /* @@ -1330,7 +1330,7 @@ set_buffer_lines( li = l->lv_first; } else - line = get_tv_string_chk(lines); + line = tv_get_string_chk(lines); /* default result is zero == OK */ for (;;) @@ -1340,7 +1340,7 @@ set_buffer_lines( /* list argument, get next string */ if (li == NULL) break; - line = get_tv_string_chk(&li->li_tv); + line = tv_get_string_chk(&li->li_tv); li = li->li_next; } @@ -1411,7 +1411,7 @@ set_buffer_lines( static void f_append(typval_T *argvars, typval_T *rettv) { - linenr_T lnum = get_tv_lnum(&argvars[0]); + linenr_T lnum = tv_get_lnum(&argvars[0]); set_buffer_lines(curbuf, lnum, TRUE, &argvars[1], rettv); } @@ -1430,7 +1430,7 @@ f_appendbufline(typval_T *argvars, typval_T *rettv) rettv->vval.v_number = 1; /* FAIL */ else { - lnum = get_tv_lnum_buf(&argvars[1], buf); + lnum = tv_get_lnum_buf(&argvars[1], buf); set_buffer_lines(buf, lnum, TRUE, &argvars[2], rettv); } } @@ -1447,7 +1447,7 @@ f_argc(typval_T *argvars, typval_T *rettv) // use the current window rettv->vval.v_number = ARGCOUNT; else if (argvars[0].v_type == VAR_NUMBER - && get_tv_number(&argvars[0]) == -1) + && tv_get_number(&argvars[0]) == -1) // use the global argument list rettv->vval.v_number = GARGCOUNT; else @@ -1516,7 +1516,7 @@ f_argv(typval_T *argvars, typval_T *rettv) argcount = ARGCOUNT; } else if (argvars[1].v_type == VAR_NUMBER - && get_tv_number(&argvars[1]) == -1) + && tv_get_number(&argvars[1]) == -1) { arglist = GARGLIST; argcount = GARGCOUNT; @@ -1535,7 +1535,7 @@ f_argv(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; - idx = get_tv_number_chk(&argvars[0], NULL); + idx = tv_get_number_chk(&argvars[0], NULL); if (arglist != NULL && idx >= 0 && idx < argcount) rettv->vval.v_string = vim_strsave(alist_name(&arglist[idx])); else if (idx == -1) @@ -1717,7 +1717,7 @@ f_balloon_show(typval_T *argvars, typval_T *rettv UNUSED) ) post_balloon(balloonEval, NULL, argvars[0].vval.v_list); else - post_balloon(balloonEval, get_tv_string_chk(&argvars[0]), NULL); + post_balloon(balloonEval, tv_get_string_chk(&argvars[0]), NULL); } } @@ -1727,7 +1727,7 @@ f_balloon_split(typval_T *argvars, typval_T *rettv UNUSED) { if (rettv_list_alloc(rettv) == OK) { - char_u *msg = get_tv_string_chk(&argvars[0]); + char_u *msg = tv_get_string_chk(&argvars[0]); if (msg != NULL) { @@ -1762,10 +1762,10 @@ f_browse(typval_T *argvars UNUSED, typval_T *rettv) char_u buf2[NUMBUFLEN]; int error = FALSE; - save = (int)get_tv_number_chk(&argvars[0], &error); - title = get_tv_string_chk(&argvars[1]); - initdir = get_tv_string_buf_chk(&argvars[2], buf); - defname = get_tv_string_buf_chk(&argvars[3], buf2); + save = (int)tv_get_number_chk(&argvars[0], &error); + title = tv_get_string_chk(&argvars[1]); + initdir = tv_get_string_buf_chk(&argvars[2], buf); + defname = tv_get_string_buf_chk(&argvars[3], buf2); if (error || title == NULL || initdir == NULL || defname == NULL) rettv->vval.v_string = NULL; @@ -1790,8 +1790,8 @@ f_browsedir(typval_T *argvars UNUSED, typval_T *rettv) char_u *initdir; char_u buf[NUMBUFLEN]; - title = get_tv_string_chk(&argvars[0]); - initdir = get_tv_string_buf_chk(&argvars[1], buf); + title = tv_get_string_chk(&argvars[0]); + initdir = tv_get_string_buf_chk(&argvars[1], buf); if (title == NULL || initdir == NULL) rettv->vval.v_string = NULL; @@ -1924,7 +1924,7 @@ f_bufname(typval_T *argvars, typval_T *rettv) { buf_T *buf; - (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ + (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ ++emsg_off; buf = get_buf_tv(&argvars[0], FALSE); rettv->v_type = VAR_STRING; @@ -1945,7 +1945,7 @@ f_bufnr(typval_T *argvars, typval_T *rettv) int error = FALSE; char_u *name; - (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ + (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ ++emsg_off; buf = get_buf_tv(&argvars[0], FALSE); --emsg_off; @@ -1954,9 +1954,9 @@ f_bufnr(typval_T *argvars, typval_T *rettv) * new buffer. */ if (buf == NULL && argvars[1].v_type != VAR_UNKNOWN - && get_tv_number_chk(&argvars[1], &error) != 0 + && tv_get_number_chk(&argvars[1], &error) != 0 && !error - && (name = get_tv_string_chk(&argvars[0])) != NULL + && (name = tv_get_string_chk(&argvars[0])) != NULL && !error) buf = buflist_new(name, NULL, (linenr_T)1, 0); @@ -1973,7 +1973,7 @@ buf_win_common(typval_T *argvars, typval_T *rettv, int get_nr) int winnr = 0; buf_T *buf; - (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ + (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ ++emsg_off; buf = get_buf_tv(&argvars[0], TRUE); FOR_ALL_WINDOWS(wp) @@ -2015,7 +2015,7 @@ f_byte2line(typval_T *argvars UNUSED, typval_T *rettv) #else long boff = 0; - boff = get_tv_number(&argvars[0]) - 1; /* boff gets -1 on type error */ + boff = tv_get_number(&argvars[0]) - 1; /* boff gets -1 on type error */ if (boff < 0) rettv->vval.v_number = -1; else @@ -2033,8 +2033,8 @@ byteidx(typval_T *argvars, typval_T *rettv, int comp UNUSED) char_u *str; varnumber_T idx; - str = get_tv_string_chk(&argvars[0]); - idx = get_tv_number_chk(&argvars[1], NULL); + str = tv_get_string_chk(&argvars[0]); + idx = tv_get_number_chk(&argvars[1], NULL); rettv->vval.v_number = -1; if (str == NULL || idx < 0) return; @@ -2101,7 +2101,7 @@ f_call(typval_T *argvars, typval_T *rettv) func = partial_name(partial); } else - func = get_tv_string(&argvars[0]); + func = tv_get_string(&argvars[0]); if (*func == NUL) return; /* type error or empty name */ @@ -2189,7 +2189,7 @@ f_ch_getbufnr(typval_T *argvars, typval_T *rettv) rettv->vval.v_number = -1; if (channel != NULL) { - char_u *what = get_tv_string(&argvars[1]); + char_u *what = tv_get_string(&argvars[1]); int part; if (STRCMP(what, "err") == 0) @@ -2241,7 +2241,7 @@ f_ch_info(typval_T *argvars, typval_T *rettv UNUSED) static void f_ch_log(typval_T *argvars, typval_T *rettv UNUSED) { - char_u *msg = get_tv_string(&argvars[0]); + char_u *msg = tv_get_string(&argvars[0]); channel_T *channel = NULL; if (argvars[1].v_type != VAR_UNKNOWN) @@ -2263,9 +2263,9 @@ f_ch_logfile(typval_T *argvars, typval_T *rettv UNUSED) /* Don't open a file in restricted mode. */ if (check_restricted() || check_secure()) return; - fname = get_tv_string(&argvars[0]); + fname = tv_get_string(&argvars[0]); if (argvars[1].v_type == VAR_STRING) - opt = get_tv_string_buf(&argvars[1], buf); + opt = tv_get_string_buf(&argvars[1], buf); ch_logfile(fname, opt); } @@ -2403,16 +2403,16 @@ f_char2nr(typval_T *argvars, typval_T *rettv) int utf8 = 0; if (argvars[1].v_type != VAR_UNKNOWN) - utf8 = (int)get_tv_number_chk(&argvars[1], NULL); + utf8 = (int)tv_get_number_chk(&argvars[1], NULL); if (utf8) - rettv->vval.v_number = (*utf_ptr2char)(get_tv_string(&argvars[0])); + rettv->vval.v_number = (*utf_ptr2char)(tv_get_string(&argvars[0])); else - rettv->vval.v_number = (*mb_ptr2char)(get_tv_string(&argvars[0])); + rettv->vval.v_number = (*mb_ptr2char)(tv_get_string(&argvars[0])); } else #endif - rettv->vval.v_number = get_tv_string(&argvars[0])[0]; + rettv->vval.v_number = tv_get_string(&argvars[0])[0]; } /* @@ -2426,7 +2426,7 @@ f_cindent(typval_T *argvars UNUSED, typval_T *rettv) linenr_T lnum; pos = curwin->w_cursor; - lnum = get_tv_lnum(argvars); + lnum = tv_get_lnum(argvars); if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count) { curwin->w_cursor.lnum = lnum; @@ -2526,7 +2526,7 @@ f_complete(typval_T *argvars, typval_T *rettv UNUSED) return; } - startcol = (int)get_tv_number_chk(&argvars[0], NULL); + startcol = (int)tv_get_number_chk(&argvars[0], NULL); if (startcol <= 0) return; @@ -2573,20 +2573,20 @@ f_confirm(typval_T *argvars UNUSED, typval_T *rettv UNUSED) char_u *typestr; int error = FALSE; - message = get_tv_string_chk(&argvars[0]); + message = tv_get_string_chk(&argvars[0]); if (message == NULL) error = TRUE; if (argvars[1].v_type != VAR_UNKNOWN) { - buttons = get_tv_string_buf_chk(&argvars[1], buf); + buttons = tv_get_string_buf_chk(&argvars[1], buf); if (buttons == NULL) error = TRUE; if (argvars[2].v_type != VAR_UNKNOWN) { - def = (int)get_tv_number_chk(&argvars[2], &error); + def = (int)tv_get_number_chk(&argvars[2], &error); if (argvars[3].v_type != VAR_UNKNOWN) { - typestr = get_tv_string_buf_chk(&argvars[3], buf2); + typestr = tv_get_string_buf_chk(&argvars[3], buf2); if (typestr == NULL) error = TRUE; else @@ -2665,11 +2665,11 @@ f_count(typval_T *argvars, typval_T *rettv) int error = FALSE; if (argvars[2].v_type != VAR_UNKNOWN) - ic = (int)get_tv_number_chk(&argvars[2], &error); + ic = (int)tv_get_number_chk(&argvars[2], &error); if (argvars[0].v_type == VAR_STRING) { - char_u *expr = get_tv_string_chk(&argvars[1]); + char_u *expr = tv_get_string_chk(&argvars[1]); char_u *p = argvars[0].vval.v_string; char_u *next; @@ -2713,7 +2713,7 @@ f_count(typval_T *argvars, typval_T *rettv) { if (argvars[3].v_type != VAR_UNKNOWN) { - idx = (long)get_tv_number_chk(&argvars[3], &error); + idx = (long)tv_get_number_chk(&argvars[3], &error); if (!error) { li = list_find(l, idx); @@ -2778,10 +2778,10 @@ f_cscope_connection(typval_T *argvars UNUSED, typval_T *rettv UNUSED) if (argvars[0].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_UNKNOWN) { - num = (int)get_tv_number(&argvars[0]); - dbpath = get_tv_string(&argvars[1]); + num = (int)tv_get_number(&argvars[0]); + dbpath = tv_get_string(&argvars[1]); if (argvars[2].v_type != VAR_UNKNOWN) - prepend = get_tv_string_buf(&argvars[2], buf); + prepend = tv_get_string_buf(&argvars[2], buf); } rettv->vval.v_number = cs_connection(num, dbpath, prepend); @@ -2828,11 +2828,11 @@ f_cursor(typval_T *argvars, typval_T *rettv) } else { - line = get_tv_lnum(argvars); - col = (long)get_tv_number_chk(&argvars[1], NULL); + line = tv_get_lnum(argvars); + col = (long)tv_get_number_chk(&argvars[1], NULL); #ifdef FEAT_VIRTUALEDIT if (argvars[2].v_type != VAR_UNKNOWN) - coladd = (long)get_tv_number_chk(&argvars[2], NULL); + coladd = (long)tv_get_number_chk(&argvars[2], NULL); #endif } if (line < 0 || col < 0 @@ -2871,7 +2871,7 @@ f_debugbreak(typval_T *argvars, typval_T *rettv) int pid; rettv->vval.v_number = FAIL; - pid = (int)get_tv_number(&argvars[0]); + pid = (int)tv_get_number(&argvars[0]); if (pid == 0) EMSG(_(e_invarg)); else @@ -2898,7 +2898,7 @@ f_deepcopy(typval_T *argvars, typval_T *rettv) int copyID; if (argvars[1].v_type != VAR_UNKNOWN) - noref = (int)get_tv_number_chk(&argvars[1], NULL); + noref = (int)tv_get_number_chk(&argvars[1], NULL); if (noref < 0 || noref > 1) EMSG(_(e_invarg)); else @@ -2922,7 +2922,7 @@ f_delete(typval_T *argvars, typval_T *rettv) if (check_restricted() || check_secure()) return; - name = get_tv_string(&argvars[0]); + name = tv_get_string(&argvars[0]); if (name == NULL || *name == NUL) { EMSG(_(e_invarg)); @@ -2930,7 +2930,7 @@ f_delete(typval_T *argvars, typval_T *rettv) } if (argvars[1].v_type != VAR_UNKNOWN) - flags = get_tv_string_buf(&argvars[1], nbuf); + flags = tv_get_string_buf(&argvars[1], nbuf); else flags = (char_u *)""; @@ -2971,9 +2971,9 @@ f_deletebufline(typval_T *argvars, typval_T *rettv) } is_curbuf = buf == curbuf; - first = get_tv_lnum_buf(&argvars[1], buf); + first = tv_get_lnum_buf(&argvars[1], buf); if (argvars[2].v_type != VAR_UNKNOWN) - last = get_tv_lnum_buf(&argvars[2], buf); + last = tv_get_lnum_buf(&argvars[2], buf); else last = first; @@ -3048,7 +3048,7 @@ f_did_filetype(typval_T *argvars UNUSED, typval_T *rettv UNUSED) f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED) { #ifdef FEAT_DIFF - rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars)); + rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars)); #endif } @@ -3059,7 +3059,7 @@ f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED) f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED) { #ifdef FEAT_DIFF - linenr_T lnum = get_tv_lnum(argvars); + linenr_T lnum = tv_get_lnum(argvars); static linenr_T prev_lnum = 0; static varnumber_T changedtick = 0; static int fnum = 0; @@ -3100,7 +3100,7 @@ f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED) if (hlID == HLF_CHD || hlID == HLF_TXD) { - col = get_tv_number(&argvars[1]) - 1; /* ignore type error in {col} */ + col = tv_get_number(&argvars[1]) - 1; /* ignore type error in {col} */ if (col >= change_start && col <= change_end) hlID = HLF_TXD; /* changed text */ else @@ -3177,8 +3177,8 @@ f_escape(typval_T *argvars, typval_T *rettv) { char_u buf[NUMBUFLEN]; - rettv->vval.v_string = vim_strsave_escaped(get_tv_string(&argvars[0]), - get_tv_string_buf(&argvars[1], buf)); + rettv->vval.v_string = vim_strsave_escaped(tv_get_string(&argvars[0]), + tv_get_string_buf(&argvars[1], buf)); rettv->v_type = VAR_STRING; } @@ -3190,7 +3190,7 @@ f_eval(typval_T *argvars, typval_T *rettv) { char_u *s, *p; - s = get_tv_string_chk(&argvars[0]); + s = tv_get_string_chk(&argvars[0]); if (s != NULL) s = skipwhite(s); @@ -3222,7 +3222,7 @@ f_eventhandler(typval_T *argvars UNUSED, typval_T *rettv) static void f_executable(typval_T *argvars, typval_T *rettv) { - char_u *name = get_tv_string(&argvars[0]); + char_u *name = tv_get_string(&argvars[0]); /* Check in $PATH and also check directly if there is a directory name. */ rettv->vval.v_number = mch_can_exe(name, NULL, TRUE) @@ -3270,7 +3270,7 @@ get_list_line( if (item == NULL) return NULL; - s = get_tv_string_buf_chk(&item->li_tv, buf); + s = tv_get_string_buf_chk(&item->li_tv, buf); *p = item->li_next; return s == NULL ? NULL : vim_strsave(s); } @@ -3305,7 +3305,7 @@ f_execute(typval_T *argvars, typval_T *rettv) } else { - cmd = get_tv_string_chk(&argvars[0]); + cmd = tv_get_string_chk(&argvars[0]); if (cmd == NULL) return; } @@ -3313,7 +3313,7 @@ f_execute(typval_T *argvars, typval_T *rettv) if (argvars[1].v_type != VAR_UNKNOWN) { char_u buf[NUMBUFLEN]; - char_u *s = get_tv_string_buf_chk(&argvars[1], buf); + char_u *s = tv_get_string_buf_chk(&argvars[1], buf); if (s == NULL) return; @@ -3388,7 +3388,7 @@ f_exepath(typval_T *argvars, typval_T *rettv) { char_u *p = NULL; - (void)mch_can_exe(get_tv_string(&argvars[0]), &p, TRUE); + (void)mch_can_exe(tv_get_string(&argvars[0]), &p, TRUE); rettv->v_type = VAR_STRING; rettv->vval.v_string = p; } @@ -3402,7 +3402,7 @@ f_exists(typval_T *argvars, typval_T *rettv) char_u *p; int n = FALSE; - p = get_tv_string(&argvars[0]); + p = tv_get_string(&argvars[0]); if (*p == '$') /* environment variable */ { /* first try "normal" environment variables (fast) */ @@ -3480,13 +3480,13 @@ f_expand(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_STRING; if (argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN - && get_tv_number_chk(&argvars[2], &error) + && tv_get_number_chk(&argvars[2], &error) && !error) { rettv_list_set(rettv, NULL); } - s = get_tv_string(&argvars[0]); + s = tv_get_string(&argvars[0]); if (*s == '%' || *s == '#' || *s == '<') { ++emsg_off; @@ -3507,7 +3507,7 @@ f_expand(typval_T *argvars, typval_T *rettv) /* When the optional second argument is non-zero, don't remove matches * for 'wildignore' and don't put matches for 'suffixes' at the end. */ if (argvars[1].v_type != VAR_UNKNOWN - && get_tv_number_chk(&argvars[1], &error)) + && tv_get_number_chk(&argvars[1], &error)) options |= WILD_KEEP_ALL; if (!error) { @@ -3556,7 +3556,7 @@ f_extend(typval_T *argvars, typval_T *rettv) { if (argvars[2].v_type != VAR_UNKNOWN) { - before = (long)get_tv_number_chk(&argvars[2], &error); + before = (long)tv_get_number_chk(&argvars[2], &error); if (error) return; /* type error; errmsg already given */ @@ -3595,7 +3595,7 @@ f_extend(typval_T *argvars, typval_T *rettv) { static char *(av[]) = {"keep", "force", "error"}; - action = get_tv_string_chk(&argvars[2]); + action = tv_get_string_chk(&argvars[2]); if (action == NULL) return; /* type error; errmsg already given */ for (i = 0; i < 3; ++i) @@ -3640,11 +3640,11 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED) if (check_secure()) return; - keys = get_tv_string(&argvars[0]); + keys = tv_get_string(&argvars[0]); if (argvars[1].v_type != VAR_UNKNOWN) { - flags = get_tv_string_buf(&argvars[1], nbuf); + flags = tv_get_string_buf(&argvars[1], nbuf); for ( ; *flags != NUL; ++flags) { switch (*flags) @@ -3707,7 +3707,7 @@ f_filereadable(typval_T *argvars, typval_T *rettv) #ifndef O_NONBLOCK # define O_NONBLOCK 0 #endif - p = get_tv_string(&argvars[0]); + p = tv_get_string(&argvars[0]); if (*p && !mch_isdir(p) && (fd = mch_open((char *)p, O_RDONLY | O_NONBLOCK, 0)) >= 0) { @@ -3727,7 +3727,7 @@ f_filereadable(typval_T *argvars, typval_T *rettv) static void f_filewritable(typval_T *argvars, typval_T *rettv) { - rettv->vval.v_number = filewritable(get_tv_string(&argvars[0])); + rettv->vval.v_number = filewritable(tv_get_string(&argvars[0])); } static void @@ -3751,11 +3751,11 @@ findfilendir( rettv->v_type = VAR_STRING; #ifdef FEAT_SEARCHPATH - fname = get_tv_string(&argvars[0]); + fname = tv_get_string(&argvars[0]); if (argvars[1].v_type != VAR_UNKNOWN) { - p = get_tv_string_buf_chk(&argvars[1], pathbuf); + p = tv_get_string_buf_chk(&argvars[1], pathbuf); if (p == NULL) error = TRUE; else @@ -3764,7 +3764,7 @@ findfilendir( path = p; if (argvars[2].v_type != VAR_UNKNOWN) - count = (int)get_tv_number_chk(&argvars[2], &error); + count = (int)tv_get_number_chk(&argvars[2], &error); } } @@ -3883,7 +3883,7 @@ f_fmod(typval_T *argvars, typval_T *rettv) f_fnameescape(typval_T *argvars, typval_T *rettv) { rettv->vval.v_string = vim_strsave_fnameescape( - get_tv_string(&argvars[0]), FALSE); + tv_get_string(&argvars[0]), FALSE); rettv->v_type = VAR_STRING; } @@ -3900,8 +3900,8 @@ f_fnamemodify(typval_T *argvars, typval_T *rettv) char_u *fbuf = NULL; char_u buf[NUMBUFLEN]; - fname = get_tv_string_chk(&argvars[0]); - mods = get_tv_string_buf_chk(&argvars[1], buf); + fname = tv_get_string_chk(&argvars[0]); + mods = tv_get_string_buf_chk(&argvars[1], buf); if (fname == NULL || mods == NULL) fname = NULL; else @@ -3931,7 +3931,7 @@ foldclosed_both( linenr_T lnum; linenr_T first, last; - lnum = get_tv_lnum(argvars); + lnum = tv_get_lnum(argvars); if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count) { if (hasFoldingWin(curwin, lnum, &first, &last, FALSE, NULL)) @@ -3974,7 +3974,7 @@ f_foldlevel(typval_T *argvars UNUSED, typval_T *rettv UNUSED) #ifdef FEAT_FOLDING linenr_T lnum; - lnum = get_tv_lnum(argvars); + lnum = tv_get_lnum(argvars); if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count) rettv->vval.v_number = foldLevel(lnum); #endif @@ -4067,7 +4067,7 @@ f_foldtextresult(typval_T *argvars UNUSED, typval_T *rettv) return; /* reject recursive use */ entered = TRUE; - lnum = get_tv_lnum(argvars); + lnum = tv_get_lnum(argvars); /* treat illegal types and illegal string values for {lnum} the same */ if (lnum < 0) lnum = 0; @@ -4125,7 +4125,7 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref) else { /* function('MyFunc', [arg], dict) */ - s = get_tv_string(&argvars[0]); + s = tv_get_string(&argvars[0]); use_string = TRUE; } @@ -4140,7 +4140,7 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref) if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s)) || (is_funcref && trans_name == NULL)) - EMSG2(_(e_invarg2), use_string ? get_tv_string(&argvars[0]) : s); + EMSG2(_(e_invarg2), use_string ? tv_get_string(&argvars[0]) : s); /* Don't check an autoload name for existence here. */ else if (trans_name != NULL && (is_funcref ? find_func(trans_name) == NULL @@ -4327,7 +4327,7 @@ f_garbagecollect(typval_T *argvars, typval_T *rettv UNUSED) * using Lists and Dicts internally. E.g.: ":echo [garbagecollect()]". */ want_garbage_collect = TRUE; - if (argvars[0].v_type != VAR_UNKNOWN && get_tv_number(&argvars[0]) == 1) + if (argvars[0].v_type != VAR_UNKNOWN && tv_get_number(&argvars[0]) == 1) garbage_collect_at_exit = TRUE; } @@ -4349,7 +4349,7 @@ f_get(typval_T *argvars, typval_T *rettv) { int error = FALSE; - li = list_find(l, (long)get_tv_number_chk(&argvars[1], &error)); + li = list_find(l, (long)tv_get_number_chk(&argvars[1], &error)); if (!error && li != NULL) tv = &li->li_tv; } @@ -4358,7 +4358,7 @@ f_get(typval_T *argvars, typval_T *rettv) { if ((d = argvars[0].vval.v_dict) != NULL) { - di = dict_find(d, get_tv_string(&argvars[1]), -1); + di = dict_find(d, tv_get_string(&argvars[1]), -1); if (di != NULL) tv = &di->di_tv; } @@ -4379,7 +4379,7 @@ f_get(typval_T *argvars, typval_T *rettv) if (pt != NULL) { - char_u *what = get_tv_string(&argvars[1]); + char_u *what = tv_get_string(&argvars[1]); char_u *n; if (STRCMP(what, "func") == 0 || STRCMP(what, "name") == 0) @@ -4527,22 +4527,22 @@ f_getbufinfo(typval_T *argvars, typval_T *rettv) filtered = TRUE; di = dict_find(sel_d, (char_u *)"buflisted", -1); - if (di != NULL && get_tv_number(&di->di_tv)) + if (di != NULL && tv_get_number(&di->di_tv)) sel_buflisted = TRUE; di = dict_find(sel_d, (char_u *)"bufloaded", -1); - if (di != NULL && get_tv_number(&di->di_tv)) + if (di != NULL && tv_get_number(&di->di_tv)) sel_bufloaded = TRUE; di = dict_find(sel_d, (char_u *)"bufmodified", -1); - if (di != NULL && get_tv_number(&di->di_tv)) + if (di != NULL && tv_get_number(&di->di_tv)) sel_bufmodified = TRUE; } } else if (argvars[0].v_type != VAR_UNKNOWN) { /* Information about one buffer. Argument specifies the buffer */ - (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ + (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ ++emsg_off; argbuf = get_buf_tv(&argvars[0], FALSE); --emsg_off; @@ -4626,16 +4626,16 @@ f_getbufline(typval_T *argvars, typval_T *rettv) linenr_T end; buf_T *buf; - (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ + (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ ++emsg_off; buf = get_buf_tv(&argvars[0], FALSE); --emsg_off; - lnum = get_tv_lnum_buf(&argvars[1], buf); + lnum = tv_get_lnum_buf(&argvars[1], buf); if (argvars[2].v_type == VAR_UNKNOWN) end = lnum; else - end = get_tv_lnum_buf(&argvars[2], buf); + end = tv_get_lnum_buf(&argvars[2], buf); get_buffer_lines(buf, lnum, end, TRUE, rettv); } @@ -4652,8 +4652,8 @@ f_getbufvar(typval_T *argvars, typval_T *rettv) dictitem_T *v; int done = FALSE; - (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ - varname = get_tv_string_chk(&argvars[1]); + (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ + varname = tv_get_string_chk(&argvars[1]); ++emsg_off; buf = get_buf_tv(&argvars[0], FALSE); @@ -4724,7 +4724,7 @@ f_getchangelist(typval_T *argvars, typval_T *rettv) return; #ifdef FEAT_JUMPLIST - (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ + (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ ++emsg_off; buf = get_buf_tv(&argvars[0], FALSE); --emsg_off; @@ -4788,7 +4788,7 @@ f_getchar(typval_T *argvars, typval_T *rettv) if (argvars[0].v_type == VAR_UNKNOWN) /* getchar(): blocking wait. */ n = plain_vgetc(); - else if (get_tv_number_chk(&argvars[0], &error) == 1) + else if (tv_get_number_chk(&argvars[0], &error) == 1) /* getchar(1): only check if char avail */ n = vpeekc_any(); else if (error || vpeekc_any() == NUL) @@ -4960,7 +4960,7 @@ f_getcompletion(typval_T *argvars, typval_T *rettv) | WILD_NO_BEEP; if (argvars[2].v_type != VAR_UNKNOWN) - filtered = get_tv_number_chk(&argvars[2], NULL); + filtered = tv_get_number_chk(&argvars[2], NULL); if (p_wic) options |= WILD_ICASE; @@ -4970,9 +4970,9 @@ f_getcompletion(typval_T *argvars, typval_T *rettv) options |= WILD_KEEP_ALL; ExpandInit(&xpc); - xpc.xp_pattern = get_tv_string(&argvars[0]); + xpc.xp_pattern = tv_get_string(&argvars[0]); xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); - xpc.xp_context = cmdcomplete_str_to_type(get_tv_string(&argvars[1])); + xpc.xp_context = cmdcomplete_str_to_type(tv_get_string(&argvars[1])); if (xpc.xp_context == EXPAND_NOTHING) { if (argvars[1].v_type == VAR_STRING) @@ -5083,7 +5083,7 @@ f_getfontname(typval_T *argvars UNUSED, typval_T *rettv) } else { - name = get_tv_string(&argvars[0]); + name = tv_get_string(&argvars[0]); if (STRCMP(name, "*") == 0) /* don't use font dialog */ return; font = gui_mch_get_font(name, FALSE); @@ -5109,7 +5109,7 @@ f_getfperm(typval_T *argvars, typval_T *rettv) char_u flags[] = "rwx"; int i; - fname = get_tv_string(&argvars[0]); + fname = tv_get_string(&argvars[0]); rettv->v_type = VAR_STRING; if (mch_stat((char *)fname, &st) >= 0) @@ -5136,7 +5136,7 @@ f_getfsize(typval_T *argvars, typval_T *rettv) char_u *fname; stat_T st; - fname = get_tv_string(&argvars[0]); + fname = tv_get_string(&argvars[0]); rettv->v_type = VAR_NUMBER; @@ -5166,7 +5166,7 @@ f_getftime(typval_T *argvars, typval_T *rettv) char_u *fname; stat_T st; - fname = get_tv_string(&argvars[0]); + fname = tv_get_string(&argvars[0]); if (mch_stat((char *)fname, &st) >= 0) rettv->vval.v_number = (varnumber_T)st.st_mtime; @@ -5185,7 +5185,7 @@ f_getftype(typval_T *argvars, typval_T *rettv) char_u *type = NULL; char *t; - fname = get_tv_string(&argvars[0]); + fname = tv_get_string(&argvars[0]); rettv->v_type = VAR_STRING; if (mch_lstat((char *)fname, &st) >= 0) @@ -5272,7 +5272,7 @@ f_getline(typval_T *argvars, typval_T *rettv) linenr_T end; int retlist; - lnum = get_tv_lnum(argvars); + lnum = tv_get_lnum(argvars); if (argvars[1].v_type == VAR_UNKNOWN) { end = 0; @@ -5280,7 +5280,7 @@ f_getline(typval_T *argvars, typval_T *rettv) } else { - end = get_tv_lnum(&argvars[1]); + end = tv_get_lnum(&argvars[1]); retlist = TRUE; } @@ -5490,13 +5490,13 @@ f_getreg(typval_T *argvars, typval_T *rettv) if (argvars[0].v_type != VAR_UNKNOWN) { - strregname = get_tv_string_chk(&argvars[0]); + strregname = tv_get_string_chk(&argvars[0]); error = strregname == NULL; if (argvars[1].v_type != VAR_UNKNOWN) { - arg2 = (int)get_tv_number_chk(&argvars[1], &error); + arg2 = (int)tv_get_number_chk(&argvars[1], &error); if (!error && argvars[2].v_type != VAR_UNKNOWN) - return_list = (int)get_tv_number_chk(&argvars[2], &error); + return_list = (int)tv_get_number_chk(&argvars[2], &error); } } else @@ -5540,7 +5540,7 @@ f_getregtype(typval_T *argvars, typval_T *rettv) if (argvars[0].v_type != VAR_UNKNOWN) { - strregname = get_tv_string_chk(&argvars[0]); + strregname = tv_get_string_chk(&argvars[0]); if (strregname == NULL) /* type error; errmsg already given */ { rettv->v_type = VAR_STRING; @@ -5619,7 +5619,7 @@ f_gettabinfo(typval_T *argvars, typval_T *rettv) if (argvars[0].v_type != VAR_UNKNOWN) { /* Information about one tab page */ - tparg = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL)); + tparg = find_tabpage((int)tv_get_number_chk(&argvars[0], NULL)); if (tparg == NULL) return; } @@ -5653,8 +5653,8 @@ f_gettabvar(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; - varname = get_tv_string_chk(&argvars[1]); - tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL)); + varname = tv_get_string_chk(&argvars[1]); + tp = find_tabpage((int)tv_get_number_chk(&argvars[0], NULL)); if (tp != NULL && varname != NULL) { /* Set tp to be our tabpage, temporarily. Also set the window to the @@ -5879,7 +5879,7 @@ f_getwinpos(typval_T *argvars UNUSED, typval_T *rettv) varnumber_T timeout = 100; if (argvars[0].v_type != VAR_UNKNOWN) - timeout = get_tv_number(&argvars[0]); + timeout = tv_get_number(&argvars[0]); term_get_winpos(&x, &y, timeout); } #endif @@ -5966,16 +5966,16 @@ f_glob(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_STRING; if (argvars[1].v_type != VAR_UNKNOWN) { - if (get_tv_number_chk(&argvars[1], &error)) + if (tv_get_number_chk(&argvars[1], &error)) options |= WILD_KEEP_ALL; if (argvars[2].v_type != VAR_UNKNOWN) { - if (get_tv_number_chk(&argvars[2], &error)) + if (tv_get_number_chk(&argvars[2], &error)) { rettv_list_set(rettv, NULL); } if (argvars[3].v_type != VAR_UNKNOWN - && get_tv_number_chk(&argvars[3], &error)) + && tv_get_number_chk(&argvars[3], &error)) options |= WILD_ALLLINKS; } } @@ -5986,13 +5986,13 @@ f_glob(typval_T *argvars, typval_T *rettv) if (p_wic) options += WILD_ICASE; if (rettv->v_type == VAR_STRING) - rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]), + rettv->vval.v_string = ExpandOne(&xpc, tv_get_string(&argvars[0]), NULL, options, WILD_ALL); else if (rettv_list_alloc(rettv) != FAIL) { int i; - ExpandOne(&xpc, get_tv_string(&argvars[0]), + ExpandOne(&xpc, tv_get_string(&argvars[0]), NULL, options, WILD_ALL_KEEP); for (i = 0; i < xpc.xp_numfiles; i++) list_append_string(rettv->vval.v_list, xpc.xp_files[i], -1); @@ -6012,7 +6012,7 @@ f_globpath(typval_T *argvars, typval_T *rettv) { int flags = 0; char_u buf1[NUMBUFLEN]; - char_u *file = get_tv_string_buf_chk(&argvars[1], buf1); + char_u *file = tv_get_string_buf_chk(&argvars[1], buf1); int error = FALSE; garray_T ga; int i; @@ -6022,23 +6022,23 @@ f_globpath(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_STRING; if (argvars[2].v_type != VAR_UNKNOWN) { - if (get_tv_number_chk(&argvars[2], &error)) + if (tv_get_number_chk(&argvars[2], &error)) flags |= WILD_KEEP_ALL; if (argvars[3].v_type != VAR_UNKNOWN) { - if (get_tv_number_chk(&argvars[3], &error)) + if (tv_get_number_chk(&argvars[3], &error)) { rettv_list_se |