diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-03-22 22:21:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-03-22 22:21:26 +0100 |
| commit | f28f2ac425600b88da0bdcc12a82cd620f575681 (patch) | |
| tree | b8101a4aee337f1b41dbd51f6e8cea5a6c48a2ff /src/filepath.c | |
| parent | 49f1e9ec3e7f4e1b3572367d02a83c2b6ebbed97 (diff) | |
| download | vim-git-f28f2ac425600b88da0bdcc12a82cd620f575681.tar.gz | |
patch 8.2.2646: Vim9: error for not using string doesn't mentionargumentv8.2.2646
Problem: Vim9: error for not using string doesn't mention argument.
Solution: Add argument number.
Diffstat (limited to 'src/filepath.c')
| -rw-r--r-- | src/filepath.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/filepath.c b/src/filepath.c index 8e54e5bcf..2f3b90f8e 100644 --- a/src/filepath.c +++ b/src/filepath.c @@ -861,7 +861,7 @@ f_delete(typval_T *argvars, typval_T *rettv) void f_executable(typval_T *argvars, typval_T *rettv) { - if (in_vim9script() && check_for_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) return; // Check in $PATH and also check directly if there is a directory name. @@ -876,7 +876,7 @@ f_exepath(typval_T *argvars, typval_T *rettv) { char_u *p = NULL; - if (in_vim9script() && check_for_nonempty_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_nonempty_string(&argvars[0], 1) == FAIL) return; (void)mch_can_exe(tv_get_string(&argvars[0]), &p, TRUE); rettv->v_type = VAR_STRING; @@ -893,7 +893,7 @@ f_filereadable(typval_T *argvars, typval_T *rettv) char_u *p; int n; - if (in_vim9script() && check_for_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) return; #ifndef O_NONBLOCK # define O_NONBLOCK 0 @@ -918,7 +918,7 @@ f_filereadable(typval_T *argvars, typval_T *rettv) void f_filewritable(typval_T *argvars, typval_T *rettv) { - if (in_vim9script() && check_for_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) return; rettv->vval.v_number = filewritable(tv_get_string(&argvars[0])); } @@ -942,7 +942,7 @@ findfilendir( rettv->vval.v_string = NULL; rettv->v_type = VAR_STRING; - if (in_vim9script() && check_for_nonempty_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_nonempty_string(&argvars[0], 1) == FAIL) return; #ifdef FEAT_SEARCHPATH @@ -1023,8 +1023,8 @@ f_fnamemodify(typval_T *argvars, typval_T *rettv) char_u *fbuf = NULL; char_u buf[NUMBUFLEN]; - if (in_vim9script() && (check_for_string(&argvars[0]) == FAIL - || check_for_string(&argvars[1]) == FAIL)) + if (in_vim9script() && (check_for_string(&argvars[0], 1) == FAIL + || check_for_string(&argvars[1], 2) == FAIL)) return; fname = tv_get_string_chk(&argvars[0]); mods = tv_get_string_buf_chk(&argvars[1], buf); @@ -1135,7 +1135,7 @@ f_getfperm(typval_T *argvars, typval_T *rettv) char_u *perm = NULL; char_u permbuf[] = "---------"; - if (in_vim9script() && check_for_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) return; fname = tv_get_string(&argvars[0]); @@ -1154,7 +1154,7 @@ f_getfsize(typval_T *argvars, typval_T *rettv) char_u *fname; stat_T st; - if (in_vim9script() && check_for_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) return; fname = tv_get_string(&argvars[0]); @@ -1184,7 +1184,7 @@ f_getftime(typval_T *argvars, typval_T *rettv) char_u *fname; stat_T st; - if (in_vim9script() && check_for_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) return; fname = tv_get_string(&argvars[0]); if (mch_stat((char *)fname, &st) >= 0) @@ -1230,7 +1230,7 @@ f_getftype(typval_T *argvars, typval_T *rettv) stat_T st; char_u *type = NULL; - if (in_vim9script() && check_for_string(&argvars[0]) == FAIL) + if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) return; fname = tv_get_string(&argvars[0]); @@ -2410,6 +2410,11 @@ f_browse(typval_T *argvars UNUSED, typval_T *rettv) char_u buf2[NUMBUFLEN]; int error = FALSE; + if (in_vim9script() + && (check_for_string(&argvars[1], 2) == FAIL + || check_for_string(&argvars[2], 3) == FAIL + || check_for_string(&argvars[3], 4) == FAIL)) + return; 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); |