comparison src/eval.c @ 899:2981ad79c362 v7.0.025

updated for version 7.0-025
author vimboss
date Thu, 22 Jun 2006 16:03:05 +0000
parents a5beb9fb4da8
children 98ef5b0fe076
comparison
equal deleted inserted replaced
898:a5beb9fb4da8 899:2981ad79c362
13248 if (argvars[0].v_type == VAR_DICT) 13248 if (argvars[0].v_type == VAR_DICT)
13249 { 13249 {
13250 if (argvars[2].v_type != VAR_UNKNOWN) 13250 if (argvars[2].v_type != VAR_UNKNOWN)
13251 EMSG2(_(e_toomanyarg), "remove()"); 13251 EMSG2(_(e_toomanyarg), "remove()");
13252 else if ((d = argvars[0].vval.v_dict) != NULL 13252 else if ((d = argvars[0].vval.v_dict) != NULL
13253 && !tv_check_lock(d->dv_lock, (char_u *)"remove()")) 13253 && !tv_check_lock(d->dv_lock, (char_u *)"remove() argument"))
13254 { 13254 {
13255 key = get_tv_string_chk(&argvars[1]); 13255 key = get_tv_string_chk(&argvars[1]);
13256 if (key != NULL) 13256 if (key != NULL)
13257 { 13257 {
13258 di = dict_find(d, key, -1); 13258 di = dict_find(d, key, -1);
13268 } 13268 }
13269 } 13269 }
13270 else if (argvars[0].v_type != VAR_LIST) 13270 else if (argvars[0].v_type != VAR_LIST)
13271 EMSG2(_(e_listdictarg), "remove()"); 13271 EMSG2(_(e_listdictarg), "remove()");
13272 else if ((l = argvars[0].vval.v_list) != NULL 13272 else if ((l = argvars[0].vval.v_list) != NULL
13273 && !tv_check_lock(l->lv_lock, (char_u *)"remove()")) 13273 && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument"))
13274 { 13274 {
13275 int error = FALSE; 13275 int error = FALSE;
13276 13276
13277 idx = get_tv_number_chk(&argvars[1], &error); 13277 idx = get_tv_number_chk(&argvars[1], &error);
13278 if (error) 13278 if (error)
19691 v->di_tv.v_type = VAR_LIST; 19691 v->di_tv.v_type = VAR_LIST;
19692 v->di_tv.v_lock = VAR_FIXED; 19692 v->di_tv.v_lock = VAR_FIXED;
19693 v->di_tv.vval.v_list = &fc.l_varlist; 19693 v->di_tv.vval.v_list = &fc.l_varlist;
19694 vim_memset(&fc.l_varlist, 0, sizeof(list_T)); 19694 vim_memset(&fc.l_varlist, 0, sizeof(list_T));
19695 fc.l_varlist.lv_refcount = 99999; 19695 fc.l_varlist.lv_refcount = 99999;
19696 fc.l_varlist.lv_lock = VAR_FIXED;
19696 19697
19697 /* 19698 /*
19698 * Set a:firstline to "firstline" and a:lastline to "lastline". 19699 * Set a:firstline to "firstline" and a:lastline to "lastline".
19699 * Set a:name to named arguments. 19700 * Set a:name to named arguments.
19700 * Set a:N to the "..." arguments. 19701 * Set a:N to the "..." arguments.