diff options
author | LemonBoy <thatlemon@gmail.com> | 2024-06-22 17:25:07 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2024-06-22 17:25:07 +0200 |
commit | 7b29cc97d6c1450865969d08c5538a40c304593c (patch) | |
tree | 721ee10de8fae67be6a5503965135131cb895180 /src/vim9class.c | |
parent | 549ecc86365dc625e71e10b958525867c47e1cda (diff) |
patch 9.1.0514: Vim9: issue with comparing objects recursivelyv9.1.0514
Problem: Vim9: issue with comparing objects recursively
(Yinzuo Jiang)
Solution: only set recursive == TRUE, when called from tv_equal(), not
from typeval_compare_object(), refactor code into object_equal()
function (LemonBoy)
The recursive flag in tv_equal should be set only when the caller is
tv_equal, meaning that the comparison depth is > 1. The comparison
predicates for other object types are all following this rule, except
for the object one, and that may cause some weird issues like causing
the max depth limit not to be initialized in some cases.
closes: #15076
Signed-off-by: LemonBoy <thatlemon@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src/vim9class.c')
-rw-r--r-- | src/vim9class.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/vim9class.c b/src/vim9class.c index f66aa68ec7..4d0b4e8dd6 100644 --- a/src/vim9class.c +++ b/src/vim9class.c @@ -3842,6 +3842,34 @@ object_len(object_T *obj) } /* + * Return TRUE when two objects have exactly the same values. + */ + int +object_equal( + object_T *o1, + object_T *o2, + int ic, // ignore case for strings + int recursive) // TRUE when used recursively +{ + class_T *cl1, *cl2; + + if (o1 == o2) + return TRUE; + + cl1 = o1->obj_class; + cl2 = o2->obj_class; + + if (cl1 != cl2 || cl1 == NULL || cl2 == NULL) + return FALSE; + + for (int i = 0; i < cl1->class_obj_member_count; ++i) + if (!tv_equal((typval_T *)(o1 + 1) + i, (typval_T *)(o2 + 1) + i, ic, recursive)) + return FALSE; + + return TRUE; +} + +/* * Return a textual representation of object "obj" */ char_u * |