patch 9.0.1188: return value of type() for class and object unclear
Problem: Return value of type() for class and object unclear.
Solution: Add v:t_object and v:t_class.
diff --git a/src/evalvars.c b/src/evalvars.c
index 8061a50..68df1cb 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -139,6 +139,8 @@
{VV_NAME("t_job", VAR_NUMBER), NULL, VV_RO},
{VV_NAME("t_channel", VAR_NUMBER), NULL, VV_RO},
{VV_NAME("t_blob", VAR_NUMBER), NULL, VV_RO},
+ {VV_NAME("t_class", VAR_NUMBER), NULL, VV_RO},
+ {VV_NAME("t_object", VAR_NUMBER), NULL, VV_RO},
{VV_NAME("termrfgresp", VAR_STRING), NULL, VV_RO},
{VV_NAME("termrbgresp", VAR_STRING), NULL, VV_RO},
{VV_NAME("termu7resp", VAR_STRING), NULL, VV_RO},
@@ -255,6 +257,8 @@
set_vim_var_nr(VV_TYPE_JOB, VAR_TYPE_JOB);
set_vim_var_nr(VV_TYPE_CHANNEL, VAR_TYPE_CHANNEL);
set_vim_var_nr(VV_TYPE_BLOB, VAR_TYPE_BLOB);
+ set_vim_var_nr(VV_TYPE_CLASS, VAR_TYPE_CLASS);
+ set_vim_var_nr(VV_TYPE_OBJECT, VAR_TYPE_OBJECT);
set_vim_var_nr(VV_ECHOSPACE, sc_col - 1);
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index c6c583a..4c10fef 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -155,6 +155,11 @@
# call an object method
assert_equal('(2, 12)', pos.ToString())
+
+ assert_equal(v:t_class, type(TextPosition))
+ assert_equal(v:t_object, type(pos))
+ assert_equal('class<TextPosition>', typename(TextPosition))
+ assert_equal('object<TextPosition>', typename(pos))
END
v9.CheckScriptSuccess(lines)
enddef
diff --git a/src/version.c b/src/version.c
index ee42263..1d81e7b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1188,
+/**/
1187,
/**/
1186,
diff --git a/src/vim.h b/src/vim.h
index 33122d7..655935f 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2083,23 +2083,25 @@
#define VV_TYPE_JOB 85
#define VV_TYPE_CHANNEL 86
#define VV_TYPE_BLOB 87
-#define VV_TERMRFGRESP 88
-#define VV_TERMRBGRESP 89
-#define VV_TERMU7RESP 90
-#define VV_TERMSTYLERESP 91
-#define VV_TERMBLINKRESP 92
-#define VV_EVENT 93
-#define VV_VERSIONLONG 94
-#define VV_ECHOSPACE 95
-#define VV_ARGV 96
-#define VV_COLLATE 97
-#define VV_EXITING 98
-#define VV_COLORNAMES 99
-#define VV_SIZEOFINT 100
-#define VV_SIZEOFLONG 101
-#define VV_SIZEOFPOINTER 102
-#define VV_MAXCOL 103
-#define VV_LEN 104 // number of v: vars
+#define VV_TYPE_CLASS 88
+#define VV_TYPE_OBJECT 89
+#define VV_TERMRFGRESP 90
+#define VV_TERMRBGRESP 91
+#define VV_TERMU7RESP 92
+#define VV_TERMSTYLERESP 93
+#define VV_TERMBLINKRESP 94
+#define VV_EVENT 95
+#define VV_VERSIONLONG 96
+#define VV_ECHOSPACE 97
+#define VV_ARGV 98
+#define VV_COLLATE 99
+#define VV_EXITING 100
+#define VV_COLORNAMES 101
+#define VV_SIZEOFINT 102
+#define VV_SIZEOFLONG 103
+#define VV_SIZEOFPOINTER 104
+#define VV_MAXCOL 105
+#define VV_LEN 106 // number of v: vars
// used for v_number in VAR_BOOL and VAR_SPECIAL
#define VVAL_FALSE 0L // VAR_BOOL