diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 28 | ||||
| -rw-r--r-- | src/testdir/test55.in | 15 | ||||
| -rw-r--r-- | src/testdir/test55.ok | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 50 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index 654e4187d..a8e94639d 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2945,6 +2945,23 @@ set_var_lval(lp, endp, rettv, copy, op) ; else if (lp->ll_range) { + listitem_T *ll_li = lp->ll_li; + int ll_n1 = lp->ll_n1; + + /* + * Check whether any of the list items is locked + */ + for (ri = rettv->vval.v_list->lv_first; ri != NULL; ) + { + if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name)) + return; + ri = ri->li_next; + if (ri == NULL || (!lp->ll_empty2 && lp->ll_n2 == ll_n1)) + break; + ll_li = ll_li->li_next; + ++ll_n1; + } + /* * Assign the List values to the list items. */ @@ -3646,6 +3663,17 @@ do_unlet_var(lp, name_end, forceit) else if (lp->ll_range) { listitem_T *li; + listitem_T *ll_li = lp->ll_li; + int ll_n1 = lp->ll_n1; + + while (ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= ll_n1)) + { + li = ll_li->li_next; + if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name)) + return FAIL; + ll_li = li; + ++ll_n1; + } /* Delete a range of List items. */ while (lp->ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= lp->ll_n1)) diff --git a/src/testdir/test55.in b/src/testdir/test55.in index 8e073f30f..140cb7c0e 100644 --- a/src/testdir/test55.in +++ b/src/testdir/test55.in @@ -282,6 +282,21 @@ let l = [0, 1, 2, 3] : $put =ps : endfor :endfor +:unlet l +:let l = [1, 2, 3, 4] +:lockvar! l +:$put =string(l) +:unlockvar l[1] +:unlet l[0:1] +:$put =string(l) +:unlet l[1:2] +:$put =string(l) +:unlockvar l[1] +:let l[0:1] = [0, 1] +:$put =string(l) +:let l[1:2] = [0, 1] +:$put =string(l) +:unlet l :" :lockvar/islocked() triggering script autoloading :set rtp+=./sautest :lockvar g:footest#x diff --git a/src/testdir/test55.ok b/src/testdir/test55.ok index dfd8060db..e8560de40 100644 --- a/src/testdir/test55.ok +++ b/src/testdir/test55.ok @@ -86,6 +86,11 @@ FFFFFFF FFpFFpp 0000-000 ppppppp +[1, 2, 3, 4] +[1, 2, 3, 4] +[1, 2, 3, 4] +[1, 2, 3, 4] +[1, 2, 3, 4] locked g:footest#x:-1 exists g:footest#x:0 g:footest#x: 1 diff --git a/src/version.c b/src/version.c index b2c3289c6..d2ea61340 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 419, +/**/ 418, /**/ 417, |