OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • SSH
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision5006d95ef82d3a6178ddaa728142ef53c5650864 (tree)
Zeit2021-03-09 06:00:03
AutorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

patch 8.2.2580: Vim9: checking vararg type may be wrong

Commit: https://github.com/vim/vim/commit/e3ffcd9902efc756178900d9bd972c74a09c3fcd
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Mar 8 21:47:13 2021 +0100

patch 8.2.2580: Vim9: checking vararg type may be wrong
Problem: Vim9: checking vararg type is wrong when function is auto-loaded.
Solution: Use the member type. (closes https://github.com/vim/vim/issues/7933)

Ändern Zusammenfassung

Diff

diff -r 2828d6cfb0b1 -r 5006d95ef82d src/testdir/test_vim9_script.vim
--- a/src/testdir/test_vim9_script.vim Mon Mar 08 21:00:05 2021 +0100
+++ b/src/testdir/test_vim9_script.vim Mon Mar 08 22:00:03 2021 +0100
@@ -3154,6 +3154,10 @@
31543154 return 'test'
31553155 enddef
31563156 g:some#name = 'name'
3157+
3158+ def some#varargs(a1: string, ...l: list<string>): string
3159+ return a1 .. l[0] .. l[1]
3160+ enddef
31573161 END
31583162
31593163 mkdir('Xdir/autoload', 'p')
@@ -3166,6 +3170,8 @@
31663170 g:some#other = 'other'
31673171 assert_equal('other', g:some#other)
31683172
3173+ assert_equal('abc', some#varargs('a', 'b', 'c'))
3174+
31693175 # upper case script name works
31703176 lines =<< trim END
31713177 vim9script
diff -r 2828d6cfb0b1 -r 5006d95ef82d src/version.c
--- a/src/version.c Mon Mar 08 21:00:05 2021 +0100
+++ b/src/version.c Mon Mar 08 22:00:03 2021 +0100
@@ -751,6 +751,8 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 2580,
755+/**/
754756 2579,
755757 /**/
756758 2578,
diff -r 2828d6cfb0b1 -r 5006d95ef82d src/vim9execute.c
--- a/src/vim9execute.c Mon Mar 08 21:00:05 2021 +0100
+++ b/src/vim9execute.c Mon Mar 08 22:00:03 2021 +0100
@@ -807,9 +807,12 @@
807807 // types are correct.
808808 for (i = 0; i < argcount; ++i)
809809 {
810- type_T *type = i < ufunc->uf_args.ga_len
811- ? ufunc->uf_arg_types[i] : ufunc->uf_va_type;
812-
810+ type_T *type = NULL;
811+
812+ if (i < ufunc->uf_args.ga_len)
813+ type = ufunc->uf_arg_types[i];
814+ else if (ufunc->uf_va_type != NULL)
815+ type = ufunc->uf_va_type->tt_member;
813816 if (type != NULL && check_typval_arg_type(type,
814817 &argv[i], i + 1) == FAIL)
815818 return FAIL;
Show on old repository browser