Mercurial > vim

comparison src/evalvars.c @ 26624:bdf11d8e3df3 v8.2.3841

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3841: Vim9: outdated TODO items, disabled tests that work Commit: https://github.com/vim/vim/commit/71b768509250b12696e8cc90e5902029f1b5433d Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 17 20:15:38 2021 +0000 patch 8.2.3841: Vim9: outdated TODO items, disabled tests that work Problem: Vim9: outdated TODO items, disabled tests that work. Solution: Remove TODO items, run tests that work now. Check that a dict item isn't locked.
author Bram Moolenaar <Bram@vim.org>
date Fri, 17 Dec 2021 21:30:03 +0100
parents fac6673086df
children 9c9b8d95b05f
comparison
equal deleted inserted replaced
26623:f94007638026 26624:bdf11d8e3df3
2312 semsg(_(e_cannot_change_readonly_variable_str), vimvars[idx].vv_name); 2312 semsg(_(e_cannot_change_readonly_variable_str), vimvars[idx].vv_name);
2313 return FAIL; 2313 return FAIL;
2314 } 2314 }
2315 if (sandbox && (vimvars[idx].vv_flags & VV_RO_SBX)) 2315 if (sandbox && (vimvars[idx].vv_flags & VV_RO_SBX))
2316 { 2316 {
2317 semsg(_(e_readonlysbx), vimvars[idx].vv_name); 2317 semsg(_(e_cannot_set_variable_in_sandbox_str), vimvars[idx].vv_name);
2318 return FAIL; 2318 return FAIL;
2319 } 2319 }
2320 clear_tv(&vimvars[idx].vv_di.di_tv); 2320 clear_tv(&vimvars[idx].vv_di.di_tv);
2321 vimvars[idx].vv_di.di_tv = *tv; 2321 vimvars[idx].vv_di.di_tv = *tv;
2322 return OK; 2322 return OK;
3608 int 3608 int
3609 var_check_ro(int flags, char_u *name, int use_gettext) 3609 var_check_ro(int flags, char_u *name, int use_gettext)
3610 { 3610 {
3611 if (flags & DI_FLAGS_RO) 3611 if (flags & DI_FLAGS_RO)
3612 { 3612 {
3613 semsg(_(e_cannot_change_readonly_variable_str), 3613 if (name == NULL)
3614 emsg(_(e_cannot_change_readonly_variable));
3615 else
3616 semsg(_(e_cannot_change_readonly_variable_str),
3614 use_gettext ? (char_u *)_(name) : name); 3617 use_gettext ? (char_u *)_(name) : name);
3615 return TRUE; 3618 return TRUE;
3616 } 3619 }
3617 if ((flags & DI_FLAGS_RO_SBX) && sandbox) 3620 if ((flags & DI_FLAGS_RO_SBX) && sandbox)
3618 { 3621 {
3619 semsg(_(e_readonlysbx), use_gettext ? (char_u *)_(name) : name); 3622 if (name == NULL)
3623 emsg(_(e_cannot_set_variable_in_sandbox));
3624 else
3625 semsg(_(e_cannot_set_variable_in_sandbox_str),
3626 use_gettext ? (char_u *)_(name) : name);
3620 return TRUE; 3627 return TRUE;
3621 } 3628 }
3622 return FALSE; 3629 return FALSE;
3623 } 3630 }
3624 3631
3645 int 3652 int
3646 var_check_fixed(int flags, char_u *name, int use_gettext) 3653 var_check_fixed(int flags, char_u *name, int use_gettext)
3647 { 3654 {
3648 if (flags & DI_FLAGS_FIX) 3655 if (flags & DI_FLAGS_FIX)
3649 { 3656 {
3650 semsg(_("E795: Cannot delete variable %s"), 3657 if (name == NULL)
3658 emsg(_(e_cannot_delete_variable));
3659 else
3660 semsg(_(e_cannot_delete_variable_str),
3651 use_gettext ? (char_u *)_(name) : name); 3661 use_gettext ? (char_u *)_(name) : name);
3652 return TRUE; 3662 return TRUE;
3653 } 3663 }
3654 return FALSE; 3664 return FALSE;
3655 } 3665 }
3694 int 3704 int
3695 value_check_lock(int lock, char_u *name, int use_gettext) 3705 value_check_lock(int lock, char_u *name, int use_gettext)
3696 { 3706 {
3697 if (lock & VAR_LOCKED) 3707 if (lock & VAR_LOCKED)
3698 { 3708 {
3699 semsg(_("E741: Value is locked: %s"), 3709 if (name == NULL)
3700 name == NULL ? (char_u *)_("Unknown") 3710 emsg(_(e_value_is_locked));
3701 : use_gettext ? (char_u *)_(name) 3711 else
3702 : name); 3712 semsg(_(e_value_is_locked_str),
3713 use_gettext ? (char_u *)_(name) : name);
3703 return TRUE; 3714 return TRUE;
3704 } 3715 }
3705 if (lock & VAR_FIXED) 3716 if (lock & VAR_FIXED)
3706 { 3717 {
3707 semsg(_("E742: Cannot change value of %s"), 3718 if (name == NULL)
3708 name == NULL ? (char_u *)_("Unknown") 3719 emsg(_(e_cannot_change_value));
3709 : use_gettext ? (char_u *)_(name) 3720 else
3710 : name); 3721 semsg(_(e_cannot_change_value_of_str),
3722 use_gettext ? (char_u *)_(name) : name);
3711 return TRUE; 3723 return TRUE;
3712 } 3724 }
3713 return FALSE; 3725 return FALSE;
3714 } 3726 }
3715 3727