patch 9.0.2156: Vim9: can use typealias in assignment
Problem: Vim9: can use typealias in an assignment
Solution: Generate errors when class/typealias involved in the rhs of an
assignment
closes: #13637
Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Generate errors when class/typealias involved in assignment.
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index a6a242d..8be0769 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -3057,6 +3057,18 @@
v9.CheckSourceSuccess(lines)
enddef
+def Test_class_assign()
+ var lines =<< trim END
+ vim9script
+ class C
+ endclass
+ class D
+ endclass
+ assert_fails('C = D', 'E1403: Class "D" cannot be used as a value')
+ END
+ v9.CheckSourceSuccess(lines)
+enddef
+
" Test for using various types (dict, list, blob, funcref, class) as variable
" in assignments with a different type
def Test_type_check()
@@ -3093,7 +3105,7 @@
assert_fails('N = l', 'E1012: Type mismatch; expected number but got list<number>')
assert_fails('N = b', 'E1012: Type mismatch; expected number but got blob')
assert_fails('N = Fn', 'E1012: Type mismatch; expected number but got func([unknown]): number')
- assert_fails('N = A', 'E1012: Type mismatch; expected number but got class<A>')
+ assert_fails('N = A', 'E1403: Class "A" cannot be used as a value')
assert_fails('N = o', 'E1012: Type mismatch; expected number but got object<A>')
# Use a compound operator with different RHS types
@@ -3101,7 +3113,7 @@
assert_fails('N += l', 'E734: Wrong variable type for +=')
assert_fails('N += b', 'E974: Using a Blob as a Number')
assert_fails('N += Fn', 'E734: Wrong variable type for +=')
- assert_fails('N += A', 'E1319: Using a Class as a Number')
+ assert_fails('N += A', 'E1403: Class "A" cannot be used as a value')
assert_fails('N += o', 'E1320: Using an Object as a Number')
# Initialize multiple variables using []
@@ -3109,7 +3121,7 @@
assert_fails('var [X2: number, Y: number] = [1, l]', 'E1012: Type mismatch; expected number but got list<number>')
assert_fails('var [X3: number, Y: number] = [1, b]', 'E1012: Type mismatch; expected number but got blob')
assert_fails('var [X4: number, Y: number] = [1, Fn]', 'E1012: Type mismatch; expected number but got func([unknown]): number')
- assert_fails('var [X7: number, Y: number] = [1, A]', 'E1012: Type mismatch; expected number but got class<A>')
+ assert_fails('var [X7: number, Y: number] = [1, A]', 'E1403: Class "A" cannot be used as a value')
assert_fails('var [X8: number, Y: number] = [1, o]', 'E1012: Type mismatch; expected number but got object<A>')
# String concatenation with various LHS types
@@ -3117,7 +3129,7 @@
assert_fails('S ..= l', 'E734: Wrong variable type for .=')
assert_fails('S ..= b', 'E976: Using a Blob as a String')
assert_fails('S ..= Fn', 'E734: Wrong variable type for .=')
- assert_fails('S ..= A', 'E1323: Using a Class as a String')
+ assert_fails('S ..= A', 'E1403: Class "A" cannot be used as a value')
assert_fails('S ..= o', 'E1324: Using an Object as a String')
# String concatenation with various RHS types
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 96d3ae5..84ea1cb 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -3093,25 +3093,77 @@
v9.CheckSourceSuccess(lines)
enddef
-def Test_call_constructor_from_legacy()
+def Test_construct_object_from_legacy()
+ # Cannot directly invoke constructor from legacy
var lines =<< trim END
vim9script
- var newCalled = 'false'
+ var newCalled = false
class A
- def new()
- newCalled = 'true'
+ def new(arg: string)
+ newCalled = true
enddef
endclass
- export def F(options = {}): any
- return A
+ export def CreateA(...args: list<any>): A
+ return call(A.new, args)
enddef
- g:p = F()
- legacy call p.new()
- assert_equal('true', newCalled)
+ g:P = CreateA
+ legacy call g:P('some_arg')
+ assert_equal(true, newCalled)
+ unlet g:P
+ END
+ v9.CheckSourceSuccess(lines)
+
+ lines =<< trim END
+ vim9script
+
+ var newCalled = false
+
+ class A
+ static def CreateA(options = {}): any
+ return A.new()
+ enddef
+ def new()
+ newCalled = true
+ enddef
+ endclass
+
+ g:P = A.CreateA
+ legacy call g:P()
+ assert_equal(true, newCalled)
+ unlet g:P
+ END
+ v9.CheckSourceSuccess(lines)
+
+ # This also tests invoking "new()" with "call"
+ lines =<< trim END
+ vim9script
+
+ var createdObject: any
+
+ class A
+ this.val1: number
+ this.val2: number
+ static def CreateA(...args: list<any>): any
+ createdObject = call(A.new, args)
+ return createdObject
+ enddef
+ endclass
+
+ g:P = A.CreateA
+ legacy call g:P(3, 5)
+ assert_equal(3, createdObject.val1)
+ assert_equal(5, createdObject.val2)
+ legacy call g:P()
+ assert_equal(0, createdObject.val1)
+ assert_equal(0, createdObject.val2)
+ legacy call g:P(7)
+ assert_equal(7, createdObject.val1)
+ assert_equal(0, createdObject.val2)
+ unlet g:P
END
v9.CheckSourceSuccess(lines)
enddef
diff --git a/src/testdir/test_vim9_typealias.vim b/src/testdir/test_vim9_typealias.vim
index bb3efb8..34c9e0e 100644
--- a/src/testdir/test_vim9_typealias.vim
+++ b/src/testdir/test_vim9_typealias.vim
@@ -212,7 +212,7 @@
enddef
Foo()
END
- v9.CheckSourceFailure(lines, 'E1403: Type alias "A" cannot be used as a value', 1)
+ v9.CheckSourceFailure(lines, 'E1406: Cannot use a Typealias as a variable or value', 1)
# Using type alias in an expression (script level)
lines =<< trim END