thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.2049: Vim9: not recognizing qualified class vars for infix ops

Browse Source 
Problem:  Vim9: not recognizing qualified class vars for infix ops
Solution: Drop the class type from the stack before generating the
          CLASSMEMBER instruction

closes: #13378
closes: #13379

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
Yegappan Lakshmanan
2023-10-19 10:47:53 +02:00
committed by Christian Brabandt
parent 982ef16059
commit d7b616d0ad
3 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/testdir/test_vim9_class.vim
View File

@@ -8337,4 +8337,76 @@ def Test_classmethod_timer_callback()
v9.CheckSourceSuccess(lines)
enddef
" Test for using a class variable as the first and/or second operand of a binary
" operator.
def Test_class_variable_as_operands()
var lines =<< trim END
vim9script
class Tests
static truthy: bool = true
static list: list<any> = []
static four: number = 4
static hello: string = 'hello'
static def Hello(): string
return hello
enddef
static def Four(): number
return four
enddef
static def List(): list<any>
return list
enddef
static def Truthy(): bool
return truthy
enddef
def TestOps()
assert_true(Tests.truthy == truthy)
assert_true(truthy == Tests.truthy)
assert_true(Tests.list isnot [])
assert_true([] isnot Tests.list)
assert_equal(2, Tests.four >> 1)
assert_equal(16, 1 << Tests.four)
assert_equal(8, Tests.four + four)
assert_equal(8, four + Tests.four)
assert_equal('hellohello', Tests.hello .. hello)
assert_equal('hellohello', hello .. Tests.hello)
enddef
endclass
def TestOps2()
assert_true(Tests.truthy == Tests.Truthy())
assert_true(Tests.Truthy() == Tests.truthy)
assert_true(Tests.list is Tests.List())
assert_true(Tests.List() is Tests.list)
assert_equal(2, Tests.four >> 1)
assert_equal(16, 1 << Tests.four)
assert_equal(8, Tests.four + Tests.Four())
assert_equal(8, Tests.Four() + Tests.four)
assert_equal('hellohello', Tests.hello .. Tests.Hello())
assert_equal('hellohello', Tests.Hello() .. Tests.hello)
enddef
var t = Tests.new()
t.TestOps()
TestOps2()
assert_true(Tests.truthy == Tests.Truthy())
assert_true(Tests.Truthy() == Tests.truthy)
assert_true(Tests.list is Tests.List())
assert_true(Tests.List() is Tests.list)
assert_equal(2, Tests.four >> 1)
assert_equal(16, 1 << Tests.four)
assert_equal(8, Tests.four + Tests.Four())
assert_equal(8, Tests.Four() + Tests.four)
assert_equal('hellohello', Tests.hello .. Tests.Hello())
assert_equal('hellohello', Tests.Hello() .. Tests.hello)
END
v9.CheckSourceSuccess(lines)
enddef
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2049,
/**/
2048,
/**/

4
src/vim9expr.c
View File

@@ -379,6 +379,8 @@ compile_class_object_index(cctx_T *cctx, char_u **arg, type_T *type)
}
if (type->tt_type == VAR_CLASS)
{
// Remove the class type from the stack
--cctx->ctx_type_stack.ga_len;
if (generate_CLASSMEMBER(cctx, TRUE, cl, m_idx) == FAIL)
return FAIL;
}
@@ -475,6 +477,8 @@ compile_class_object_index(cctx_T *cctx, char_u **arg, type_T *type)
}
*arg = name_end;
// Remove the class type from the stack
--cctx->ctx_type_stack.ga_len;
return generate_CLASSMEMBER(cctx, TRUE, cl, idx);
}