aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.2160: instanceof() should use varargs as second arg

Browse Source 
Problem:  instanceof() should use varargs as second arg
Solution: Modify `instanceof()` to use varargs instead of list

Modify `instanceof()` to use varargs instead of list
Valid `instanceof()` arguments are `type`s. A `type` is not a value;
it cannot be added to a list.

This change is non-compatible with the current usage of instanceof;
but instanceof is relatively new and it's a trivial change.

fixes: #13421
closes: #13644

Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Ernie Rael
2023-12-12 16:58:00 +01:00
committed by Christian Brabandt
parent c1c3b83816
commit 2025af165e
11 changed files with 159 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/vim9class.c
View File

@@ -3161,58 +3161,37 @@ class_instance_of(class_T *cl, class_T *other_cl)
}
/*
* "instanceof(object, classinfo)" function
* "instanceof(object, classinfo, ...)" function
*/
void
f_instanceof(typval_T *argvars, typval_T *rettv)
{
typval_T *object_tv = &argvars[0];
typval_T *classinfo_tv = &argvars[1];
listitem_T *li;
class_T *c;
rettv->vval.v_number = VVAL_FALSE;
if (check_for_object_arg(argvars, 0) == FAIL
|| check_for_class_or_list_arg(argvars, 1) == FAIL)
|| check_for_class_or_typealias_args(argvars, 1) == FAIL)
return;
if (object_tv->vval.v_object == NULL)
return;
if (classinfo_tv->v_type == VAR_LIST)
for (; classinfo_tv->v_type != VAR_UNKNOWN; ++classinfo_tv)
{
FOR_ALL_LIST_ITEMS(classinfo_tv->vval.v_list, li)
if (classinfo_tv->v_type == VAR_TYPEALIAS)
c = classinfo_tv->vval.v_typealias->ta_type->tt_class;
else
c = classinfo_tv->vval.v_class;
if (class_instance_of(object_tv->vval.v_object->obj_class, c))
{
if (li->li_tv.v_type != VAR_CLASS && !tv_class_alias(&li->li_tv))
{
emsg(_(e_class_required));
return;
}
if (li->li_tv.v_type == VAR_TYPEALIAS)
c = li->li_tv.vval.v_typealias->ta_type->tt_class;
else
c = li->li_tv.vval.v_class;
if (class_instance_of(object_tv->vval.v_object->obj_class, c)
== TRUE)
{
rettv->vval.v_number = VVAL_TRUE;
return;
}
rettv->vval.v_number = VVAL_TRUE;
return;
}
return;
}
if (classinfo_tv->v_type == VAR_TYPEALIAS)
c = classinfo_tv->vval.v_typealias->ta_type->tt_class;
else
c = classinfo_tv->vval.v_class;
rettv->vval.v_number =
class_instance_of(object_tv->vval.v_object->obj_class, c);
}
#endif // FEAT_EVAL