Mercurial > vim
diff src/userfunc.c @ 22415:1cefe1c013ac v8.2.1756
patch 8.2.1756: Vim9: :let will soon be disallowed
Commit: https://github.com/vim/vim/commit/cfcd011fcd8021da52fba62dabf7a2497f1879b7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 27 15:19:27 2020 +0200
patch 8.2.1756: Vim9: :let will soon be disallowed
Problem: Vim9: :let will soon be disallowed.
Solution: Add v:disallow_let temporarily. Fix tests.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 27 Sep 2020 15:30:04 +0200 |
parents | b66a2e046c2e |
children | 454b78ca8247 |
line wrap: on
line diff
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -3214,19 +3214,20 @@ def_function(exarg_T *eap, char_u *name_ is_heredoc = TRUE; } - // Check for ":let v =<< [trim] EOF" - // and ":let [a, b] =<< [trim] EOF" + // Check for ":cmd v =<< [trim] EOF" + // and ":cmd [a, b] =<< [trim] EOF" + // Where "cmd" can be "let", "var", "final" or "const". arg = skipwhite(skiptowhite(p)); if (*arg == '[') arg = vim_strchr(arg, ']'); if (arg != NULL) { arg = skipwhite(skiptowhite(arg)); - if ( arg[0] == '=' && arg[1] == '<' && arg[2] =='<' - && ((p[0] == 'l' - && p[1] == 'e' - && (!ASCII_ISALNUM(p[2]) - || (p[2] == 't' && !ASCII_ISALNUM(p[3])))))) + if (arg[0] == '=' && arg[1] == '<' && arg[2] =='<' + && (checkforcmd(&p, "let", 2) + || checkforcmd(&p, "var", 3) + || checkforcmd(&p, "final", 5) + || checkforcmd(&p, "const", 5))) { p = skipwhite(arg + 3); if (STRNCMP(p, "trim", 4) == 0)