1
0
forked from aniani/vim

patch 9.1.0522: Vim9: string(object) hangs for recursive references

Problem:  Vim9: string(object) hangs for recursive references
Solution: Handle recursive objects specifically, add a hang test and a
          compare test (Ernie Rael)

fixes: #15080
closes: #15082

Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Ernie Rael
2024-07-04 16:50:11 +02:00
committed by Christian Brabandt
parent 4179f193cc
commit 05ff4e42fb
4 changed files with 171 additions and 43 deletions

View File

@@ -2246,6 +2246,47 @@ def Test_class_object_to_string()
assert_equal("object of TextPosition {lnum: 1, col: 22}", string(pos))
END
v9.CheckSourceSuccess(lines)
# check string() with object nesting
lines =<< trim END
vim9script
class C
var nest1: C
var nest2: C
def Init(n1: C, n2: C)
this.nest1 = n1
this.nest2 = n2
enddef
endclass
var o1 = C.new()
var o2 = C.new()
o1.Init(o1, o2)
o2.Init(o2, o1)
# The following previously put's vim into an infinite loop.
var expect = "object of C {nest1: object of C {...}, nest2: object of C {nest1: object of C {...}, nest2: object of C {...}}}"
assert_equal(expect, string(o1))
END
v9.CheckSourceSuccess(lines)
lines =<< trim END
vim9script
class B
endclass
class C
var b: B
var c: C
endclass
var o1 = C.new(B.new(), C.new(B.new()))
var expect = "object of C {b: object of B {}, c: object of C {b: object of B {}, c: object of [unknown]}}"
assert_equal(expect, string(o1))
END
v9.CheckSourceSuccess(lines)
enddef
def Test_interface_basics()
@@ -10516,6 +10557,27 @@ def Test_Object_Compare_With_Recursive_Class_Ref()
assert_equal(false, result)
END
v9.CheckScriptSuccess(lines)
lines =<< trim END
vim9script
class C
var nest1: C
var nest2: C
def Init(n1: C, n2: C)
this.nest1 = n1
this.nest2 = n2
enddef
endclass
var o1 = C.new()
var o2 = C.new()
o1.Init(o1, o2)
o2.Init(o2, o1)
var result = o1 == o2
assert_equal(true, result)
END
v9.CheckScriptSuccess(lines)
enddef
" Test for using a compound operator from a lambda function in an object method